Commit Graph
100 Commits
Author SHA1 Message Date
click 93f8d212e0 Fix linuxbuild
--HG--
branch : trunk
2010-06-15 19:16:25 +02:00
Shauren ebb0785817 Commit from Lynx3d: Add assert to values that can cause nasty freeze, but should never occur with
valid input.

--HG--
branch : trunk
2010-06-15 17:08:04 +02:00
Trazom62 2a544c94b3 Implement Chef Hat.
Fixes issue #2514.

--HG--
branch : trunk
2010-06-15 00:04:03 +02:00
Xanadu edb8c7a8aa Removed useless comment columns from the pool system DB tables.
--HG--
branch : trunk
2010-06-14 22:22:11 +02:00
Shauren c3fed147d7 Removed useless vmap assembler solution file
--HG--
branch : trunk
2010-06-14 21:10:08 +02:00
Shauren b3f1bc11d9 Added support for removing blizz items from character creation info by adding entry to playercreateinfo_item with count -1
Added support for all class/all race in playercreateinfo_item by setting class/race to 0 (like currently playercreateinfo_spell)

--HG--
branch : trunk
2010-06-14 21:03:05 +02:00
Xanadu d095e315a0 Improved startup pool check a little.
--HG--
branch : trunk
2010-06-14 20:52:36 +02:00
Trazom62 d205de69bf implement ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY.
Fixe issues #2213.

--HG--
branch : trunk
2010-06-14 18:33:46 +02:00
John Holiver c88ecf99c3 Missing file from the last commit.
--HG--
branch : trunk
2010-06-14 11:44:55 -03:00
John Holiver 07289ab4f2 Fix Nature's Guardian ICD (5->30).
--HG--
branch : trunk
2010-06-14 11:40:25 -03:00
click d226e92ebb Fix linux compileissues when compiling with scripts - I actually forgot to reinstate it when cleaning up the CMakeLists.txt earlier. Sorry!
--HG--
branch : trunk
2010-06-14 11:27:44 +02:00
click 43f527b94f Fix compile-errors on older versions of GCC (missing definitions - thanks to lynx3d for the heads up)
(users are adviced to upgrade to a MORE RECENT version of GCC that supports the standardized tr1::unordered_map functionality though)

--HG--
branch : trunk
2010-06-14 02:43:18 +02:00
click b232204264 Remove old DO_MYSQL-params in CMakeLists.txt files - not required as we only support MySQL anyway
+ add partial support for finding headers on Windows (not yet done)

--HG--
branch : trunk
2010-06-14 02:00:30 +02:00
click 8a2a82d1e8 port over some usability-fixes from lynx3d on the vmapextractor and remove an old header-relic
--HG--
branch : trunk
2010-06-13 20:36:07 +02:00
click 5c8ccefef5 Remove duplicate DO_WARN conditional in toplevel CMakeLists.txt (thanks to imbecile for spotting)
--HG--
branch : trunk
2010-06-13 17:36:05 +02:00
Shauren ad8638742c Do not apply duration spellmods to spells with infinite duration (fixes Glyph of Eternal Water + Enduring Winter making water elemental last 5,10,15 seconds)
--HG--
branch : trunk
2010-06-13 15:55:30 +02:00
Machiavelli e6d0fa20cd Typo spotted by glizzard.ad
--HG--
branch : trunk
2010-06-13 14:24:44 +02:00
Machiavelli b6621ddf90 Add some safer casting conditions in Map::ScriptsProcess.
Fixes issue #2676
Fixes issue #2553

--HG--
branch : trunk
2010-06-13 13:29:31 +02:00
Shauren 6520261ea6 Added _CRT_SECURE_NO_WARNINGS preprocessor definition to windows project files to reduce warning spam
Removed duplicate project file for map extractor

--HG--
branch : trunk
2010-06-13 13:05:25 +02:00
click 34617d0965 Correction on scripts config-entry in CMakeLists.txt + some generic cleanup on the output
+ set proper cmake-tagging when building in release- or debug-mode

