Commit Graph

8534 Commits

Author SHA1 Message Date
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
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
Brian
1fd7082712 * Reverted to the old G3D library, however collision still will not compile
* and is therefore commented out.

--HG--
branch : trunk
2010-06-07 18:32:20 -06: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
Brian
498f62f4cc * Well 94% isn't bad. Last thing to fix is collision compiling.
* But I need a break.

--HG--
branch : trunk
2010-06-07 16:21:52 -06:00
Brian
6650068b5e * Nearly done with fixing the Linux build.
* Thanks to samccstudios for saving me some time with the Outlands scripts.

--HG--
branch : trunk
2010-06-07 15:59:21 -06: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
Brian
b0e1605455 * Getting closer (at least for Linux :) )
--HG--
branch : trunk
2010-06-07 14:44:18 -06:00
Tartalo
156f4c3057 Merge cmake files from shared/
--HG--
branch : trunk
2010-06-07 22:34:36 +02:00
Brian
d9127cdee7 * Reverted to the old Mersenne Twister till the new one can be properly added
--HG--
branch : trunk
2010-06-07 14:13:56 -06:00
Tartalo
a54624fa39 Add some messages to main cmake file
--HG--
branch : trunk
2010-06-07 21:58:26 +02:00
Brian
f1d39c2aa2 * Fixed damn copy / paste type from my last commit. It is still very broken
* though :P

--HG--
branch : trunk
2010-06-07 13:33:31 -06:00
Rat
8a56dfe939 fixed bzip2 for win (whoops..)
--HG--
branch : trunk
2010-06-07 21:28:51 +02:00
Brian
1a3f840a17 * broken
--HG--
branch : trunk
2010-06-07 13:20:46 -06: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
Brian
15f8bbe9ca * More cleanup
--HG--
branch : trunk
2010-06-07 12:08:15 -06: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
Brian
2e0f8fb6e5 * Nope not yet
--HG--
branch : trunk
2010-06-07 09:23:19 -06:00
Brian
2435b4152d * Nope still won't build yet
--HG--
branch : trunk
2010-06-07 09:04:14 -06:00
Brian
12dc250bf0 * Lib trinitydatabase builds again
--HG--
branch : trunk
2010-06-07 07:58:31 -06:00