 Spp
|
8ae0f2332c
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
src/server/scripts/Kalimdor/azshara.cpp
|
2012-11-26 08:43:29 +01:00 |
|
|
Spp
|
26006551e2
|
Fix wrong replacement in 32c259b1ce (Fixes a minor error msg)
|
2012-11-23 12:30:11 +01:00 |
|
|
Spp
|
b9b57c2d62
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
|
2012-11-22 15:04:59 +01:00 |
|
|
Spp
|
32c259b1ce
|
Core/Channels: Remove unnecessary calls to FindPlayer wherever is possible
- Add better opcode debug messages
- Move isValidChatMessage debug messages to trace
|
2012-11-22 12:11:35 +01:00 |
|
|
Spp
|
1ecc55272e
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/GameObjectAI.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
|
2012-11-20 16:01:31 +01:00 |
|
|
Spp
|
b99c347747
|
Core: Remove Player.h dependency from all the possible headers
|
2012-11-17 05:18:37 +01:00 |
|
|
Spp
|
013fb1f4d9
|
Core/Misc: reduced amount of string memory allocations (Step I)
|
2012-10-24 15:34:48 +02:00 |
|
|
kiper
|
8299627ed9
|
Update headers for 2012. HAPPY NEW YEAR!!!
|
2012-01-01 00:32:13 +01:00 |
|
|
Spp
|
af05915b9e
|
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
|
2011-09-15 14:12:57 +02:00 |
|
|
leak
|
1003f30448
|
Add spaces after commas
|
2011-04-29 20:47:02 +02:00 |
|
|
Machiavelli
|
957c69de83
|
Update copyright note for 2011.
Happy new year.
|
2011-01-01 15:01:13 +01:00 |
|
|
Shauren
|
928443d899
|
Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)
--HG--
branch : trunk
|
2010-12-23 23:25:44 +01:00 |
|
|
click
|
f0c4241ea4
|
Remove the accidental additions of CRLF-crap from the header updates
--HG--
branch : trunk
|
2010-10-07 15:35:36 +02:00 |
|
|
click
|
a67d7c9afd
|
Copyright header updates - part 3... (and some whitespace cleanups)
--HG--
branch : trunk
|
2010-10-07 14:00:52 +02:00 |
|
|
silinoron
|
8649bee17f
|
Replace World::getConfig with World::getFloatConfig, World::getIntConfig, and World::getBoolConfig.
Also fix a warning from a previous commit.
--HG--
branch : trunk
|
2010-08-23 19:56:47 -07:00 |
|
|
Machiavelli
|
0f7657b68c
|
Get rid of Trinity Singleton and Threading patterns and replace them with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es respectively.
Also get rid of unused CountedReference class that used Trinity threading pattern.
--HG--
branch : trunk
|
2010-06-25 00:18:01 +02:00 |
|
|
Brian
|
b76b6700ed
|
* Linux compile with and without PCH fixed
* Script library compile fixed
* --todo: fix all scripts themselves :)
--HG--
branch : trunk
|
2010-06-08 13:05:47 -06:00 |
|
|
XTZGZoReX
|
62200e8d02
|
* Even more restructuring of the game library.
--HG--
branch : trunk
|
2010-06-06 22:55:56 +02:00 |
|