Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,220 Commits 4 Branches 146 Tags
ba009ea2e2d13c0aa8a76df5bfead6f757ccddc3
Commit Graph

24220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Killyana
ba009ea2e2 DB/Npc: Niffelem Frost Giant and Frostworg 
Remove wrong spawns and add vehicle accessories
 2015-09-29 21:15:19 +02:00
Killyana
3e01ec1f22 DB/Creature: Fix some Npcs in The Storm Peaks 
Fix Brunnhildar Prisoner react state.
Add missing aura to Dead Frost Giant and Frostworg Carcass, and remove random movements
Fix react state for Brunnhildar Warbear,  Frostworg and Niffelem Frost Giant, and add SAI scripts.
Fix inhabittype for some npcs trigger.
Closes #15635
Closes #15634
 2015-09-29 20:07:02 +02:00
Shauren
402a3c45ff Core/Maps: Moved corpse management to map level 
(cherry picked from commit cd27fd38b9)

# Conflicts:
#	src/server/database/Database/Implementation/CharacterDatabase.cpp
#	src/server/database/Database/Implementation/CharacterDatabase.h
#	src/server/game/Entities/Corpse/Corpse.cpp
#	src/server/game/Entities/Creature/GossipDef.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Globals/ObjectAccessor.cpp
#	src/server/game/Globals/ObjectAccessor.h
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Globals/ObjectMgr.h
#	src/server/game/Grids/ObjectGridLoader.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/ChatHandler.cpp
#	src/server/game/Handlers/QueryHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Server/Packets/CharacterPackets.cpp
#	src/server/game/World/World.cpp
#	src/server/scripts/Commands/cs_reload.cpp
 2015-09-29 18:45:01 +02:00
Killyana
70a5cdfc04 DB/Quest: Anatoly Will Talk 
Closes #15618
 2015-09-29 14:29:35 +02:00
Killyana
9d395ae8c0 DB/Quest: Blackout 
Closes #15617
 2015-09-29 14:23:41 +02:00
r00ty
e5e2b093d2 DB/Characters: Updated character create for update hash 
Updated hash for 2015_08_26_00_characters_335.sql for map local guids commit

Closes https://github.com/TrinityCore/TrinityCore/issues/15601
 2015-09-28 23:19:27 +02:00
pete318
31ad2a7cd8 Merge pull request #15619 from pete318/ah_spawnid 
(3.3.5/Core/Auctions) - Changes to Auction House (use of guids)
 2015-09-28 21:43:17 +01:00
pete318
01ae5c4bf6 Auction house changes: 
- Stop storing guid for auctioneer.
 - Store instead house ID
 - No separate ID for various houses. Only Horde, Alliance and Neutral.
 - Removed non-needed faction checks.
 - Use enum for auction house IDs

NOTE: This will expire all current auctions and return item to player (or
award to high bidder) in order to prepare database for the changes.
 2015-09-28 22:26:23 +02:00
jackpoz
fcc6ef6b18 Core/DBLayer: Build fix in addition to 25c0303976 2015-09-27 17:19:49 +02:00
Shauren
5c3ba60d54 Core/DBLayer: Allocate a single buffer for entire prepared result set instead of separate ones for each field 
(cherry picked from commit 8652f4b4de)
 2015-09-27 17:11:35 +02:00
Shauren
25c0303976 Core/DBLayer: Added compile time validation for prepared statement indexes passed to DatabaseWorkerPool::GetPreparedStatement turning mistakes like the one fixed in 0327927fa6 into compiler errors. 
(cherry picked from commit 7c75160f59)

Conflicts:
	src/server/database/Database/Implementation/HotfixDatabase.h
	src/server/shared/DataStores/DB2StorageLoader.cpp
	src/server/shared/DataStores/DB2StorageLoader.h
	src/server/shared/DataStores/DB2Store.h
 2015-09-27 17:08:50 +02:00
Shauren
d2076ef8b0 Core/DBLayer: Optimized prepared statement query results by eliminating unneeded buffer copies 
* Improved error logs for using incorrect Field getters to also include table name, field name and field index.

(cherry picked from commit 65dbc7082a)

Conflicts:
	src/server/database/Database/Field.h
	src/server/game/Globals/ObjectMgr.cpp
 2015-09-27 16:28:04 +02:00
Shauren
0d0c2e1ca6 Core/Misc: Fixed macro redefinition warnings when building for running under helgrind 
(cherry picked from commit ec5700c2a2)
 2015-09-27 13:57:15 +02:00
Shauren
12f5c766c9 Buildsystem/MSVC: Added missed change 
(cherry picked from commit 7732ad5153)
 2015-09-27 12:24:11 +02:00
Shauren
eac6f22c95 Buildsystem/MSVC: Enabled /Zc:throwingNew for Visual Studio 2015 builds 
More info here: http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx

Closes #15230

(cherry picked from commit dcb1990e93)
 2015-09-27 12:23:56 +02:00
Rushor
513b756ea8 Merge pull request #15191 from Rushor/action 
Core/SAI: Add SMART_ACTION_RISE_UP for Z Axis
(cherry picked from commit ba6da26e5d)
 2015-09-27 12:21:04 +02:00
Killyana
747a3f1d38 DB: Fix a Typo on trinity string 
By @galathil
Closes #15567
 2015-09-26 23:40:13 +02:00
Killyana
51ac4872f5 DB/Creature: Add channeling cosmetic spell for Shadow Channeler 
Add 2 missing spawns
Add emote for Cult Researcher
 2015-09-26 23:24:17 +02:00