--HG--
branch : trunk
2010-06-13 00:15:23 +02:00
Shauren 38417ef2f6 Added forgotten field to item_set_names since this data come from WDB
--HG--
branch : trunk
2010-06-12 17:21:21 +02:00
click 057ea32adf Fix issues with missing the printf()-function on newer distributions (thanks to svannon and brian for helping)
--HG--
branch : trunk
2010-06-12 00:45:24 +02:00
click ccbff7a194 Remove README for the mapextractor, it's not used!
--HG--
branch : trunk
2010-06-11 23:14:14 +02:00
Shauren 4261828d63 Added support for item set names in case where item does not exist in item_template (like gladiator gear)
--HG--
branch : trunk
2010-06-11 20:02:46 +02:00
Shauren 96ac28ebad Fixed vmap assembler build in release mode - windows
Working as of this commit: map extractor debug, vmap extractor both and vmap assembler release

--HG--
branch : trunk
2010-06-11 13:57:10 +02:00
Shauren 5caa7e9c95 Fixed vmap extractor build on windows
--HG--
branch : trunk
2010-06-11 12:56:22 +02:00
Shauren 4d84a4e82e Fixed libmpq build on windows
Added 1 solution for map extractor, vmap extractor and vmap assembler
Fixed debug build of map extractor (windows), don't forget to compile dependencies (external - bzip, libmpq and zlib)

--HG--
branch : trunk
2010-06-11 12:25:49 +02:00
click 39e793b2bd Add extractors and assembler - EXTRACTION OF NEW MAPS IS REQUIRED!
This will allow for easier testing of functionality between different
projects, ie. one set of maps/vmaps instead of 2 (saves space, saves
time and saves us some confusion).

--HG--
branch : trunk
2010-06-11 05:01:30 +02:00
silverice d6d9d50952 Fix some memory leaks
--HG--
branch : trunk
2010-06-11 05:00:46 +03:00
Anubisss d9d6e5732d Add NULL rows for 2 ChatCommand table.
--HG--
branch : trunk
2010-06-11 01:55:04 +02:00
Anubisss 148f554814 Fix a mem leak in Item::IsTargetValidForItemUse().
--HG--
branch : trunk
2010-06-11 01:48:52 +02:00
Anubisss f3bf8f8778 If you allocate memory with malloc() you should deallocate it with free(), strdup() allocates with malloc() so use free() to deallocate it :).
--HG--
branch : trunk
2010-06-11 01:30:46 +02:00
Anubisss 6da05ec5d1 Fix memory leaks in ConditionManager.
--HG--
branch : trunk
2010-06-11 01:25:10 +02:00
Anubisss 169cbb5b1d Drop 'reload spell_script_target' command from DB because this table dropped with the ConditionManager.
--HG--
branch : trunk
2010-06-11 00:04:11 +02:00
Anubisss 605c3a4f1f Add a missing SQL from reload conditions.
--HG--
branch : trunk
2010-06-10 23:52:05 +02:00
Shauren 4507e7dd66 Fixed some spaces
--HG--
branch : trunk
2010-06-10 20:52:15 +02:00
Shauren 61bc0dce35 Fixed windows compile for game and TrinityCore
NOTE: config renamed from TrinityCore.conf to worldserver.conf

--HG--
branch : trunk
2010-06-10 19:22:53 +02:00
click 565abc1982 More upstream-changes to libmpq - synced with @302
--HG--
branch : trunk
2010-06-10 17:58:54 +02:00
Shauren 7195abfad0 Fixed TrinityRealm compile on windows
Fixed shared build on windows fully

NOTE: TrinityRealm config file has been renamed to authserver.conf!

--HG--
branch : trunk
2010-06-10 16:39:51 +02:00
silverice b318325f8c Use precompiled header for fast ace_wrappers build on win
--HG--
branch : trunk
2010-06-10 02:37:29 +03:00
John Holiver f2067f3791 Forgot to push the mod on world.sql from r67325b1a0a
--HG--
branch : trunk
2010-06-09 19:44:33 -03:00
John Holiver 5dff68e457 Allow to sell item for: money, extendedCost or money+extendedCost.
The new method (money+extende) can be used by using negative values on npc_vendor.ExtendedCost.
This one goes dedicated to ZxBiohazardZx.
Tnx also to VladimirMangos.

--HG--
branch : trunk
2010-06-09 19:38:15 -03:00
Anubisss 410eb3d1b6 Fix line endings in a file.
--HG--
branch : trunk
2010-06-09 23:48:08 +02:00
Shauren 489785418e win build: fixed game pch, generating revision.h, realm source dirs (but it doesnt build yet)
--HG--
branch : trunk
2010-06-09 22:22:02 +02:00
Shauren dabeaec464 Fixed [T10] Paladin 4P Protection bonus
Closes issue #2519.

