tomrus88
71b1065c8b
Merge branch 'master' into 303
...
Conflicts:
src/game/CharacterHandler.cpp
src/game/Chat.h
src/game/Player.h
src/game/World.h
src/game/debugcmds.cpp
2008-12-16 07:30:23 +03:00
ApoC
a5331ab517
[6910] Implemented rewritten arenas. Original author w12x@getmangos.com
...
Many thanks also to:
Balrok@github.com for long time updating.
Triply@github.com for great work in rewriting process.
All who I forget to name.
Signed-off-by: ApoC <apoc@nymfe.net>
2008-12-16 00:17:24 +01:00
tomrus88
af1e1d7794
Merge branch 'master' into 303
...
Conflicts:
src/game/Corpse.cpp
src/game/DynamicObject.cpp
src/game/GameObject.cpp
src/game/Object.h
src/game/Unit.cpp
src/game/Unit.h
2008-12-05 18:16:31 +03:00
ApoC
d5da240913
[6871] Fixed BG Queue need players count announce.
...
Signed-off-by: ApoC <apoc@nymfe.net>
2008-12-02 21:59:24 +01:00
tomrus88
78ec66babc
Merge branch 'master' into 303
...
Conflicts:
contrib/extractor/System.cpp
contrib/extractor/ad.exe
src/game/WorldSocket.cpp
2008-11-06 15:50:47 +03:00
hunuza
90828fa699
Cache highest arena team/guild ids. Some code clean up.
2008-11-05 16:58:57 +01:00
VladimirMangos
004bdf1d3c
Fixed some format arg type/value pairs. Other warnings.
2008-11-03 14:21:24 +03:00
VladimirMangos
8563b88859
Fixed some format arg type/value pairs. Other warnings.
2008-11-01 23:53:35 +03:00
tomrus88
30142bd7cd
Updated battlegrounds stuff
2008-10-26 10:22:30 +03:00
TheLuda
adc46ef907
Applied new coding standard, see http://github.com/mangos/mangos/wikis/codingstandards for more.
2008-10-15 18:26:08 +02:00
TheLuda
800ee76535
Imported MaNGOS revision 6767 from http://mangos.svn.sourceforge.net/svnroot/mangos/trunk/
2008-10-14 00:29:20 +02:00
