Commit Graph

8557 Commits

Author SHA1 Message Date
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
Brian
dd5583e962 * Removed static revision.h from src/server/shared
* This is a dynamically generated file

--HG--
branch : trunk
2010-06-09 07:02:24 -06: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
Brian
44ab7530b7 * Removed not needed client directory for now
--HG--
branch : trunk
2010-06-09 00:57:17 -06:00
Brian
5c21447ad7 * Missed directory
--HG--
branch : trunk
2010-06-09 00:55:56 -06:00
Brian
c97247a990 * Renamed some directories in sql/ to more accurately reflect their purpose
--HG--
branch : trunk
rename : sql/auth_database.sql => sql/base/auth_database.sql
rename : sql/character_database.sql => sql/base/character_database.sql
rename : sql/world_database.sql => sql/base/world_database.sql
rename : sql/tools/CMakeLists.txt => sql/create/CMakeLists.txt
rename : sql/tools/create_mysql.sql => sql/create/create_mysql.sql
rename : sql/tools/drop_mysql.sql => sql/create/drop_mysql.sql
rename : sql/full/CMakeLists.txt => sql/scripts/CMakeLists.txt
rename : sql/full/world_script_texts.sql => sql/scripts/world_script_texts.sql
rename : sql/full/world_script_waypoints.sql => sql/scripts/world_script_waypoints.sql
rename : sql/full/world_scripts_full.sql => sql/scripts/world_scripts_full.sql
2010-06-09 00:54:15 -06:00
Brian
0a4899646d * Merge
--HG--
branch : trunk
2010-06-09 00:34:46 -06:00
Brian
02efe02b43 * Added missing include paths that got lost in the merge a few revs ago
* Fixed realative path to Reference.h
* Re-enabled PCH building by default
* Re-enabled scripts building by default
* Linux compile now fully functional again.

--HG--
branch : trunk
2010-06-09 00:34:22 -06: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
Brian
9cf85c0549 * Some additions to the THANKS file
--HG--
branch : trunk
2010-06-08 17:06:30 -06:00
Brian
e20d3026b3 * Small change to README file
--HG--
branch : trunk
2010-06-08 17:04:14 -06:00
Brian
c548bbc0a2 * merge
--HG--
branch : trunk
2010-06-08 17:01:40 -06:00
Brian
bc04d7ce25 * Remove the last of the realative paths from #include statements
--HG--
branch : trunk
2010-06-08 17:01:03 -06: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
Brian
dee7fd1382 * Remove more not needed relative paths in include files
--HG--
branch : trunk
2010-06-08 16:13:55 -06:00
Brian
9b6669e5f3 * Remove more relative paths from includes
--HG--
branch : trunk
2010-06-08 15:50:23 -06: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
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
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
Shauren
ae2f8d70a0 Added support for reloading creature_onkill_reputation table
Commented ace in externals/CmakeLists.txt and moved zlib before g3dlite, requested by click

--HG--
branch : trunk
2010-06-08 17:19:36 +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
Brian
c08a7d6348 * Finally it compiles (thanks click for noticing the "typo").
* However, still need to get linking fixed.

--HG--
branch : trunk
2010-06-07 19:04:11 -06:00