Commit graph

31 commits

Author SHA1 Message Date
tomrus88
ee7f7a0a08 Merge branch 'master' into 303
Conflicts:
	src/game/Player.cpp
	src/mangosd/mangosd.conf.dist.in
2008-11-30 14:05:56 +03:00
VladimirMangos
874339ecee Fixed path to source file in VC80/VC90 framework.vcproj 2008-11-29 08:03:59 +03:00
tomrus88
397efd4fac Merge branch 'master' into 303
Conflicts:
	src/game/SpellEffects.cpp
2008-11-18 18:08:58 +03:00
VladimirMangos
c37cfd0c2f [6836] Use /bigobj option in VC80/VC90 x64 builds for game.vcproj buuld.
This will solve problems with fatal error (too many sections in ObjectMrg.obj).
2008-11-17 17:59:06 +03:00
tomrus88
52b0ab1f89 Merge branch 'master' into 303 2008-11-17 01:50:37 +03:00
hunuza
79558a32d9 Introduce player map references. 2008-11-16 21:47:18 +01:00
tomrus88
e738198eb4 Merge branch 'master' into 303
Conflicts:
	src/game/ItemPrototype.h
	src/game/ObjectMgr.cpp
	src/shared/Database/SQLStorage.cpp
2008-11-16 17:20:43 +03:00
Wyk3d
074bd3a08f [6827] Added an interface for defining custom SQLStorage loaders. 2008-11-16 01:02:13 +02:00
tomrus88
204b61c220 Added empty vehicle class, vehicle*.dbc struct's 2008-11-11 00:05:00 +03:00
tomrus88
7974d1cb94 Merge branch 'master' into 303
Conflicts:
	src/game/Player.cpp
	src/game/Spell.cpp
2008-11-08 16:52:28 +03:00
VladimirMangos
5222f49820 Use (if available) TR1 unordered_map instead hash_map at Unix/Linux (in GCC 4.0.0 and later) and Windows (VC90 and later) 2008-11-08 11:44:13 +03:00
Wyk3d
cfd9ccdaaf [6800] Added revision number output.
* Changed genrevision to use * instead of unknown when some info can not be found
* Added the git_id tool which is used to generate changes to revision_nr.h and the commit message
2008-11-08 01:50:42 +02: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
VladimirMangos
ce351382a3 Remove unused src/game/HateMatrix.h and references.
Also one explicit include for used header.
2008-11-04 22:28:06 +03:00
tomrus88
d4ab3ca463 Merge branch 'master' into 303 2008-11-04 18:28:39 +03:00
hunuza
843a0d7d02 Cache GM tickets on server startup. 2008-11-03 21:32:42 +01:00
tomrus88
8d733e8f8a Merge branch 'master' into 303 2008-10-28 23:04:02 +03:00
VladimirMangos
454ff6e667 Add *.user to all Visual Stidio versions .gitignore 2008-10-28 17:41:15 +03:00
tomrus88
97bf2e7d68 Fixed windows build, account data should be saved server side now 2008-10-27 20:00:56 +03:00
tomrus88
233e5eac6f Merge branch 'master' into 303
Conflicts:
	src/game/ObjectMgr.h
2008-10-27 01:27:48 +03:00
VladimirMangos
f8a94b84c3 Use 0.12.0-DEV instead 0.12.0-SVN for mark MaNGOS version in development. 2008-10-26 18:18:20 +03:00
tomrus88
bfaf5660f8 Updated project files 2008-10-26 10:10:32 +03:00
VladimirMangos
03621bf5f3 Restore build at Windows for x64 mode (debug/release). 2008-10-26 00:24:03 +04:00
VladimirMangos
643f6af8c7 Rename gensvnrevision and related files and references to genrevision/etc.
Also svn_revision.h renmaed to revision.h and defines in to it also renamed. MaNGOS code updated.
Other projects using this genrevison tool need to be updated in similar way.
2008-10-25 15:35:25 +04:00
TheLuda
045b918478 Build fixes for Windows: use proper dynamic linking to make the ACE happy. 2008-10-21 11:56:46 +02:00
TheLuda
c9026395fc Revert "Fixed Windows projects for shared library [#11 tagged:committed milestone:"0.12" state:resolved]"
This reverts commit bf5fcf69e720842e6649ac8f7c8bc8cbe8397f4a.
2008-10-20 21:41:20 +02:00
TheLuda
40e318d491 Fixed Windows projects for shared library [#11 tagged:committed milestone:"0.12" state:resolved] 2008-10-20 19:38:11 +02:00
unknown
9d0c84d5c5 Removed unused code. 2008-10-20 17:05:05 +02:00
VladimirMangos
c4a14051ee * Add some generated at MaNGOS build file ignore rules. Mostly Windows build related. 2008-10-20 02:40:35 +04:00
ApoC
3ba1599a78 Restored build on Windows 2008-10-17 14:32:04 +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