Commit Graph

22 Commits

Author SHA1 Message Date
Shauren
75a790ca47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-26 17:06:50 +02:00
Vincent_Michael
9802c7b891 Scripts/Misc: Coding Style unification? (by Aokromes) 2013-10-22 20:24:05 +02:00
Vincent-Michael
f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp
2013-08-18 18:13:14 +02:00
joschiwald
2b19ba1879 Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes 2013-08-18 01:41:10 +02:00
Vincent-Michael
8acefbff8c Scripted: Use now override for instance scripts 2013-08-10 17:42:12 +02:00
Vincent-Michael
de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Nay
3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts)
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
2013-07-06 20:21:45 +01:00
Gacko
d89626f767 Script/Event: Fix warnings in Children's Week script 2013-04-01 17:52:20 +02:00
Nefarion
49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Shauren
5b414bb813 Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value 2013-02-19 17:35:27 +01:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Vincent-Michael
7ed100a74e Core/Scripting: Small cleanup 2012-11-25 01:01:22 +01:00
Spp
bf8b642a47 Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4) 2012-11-19 12:02:33 +01:00
Spp
b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
click
e587d8c1af Core. Fix non-PCH building (again)... 2012-11-03 15:04:30 +01:00
Spp
d2ba73d97f Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions)
Core/Misc: tab to spaces and remove trailing whitespaces
2012-10-29 12:28:12 +01:00
Gacko
ead804df92 Core: Fix compile warnings 2012-10-25 22:08:10 +02:00
Gacko
cd26aa7206 Core: Children's Week - Remove event.h include 2012-10-25 16:16:01 +02:00
Gacko
9c4cf9b39c Core/DB: Children's Week 2012-10-21 14:33:20 +02:00