--HG--
branch : trunk
2010-06-09 20:46:56 +02:00
Tartalo f3a01ff9d0 Link g3dlib against zlib
--HG--
branch : trunk
2010-06-09 18:25:46 +02:00
Tartalo bddfebb0c7 add -v version option to map_extractor
--HG--
branch : trunk
2010-06-09 17:20:06 +02:00
Tartalo 4323ba11d3 Fix some typos on authserver & worldserver renaming
--HG--
branch : trunk
2010-06-09 15:47:00 +02:00
Tartalo 2457c5a174 Add copyright notes to CMake files
--HG--
branch : trunk
2010-06-09 15:39:34 +02:00
Tartalo 767d9b4091 Strip trinityscript ASCII banner
--HG--
branch : trunk
2010-06-09 15:21:43 +02:00
Tartalo 062d2835dd Branch merge
--HG--
branch : trunk
2010-06-09 15:14:20 +02:00
Tartalo 078a73692a Rename trinity-realm to authserver
--HG--
branch : trunk
2010-06-09 15:13:07 +02:00
Tartalo 061df242a1 Rename trinity-core to worldserver
--HG--
branch : trunk
2010-06-09 15:11:46 +02:00
click c644d2f4c2 Add changes from the libmpq tip sourcetree
--HG--
branch : trunk
2010-06-09 15:05:14 +02:00
Tartalo 799d4ceaf6 Merge
--HG--
branch : trunk
2010-06-09 15:03:54 +02:00
Tartalo cc4413f6b4 Change binary names for tools/
--HG--
branch : trunk
2010-06-09 15:02:30 +02:00
click 032b181498 Add missing makefile for libmpq
--HG--
branch : trunk
2010-06-09 14:54:35 +02:00
Tartalo 96fbb4fdd4 CMake: Build shared/ only if DO_WORLDSERVER or DO_AUTHSERVER is enabled
--HG--
branch : trunk
2010-06-09 14:49:14 +02:00
Tartalo 7482d78ce6 Merge
--HG--
branch : trunk
2010-06-09 14:23:32 +02:00
Tartalo 5effc26ad3 Implement DO_WORLDSERVER and DO_AUTHSERVER options for cmake, both enabled by default
Needs more work to split shared/ and so on but it works

--HG--
branch : trunk
2010-06-09 14:15:57 +02:00
Rat 4cdb5c78f2 added revision.h O.o
game.vcproj update , game.lib now buildable
todo: auth+world server

--HG--
branch : trunk
2010-06-09 14:05:50 +02:00
Machiavelli f24290b47e Typo (It´s not like you can compile anyways)
--HG--
branch : trunk
2010-06-09 10:04:42 +02:00
Machiavelli 81bba22353 Update structure SMSG_AUTH_RESPONSE with response code AUTH_WAIT_QUEUE.
Fixes issue #2631

--HG--
branch : trunk
2010-06-09 09:59:28 +02:00
Rat fb96f2b1d8 added game.vcproj for new dir struct, don't cry, its full of temp data atm
shared.vcproj was added accidentally two revs ago (bah its early in the morning)

--HG--
branch : trunk
2010-06-09 08:14:58 +02:00
Rat bd544bae75 added new solution file with correct project linking
--HG--
branch : trunk
2010-06-09 08:10:06 +02:00
Rat ce25918f4c removed old project files
new ones will be linked from externals

--HG--
branch : trunk
2010-06-09 08:05:53 +02:00
Rat 0071f867e5 delme!
--HG--
branch : trunk
2010-06-09 08:02:31 +02:00
Rat c1ddb2f21e added openssl include files for win use
added mysql include files for win use