Killyana
1b360c8ec8 DB/Creature: Iceskin Sentry 
Add missing aura
Fix movements and react
 2015-09-26 22:08:13 +02:00
Killyana
706053129a DB/Creature: Eversong Ranger 
SAI fix
Closes #15602
 2015-09-26 22:05:03 +02:00
Killyana
610fab8968 DB/Misc: Fix some Unit flags 
Add Sai for Released Soul
Add some missing auras
 2015-09-26 21:21:44 +02:00
Killyana
62af7a57cf DB/Item: Sylvanas Music Box 
Closes #7865
 2015-09-26 21:17:21 +02:00
jackpoz
3f24853e29 Merge pull request #15473 from Treeston/3.3.5-fixplayerdamagereq 
Core/Unit: Player-summoned creature damage counts towards quest credit
 2015-09-25 22:51:42 +02:00
Shauren
e68ff4186e Core/Commands: Fixed .gobject move and turn 
(cherry picked from commit 7eb25f1af6)

Closes #3802
Closes #15598
 2015-09-25 21:26:31 +02:00
Shauren
9207304d32 Core/Commands: Fixed .gobject add command 
(cherry picked from commit b4d044aa13)
 2015-09-25 19:58:13 +02:00
Duarte Duarte
2c16edbdf3 Merge pull request #15590 from unknown-8H3D/patch-1 
Fix TYPO in config file
 2015-09-24 10:15:45 -07:00
Aokromes
e649ec9770 DB/Creature: Some formations fixes 
By Malcrom
 2015-09-24 14:49:31 +02:00
Aokromes
f84655cac7 Core/Creature: Better formations implementation 
By Malcrom
 2015-09-24 14:46:16 +02:00
Killyana
facb656920 DB/Misc: Multiple DB Fixes 
Add SAI to Drakuru Raptor to fix vehicle behavior
Add animation for Steam Burst
Add Equipments for 7th Legion Infantryman
Add a missing aura for Risen Gryphon Rider
Fix a DB error
 2015-09-24 02:46:51 +02:00
Aokromes
ae0a01bd9f DB/Creature: More Naxx pathing update 
By Malcrom
 2015-09-24 00:59:03 +02:00
Aokromes
e1b322cda1 DB/Creature: More Naxx pathing update 
By Malcrom.
 2015-09-24 00:38:17 +02:00
Carbenium
3b164c5047 Build: Fix non-pch build after dcb7082277 2015-09-24 00:12:05 +02:00
Aokromes
2eafbe6bf0 Merge pull request #15587 from Pirricli/patch-1 
minor typo
 2015-09-23 23:21:40 +02:00
Pirricli
6fd289dd2e minor typo 2015-09-23 23:11:50 +02:00
Aokromes
38b3ea4a07 DB/Creature: Misc formations fixes 
By Malcrom.
 2015-09-23 22:59:43 +02:00
Carbenium
a40d855337 Merge pull request #15538 from pete318/combat_bug 
Combat with distant creatures (Mk II)
 2015-09-23 22:32:03 +02:00
pete318
3c188ac10e Combat with distant creatures 
Iterate creatures in combat with players during map update, and also visit
their cells if greater than player visibility distance away.
 2015-09-23 22:03:27 +02:00
unknown-8H3D
722a22801b Fix typo 2015-09-23 21:32:57 +03:00
Dr-J
a3dbb0dd9c DB/Loot: Netherwing Relic 
Netherwing Relic should have 100% chance to drop from dragonmaw transporter if player is on quest.
 2015-09-23 19:21:59 +01:00
Carbenium
ff31a1d9ed Merge pull request #15313 from pete318/map_local_guid_335 
[3.3.5/Core/Map] map local guids 6.x -> 3.3.5
 2015-09-23 20:21:20 +02:00
Killyana
d476e0eff2 DB/Creature: Scripts for Ring of the law encounter in Black Rock Depths 
Closes #8158
Closes #14598
 2015-09-23 18:01:12 +02:00
Killyana
d3ebb79d78 DB/Path: Add Dragonmaw Transporter paths 
And Remove wrong spawns
Thanks to @Kittnz
 2015-09-23 17:28:01 +02:00
Kittnz
e7e9f7713f DB/Path: Dragonmaw Subjugator & Dragonmaw Shaman 
- Also delete some npc's that shouldn't be there.
 2015-09-23 17:22:20 +02:00
Duarte Duarte
0720414042 Merge pull request #15582 from mthsena/3.3.5 
Config: Typo/Cosmetic changes
 2015-09-23 07:46:16 -07:00
mthsena
a5131d299f Config: Typo/Cosmetic changes 2015-09-23 11:35:50 -03:00
Duarte Duarte
7c4dd4059e Merge pull request #15579 from M-Pan/3.3.5 
Config ; Minor Typo
 2015-09-23 04:57:44 -07:00
Aokromes
c5cc95d008 DB/Creature: More Naxx pathing update 
By Malcrom
 2015-09-23 05:05:30 +02:00
m_pan
595f819632 Config ; Minor Typo 
#    Updates.SourcePath > #    Updates.MySqlCLIPath
 2015-09-22 19:11:58 -05:00
Duarte Duarte
f7e9acb6ed Merge pull request #15577 from M-Pan/3.3.5 
Revise MaxPrimaryTradeSkill comment

Closes #15575
 2015-09-22 17:05:57 -07:00
m_pan
0453320b6b Revise MaxPrimaryTradeSkill comment 
see https://github.com/TrinityCore/TrinityCore/issues/15575
 2015-09-22 18:58:28 -05:00