Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 21:32:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,447 Commits 4 Branches 146 Tags
1106eadac6df7d94de04f9f1642d53f37ca847bc
Commit Graph

30447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
730ddaf0bf Core: Fix non pch build 2015-07-25 23:21:25 +02:00
Vincent-Michael
d2d4bc2668 Core: Header cleanup in game/*/*.cpp 
(cherry picked from commit 2e586bc520)

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/DataStores/DB2Stores.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/ObjectGuid.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Handlers/BankHandler.cpp
	src/server/game/Handlers/CombatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TokenHandler.cpp
	src/server/game/Handlers/VoiceChatHandler.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/game/Warden/Warden.cpp
	src/server/game/Warden/WardenWin.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2015-07-25 21:53:30 +01:00
Rushor
97929e70c1 DB/SAI: Update Mount Hyjal 2015-07-25 22:32:14 +02:00
Rushor
5b762e9ff7 DB/SAI: Update Moonglade 2015-07-25 21:27:59 +02:00
Rushor
c796b01b42 DB/SAI: Update Loch Modan 2015-07-25 21:20:24 +02:00
Shauren
f03f5cc1f2 Buildsystem/MSVC: Enabled /bigobj for all x64 build types 
(cherry picked from commit 52127197ec)
 2015-07-25 16:42:46 +01:00
Shauren
130878c1a5 Core/Collision: Removed direct GameObject references from collision project 
(cherry picked from commit a029f97c82)

Conflicts:
	src/server/collision/Models/GameObjectModel.cpp
 2015-07-25 16:22:33 +01:00
Rushor
1681246e54 DB/SAI: Update Isle of Queldanas 2015-07-25 17:20:23 +02:00
Rushor
090c9b8c45 DB/SAI: Update Felwood 2015-07-25 17:13:19 +02:00
MitchesD
c40d3be6dc Core/SmartScripts: added new action SMART_ACTION_COMBAT_STOP 
* this avoid using hacks like evade, faction change or rooting. I wonder how SAI could be without this

(cherry picked from commit d68df33c76)
 2015-07-25 16:54:25 +02:00
Aokromes
0ece8e2734 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-07-25 16:43:28 +02:00
Aokromes
ac4b601e7a Move files to proper places 2015-07-25 16:42:44 +02:00
Rushor
1eb34fc3a0 DB/SAI: Update Dustwallow Marsh 2015-07-25 16:30:17 +02:00
joschiwald
8a9f1b871a Scripts/Ulduar: fixed freya loot and added missing conditions 
thanks @Keader

Closes #15098
 2015-07-25 15:28:39 +02:00
Aokromes
2f74e5099c Readme: Revert incorrect commit 2015-07-25 13:44:09 +02:00
Rushor
7e2b3ea459 DB/SAI: Update Dun Morogh 2015-07-25 10:56:29 +02:00
Rushor
2aaab040ce DB/Quest: A Flawless Plan 
* closes #12190
* thanks to @Pitcrawler + @Killyana for missing Spawns
 2015-07-25 08:52:47 +02:00
Aokromes
15e020a77f DB/Misc: More 3.3.5a fixes 2015-07-25 03:23:22 +02:00
Aokromes
8b92c83f6b Update 2015_07_24_07_world.sql 2015-07-25 03:16:05 +02:00
Aokromes
b86f678a8b DB/Misc: Revert incorrect moves 2015-07-25 03:03:29 +02:00
Carbenium
2fde367029 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 02:50:18 +02:00
Carbenium
24c19fe8b4 Core/ObjectGuid: revert some changes from merge 2015-07-25 02:04:48 +02:00
Killyana
6bac7d0120 DB/NPC/Quest: Grizzly Hills Giant and Rallying the Troops 
Close #14781
 2015-07-25 02:00:32 +02:00
Carbenium
bc8f5194c4 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 01:16:50 +02:00
Carbenium
ab0d8cec6d Core/Quest: Fix loading quests after merge 2015-07-25 01:02:55 +02:00
Rushor
6ce6445e38 DB/Spawn: Dark Iron Brewer 2015-07-25 00:51:45 +02:00
Rushor
a4b551ceb5 DB/Quest: Into the Soulgrinder 
* much thanks to @Killyana for all the Updates
* updates issue #3178
 2015-07-25 00:14:42 +02:00
Rushor
312da02d94 DB/Misc: Northwatch Foothold + Razor Hill Updates 2015-07-24 23:10:54 +02:00
Kilyana
09b11e2195 DB/NPC: Dark Iron Brewer 
closes #15047
 2015-07-24 22:32:46 +02:00
Carbenium
ad99eb8dfe server starts now successfully. login is possible 2015-07-24 22:15:10 +02:00
Rushor
af54aaf6d8 DB/SAI: Update Winterspring 2015-07-24 20:31:52 +02:00
Rushor
3950ea3881 DB/SAI: Update Feralas for 3.3.5 
* closes #15126
* updated by @Killyana
 2015-07-24 19:42:25 +02:00
Killyana
3bfdb548dd DB/Item: Sack of Ulduar Spoils / Large Sack of Ulduar Spoils 
* closes #15059
 2015-07-24 19:20:05 +02:00
Killyana
3c66a88d04 DB/Misc: Fixup evading Creatures 
closes #15094
 2015-07-24 19:17:56 +02:00
Killyana
5330a4c454 DB/Point of Interests: Locales points of interest 
closes #15110
 2015-07-24 19:16:00 +02:00
Killyana
a3f6523010 DB/Pages: Locales for page text 
* closes #15105
 2015-07-24 19:14:27 +02:00
Killyana
11d603a408 DB/Misc: Grim Guzzler Area Events 
closes #15138
 2015-07-24 19:09:50 +02:00
tkrokli
785fcdd838 DB/Misc: Stable Master Xon'cha - Flags 
* closes #15117
 2015-07-24 19:07:06 +02:00
Rushor
a321f56379 DB/Creature: Add Tabledance for Duokna 2015-07-24 17:36:42 +02:00
Warpten
a82e55f684 Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames. 2015-07-24 17:11:30 +02:00
Rushor
20815105a7 DB/SAI: Update Ghostlands + Darkshore 2015-07-24 17:00:07 +02:00
Aokromes
5c2ea73a92 DB/Misc: More 3.3.5a fixes 2015-07-24 15:31:13 +02:00
Vincent-Michael
9f04cbad21 Fix non pch build for Visual Studio 2015 compiler 
(cherry picked from commit df1f4969d8)
 2015-07-24 12:05:26 +01:00
Shauren
caf808163d Misc: Removed tabs 
(cherry picked from commit 4e83094354)
 2015-07-24 12:05:14 +01:00
DDuarte
d12fec67f2 Core/Misc: Add a few consts to methods 
(cherry picked from commit 7d9843c380)

Conflicts:
	src/server/bnetserver/Packets/ConnectionPackets.h
	src/server/game/AI/SmartScripts/SmartAI.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceSaveMgr.h
	src/server/game/Support/SupportMgr.h
 2015-07-24 12:02:57 +01:00
Gacko
73fd4fb49c Fix non pch build. 
(cherry picked from commit 49a6f7b7bd)
 2015-07-24 11:52:28 +01:00
Shauren
b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler 
(cherry picked from commit a22e4e121a)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
 2015-07-24 11:51:48 +01:00
Gacko
b703d53073 Fix non pch. 
(cherry picked from commit 5987391073)
 2015-07-24 11:35:47 +01:00
Vincent-Michael
5c5533c355 Core: Remove whitespaces 
(cherry picked from commit 5705555f1f)

Conflicts:
	src/server/game/Server/Packets/TicketPackets.h
 2015-07-24 11:35:34 +01:00
Carbenium
e0a660a7a4 Fix bnet server build 2015-07-24 01:54:59 +02:00