--HG--
branch : trunk
2010-06-09 08:01:51 +02:00
click b887e22165 clean up external/bzip2 a wee bit more (no need for the actual bzip2.c and testfiles)
--HG--
branch : trunk
2010-06-09 00:22:15 +02:00
click 7561bab716 Change around some more headers to adhere to new strucutre and namebase
--HG--
branch : trunk
2010-06-08 23:44:55 +02:00
Tartalo 89dd005ff8 some vmap3_extractor/ cmake fixes
--HG--
branch : trunk
2010-06-08 22:48:52 +02:00
Tartalo 275eff98bf some tools/vmap3_assembler/ cmake file fixes
--HG--
branch : trunk
2010-06-08 22:43:04 +02:00
Tartalo f5d44784e1 Fix some typos and remove parent merged cmake file
--HG--
branch : trunk
2010-06-08 21:40:27 +02:00
Tartalo 4ec97e918e Some fixes for worldserver cmake file
--HG--
branch : trunk
2010-06-08 21:22:43 +02:00
Tartalo 00d552ecd4 Fix typo. Ty Shauren
--HG--
branch : trunk
2010-06-08 21:15:48 +02:00
Tartalo 4816116149 Merge
--HG--
branch : trunk
2010-06-08 21:11:41 +02:00
Tartalo 220d4fa29c More fixes for tools/ cmake files
--HG--
branch : trunk
2010-06-08 21:11:07 +02:00
click a85cd74fbd Add crosscompilable libmpq library (with the upstream-fixes by lynx3d and faramir)
--HG--
branch : trunk
2010-06-08 21:07:59 +02:00
Rat 413af7b21f fix ace build on win (without ssl)
fix g3dlite build on win
fix sockets build on win
removed openssl placeholders (not needed)

--HG--
branch : trunk
2010-06-08 20:41:52 +02:00
click 2238007e4e Add libmpq-0.4.2 (was missing from sourcetree after cleanup)
--HG--
branch : trunk
2010-06-08 19:29:54 +02:00
Tartalo ec580c8f68 Some fixes for map_extractor cmake file
--HG--
branch : trunk
2010-06-08 19:28:52 +02:00
Machiavelli e5aa4f7be9 Only proc Infusion of Light (active buff) on Holy Shock criticals. (Problem introduced in previous fix)
Author: Shauren

--HG--
branch : trunk
2010-06-08 16:12:43 +02:00
Machiavelli 04955cfb23 Fix Infusion of Light talent (53569,53576), properly cast HoT on target after Flash of Light cast when target has Sacred Shield active.
Big thanks to Shauren, QAston and JohnHoliver.

--HG--
branch : trunk
2010-06-08 15:41:37 +02:00
click 332b0f3c8e Properly build and link core (yay!)
- Not done yet : Sorting out the PCH-system on *nix
- Not done yet : Sorting out scriptcompilation (still broken)

