Commit Graph

10269 Commits

Author SHA1 Message Date
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
Brian
5ee985b231 * Rename trinitycore.conf / ico / windows properties
--HG--
branch : trunk
rename : src/server/worldserver/trinitycore.conf.dist => src/server/worldserver/worldserver.conf.dist
rename : src/server/worldserver/TrinityCore.ico => src/server/worldserver/worldserver.ico
rename : src/server/worldserver/TrinityCore.rc => src/server/worldserver/worldserver.rc
2010-06-09 07:53:07 -06:00
Brian
bdb4b2bf8f * Rename conf file / icon file / Window file properties
--HG--
branch : trunk
rename : src/server/authserver/trinityrealm.conf.dist => src/server/authserver/authserver.conf.dist
rename : src/server/authserver/TrinityRealm.ico => src/server/authserver/authserver.ico
rename : src/server/authserver/TrinityRealm.rc => src/server/authserver/authserver.rc
2010-06-09 07:48:29 -06:00
Tartalo
4323ba11d3 Fix some typos on authserver & worldserver renaming
--HG--
branch : trunk
2010-06-09 15:47:00 +02:00
Brian
0124d519dc * Update .hgignore with new tree structure
--HG--
branch : trunk
2010-06-09 07:41:24 -06: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
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