Commit Graph

9086 Commits

Author SHA1 Message Date
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
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
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
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
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
bc04d7ce25 * Remove the last of the realative paths from #include statements
--HG--
branch : trunk
2010-06-08 17:01:03 -06: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
4ec97e918e Some fixes for worldserver cmake file
--HG--
branch : trunk
2010-06-08 21:22:43 +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
click
2238007e4e Add libmpq-0.4.2 (was missing from sourcetree after cleanup)
--HG--
branch : trunk
2010-06-08 19:29:54 +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
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
Brian
1a3f840a17 * broken
--HG--
branch : trunk
2010-06-07 13:20:46 -06: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
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
Brian
36584926e6 * Auth lib builds again.
--HG--
branch : trunk
2010-06-07 07:43:20 -06:00
Brian
cbaf5587d6 * shared lib builds again under Linux.
--HG--
branch : trunk
2010-06-07 07:13:35 -06: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
Tartalo
ce1b22ed0c More cmake fixes. Now cmake runs without errors with -DO_SCRIPTS=0
--HG--
branch : trunk
2010-06-07 12:41:57 +02:00
Tartalo
74b3fb53c0 Some fixes for shared/CMakeLists.txt
Adjust game/CMakeLists.txt to the new structure (needs more work)

--HG--
branch : trunk
2010-06-07 12:13:15 +02:00
Spp
e7bb8bca1e Group::Disband: remove no longer needed code check.
--HG--
branch : trunk
2010-06-07 09:37:36 +02:00