--HG--
branch : trunk
2010-06-08 08:59:38 +02:00
click f867f6d7a8 Get g3dlib, zlib and jemalloc to build again
--HG--
branch : trunk
rename : opt/cleanup/tab2spaces.sh => contrib/cleanup/tab2spaces.sh
rename : opt/cleanup/whitespace.sh => contrib/cleanup/whitespace.sh
rename : opt/conf_merge/README => contrib/conf_merge/README
rename : opt/conf_merge/index.php => contrib/conf_merge/index.php
rename : opt/conf_merge/merge.php => contrib/conf_merge/merge.php
rename : doc/AuctionHouseBot.txt => docs/AuctionHouseBot.txt
rename : doc/DocStructure.dox => docs/DocStructure.dox
rename : doc/Doxyfile.in => docs/Doxyfile.in
rename : doc/EventAI.txt => docs/EventAI.txt
rename : doc/HowToScript.txt => docs/HowToScript.txt
rename : doc/TextTables.txt => docs/TextTables.txt
rename : doc/UnixInstall.txt => docs/UnixInstall.txt
rename : externals/jemalloc/include/internal/arena.h => externals/jemalloc/jemalloc/internal/arena.h
rename : externals/jemalloc/include/internal/base.h => externals/jemalloc/jemalloc/internal/base.h
rename : externals/jemalloc/include/internal/chunk.h => externals/jemalloc/jemalloc/internal/chunk.h
rename : externals/jemalloc/include/internal/chunk_dss.h => externals/jemalloc/jemalloc/internal/chunk_dss.h
rename : externals/jemalloc/include/internal/chunk_mmap.h => externals/jemalloc/jemalloc/internal/chunk_mmap.h
rename : externals/jemalloc/include/internal/chunk_swap.h => externals/jemalloc/jemalloc/internal/chunk_swap.h
rename : externals/jemalloc/include/internal/ckh.h => externals/jemalloc/jemalloc/internal/ckh.h
rename : externals/jemalloc/include/internal/ctl.h => externals/jemalloc/jemalloc/internal/ctl.h
rename : externals/jemalloc/include/internal/extent.h => externals/jemalloc/jemalloc/internal/extent.h
rename : externals/jemalloc/include/internal/hash.h => externals/jemalloc/jemalloc/internal/hash.h
rename : externals/jemalloc/include/internal/huge.h => externals/jemalloc/jemalloc/internal/huge.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h => externals/jemalloc/jemalloc/internal/jemalloc_internal.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h.in => externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
rename : externals/jemalloc/include/internal/mb.h => externals/jemalloc/jemalloc/internal/mb.h
rename : externals/jemalloc/include/internal/mutex.h => externals/jemalloc/jemalloc/internal/mutex.h
rename : externals/jemalloc/include/internal/prof.h => externals/jemalloc/jemalloc/internal/prof.h
rename : externals/jemalloc/include/internal/ql.h => externals/jemalloc/jemalloc/internal/ql.h
rename : externals/jemalloc/include/internal/qr.h => externals/jemalloc/jemalloc/internal/qr.h
rename : externals/jemalloc/include/internal/rb.h => externals/jemalloc/jemalloc/internal/rb.h
rename : externals/jemalloc/include/internal/stats.h => externals/jemalloc/jemalloc/internal/stats.h
rename : externals/jemalloc/include/internal/tcache.h => externals/jemalloc/jemalloc/internal/tcache.h
rename : externals/jemalloc/include/internal/totally_not_p_r_n.h => externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
rename : externals/jemalloc/include/jemalloc.h => externals/jemalloc/jemalloc/jemalloc.h
rename : externals/jemalloc/include/jemalloc.h.in => externals/jemalloc/jemalloc/jemalloc.h.in
rename : externals/jemalloc/include/jemalloc_defs.h => externals/jemalloc/jemalloc/jemalloc_defs.h
rename : externals/jemalloc/include/jemalloc_defs.h.in => externals/jemalloc/jemalloc/jemalloc_defs.h.in
2010-06-08 08:04:26 +02:00
Tartalo 726a76e93a Some cmake fixes for worldserver
--HG--
branch : trunk
2010-06-08 01:34:51 +02:00
Tartalo a5f4e3de94 more cmake fixes. comment collision compilation until fixed
--HG--
branch : trunk
2010-06-08 01:20:06 +02:00
Tartalo c834449400 More fixes for game/ cmake compilation
--HG--
branch : trunk
2010-06-07 23:40:17 +02:00
Tartalo fdae709af7 Fix include dirs in game/ cmake file
--HG--
branch : trunk
2010-06-07 22:58:24 +02:00
Tartalo 156f4c3057 Merge cmake files from shared/
--HG--
branch : trunk
2010-06-07 22:34:36 +02:00
Tartalo a54624fa39 Add some messages to main cmake file
--HG--
branch : trunk
2010-06-07 21:58:26 +02:00
Rat 8a56dfe939 fixed bzip2 for win (whoops..)
--HG--
branch : trunk
2010-06-07 21:28:51 +02:00
click a3a5697516 upgrade to new version of utf8cpp
--HG--
branch : trunk
2010-06-07 20:50:02 +02:00
click 0000768855 Add SFMT (SIMD-oriented Fast Mersenne Twister) to externals library + add packagelist
--HG--
branch : trunk
2010-06-07 20:45:58 +02:00
Machiavelli 7120513afe Fix logic.
--HG--
branch : trunk
2010-06-07 20:12:14 +02:00
Rat e4e13c2bb8 removed 'dep' folder, no more needed
--HG--
branch : trunk
2010-06-07 19:35:24 +02:00
Rat 32546e2282 added ace + vcproj for win
--HG--
branch : trunk
2010-06-07 19:10:55 +02:00
XTZGZoReX fcd58c134d * Move VMap3 code to a separate static 'collision' library.
--HG--
branch : trunk
2010-06-07 13:57:34 +02:00
Machiavelli 24c720d899 Fix a typo, spotted by tigercop773. If the reset of the repo wasn´t entirely borked, this would have fixed compile.
--HG--
branch : trunk
2010-06-07 13:24:32 +02:00
Tartalo bef0ed9a7f Fix some paths on shared/ includes and CMakeLists.txt
--HG--
branch : trunk
2010-06-07 12:57:21 +02:00