Commit Graph
155 Commits
Author SHA1 Message Date
Shauren db75157d74 Fixed icons for windows
--HG--
branch : trunk
2010-08-08 21:04:56 +02:00
click 1f80c7b3c0 Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
--HG--
branch : trunk
2010-08-08 19:45:53 +02:00
XTZGZoReX 9083271a2f * Some singleton renames for consistency:
accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr

--HG--
branch : trunk
2010-08-08 05:25:45 +02:00
XTZGZoReX 909e332579 * Rename: BattleGround -> Battleground.
--HG--
branch : trunk
2010-08-08 04:37:24 +02:00
XTZGZoReX bee3e7c681 * Some cleanups and fixes in cmakes.
--HG--
branch : trunk
2010-08-08 04:08:18 +02:00
click 9a8342abb7 Buildsystem: Make core buildable under Windows again
- changed OpenSSL detection of headers around slightly
- changed paths to MySQL-headers on Windows in a few files
- removed precompiled header for scripts being built when building game
- added requirement of building revision.h to be built before building shared
- added some generic buildfixes (thanks zor)
- use resource-files, allowing for icons to show up on windows

--HG--
branch : trunk
2010-08-08 03:33:21 +02:00
XTZGZoReX f1c571a79e * Added new World::OnStartup/OnShutdown hooks.
--HG--
branch : trunk
2010-08-07 14:30:10 +02:00
click f5d57f05f7 Remove AuctionHouseBot-functionality from core (some cleanups may be required)
--HG--
branch : trunk
2010-08-06 04:22:07 +02:00
click c298bdb662 Remove duplicate "Error:" from some outError messages...
--HG--
branch : trunk
2010-07-31 03:12:51 +02:00
click f213f2c7d9 Buildsystem/CMake: Include core/script headerfiles in generated MSVC-projects.
- Still "work in progress", as in missing filters and MSVC folder layouts.
- external libraries not fully "headerified" (not really required)

--HG--
branch : trunk
2010-07-29 21:08:16 +02:00
click b118ab2356 remove ANSI escape codes from auth/worldserver error-output since it doesn't work on MS-based OS'es *sighs*
--HG--
branch : trunk
2010-07-29 17:15:03 +02:00
click 969bf213b8 Fix windows-build and change some warnings if configuration-files can not be read properly
- Add proper warning about missing [authserver] -tag in authserver configuration file if not found.
- Add proper warning about missing [worldserver] -tag in worldserver configuration file if not found.
Thanks to Qaston for finding the redefininition of strdup!

--HG--
branch : trunk
2010-07-29 09:00:55 +02:00
click 3296a944e7 Convert to using ACE for reading configurationfiles, and remove dependency on dotconfpp configuration library and related files
(patch by astellar - and a thankyou to vladimir for being a russian teddybear)

--HG--
branch : trunk
2010-07-29 01:22:45 +02:00
click bfc6dec072 Cut away DO_*-parts from buildsystem and specific files checking for it.
--HG--
branch : trunk
2010-07-27 05:40:21 +02:00
Spp 495bf7df45 Add missing # in worldserver conf file, patch by Aokromes
--HG--
branch : trunk
2010-07-26 08:37:18 +02:00
XTZGZoReX f5c1bbbd33 Fix naming in config files.
--HG--
branch : trunk
2010-07-23 22:01:19 +02:00
Shauren 0f71347d58 Fixed windows project files - added SOAP
Added project file for SOAP
Applied Trinity coding standards to TCSoap files

--HG--
branch : trunk
2010-07-23 11:27:04 +02:00
click 3f9ea75bfa Add SOAP-implementation (based on Benjys patch and adapted for latest core by xk1)
--HG--
branch : trunk
2010-07-23 09:26:23 +02:00
Brian c8662c888b * Implemented DB cleaning on startup
* Must be enabled in conf AND set in worldstates for what you want to clean
* CLEANING_FLAG_ACHIEVEMENT_PROGRESS  = 0x1,
* CLEANING_FLAG_SKILLS                = 0x2,
* CLEANING_FLAG_SPELLS                = 0x4,
* CLEANING_FLAG_TALENTS               = 0x8
* Set to 0xF to clean all 4
* Patch by hunuza

--HG--
branch : trunk
2010-07-22 13:41:19 -06:00
Brian 4320b10901 * Implement the ability to delete characters without them being removed from
* the DB, so they can be unerased
* Original patch by DasBlub
* Ported to Trinty by Az@zel

--HG--
branch : trunk
2010-07-21 12:13:23 -06:00
Shauren 6a539270ec Added global disable system and moved all disable fields/tables/configs into it
NOTE: instance disables were not converted for new system! if you had some then you need to fix that using new system

--HG--
branch : trunk
2010-07-21 12:14:23 +02:00
Xanadu 0bda7fd361 Enable VMaps by default.
--HG--
branch : trunk
2010-07-21 06:44:41 +02:00
teacher 94f143ee46 Renamed "realmd" to "auth" in config files.
Renamed "character_database.sql" to "characters_database.sql". (yeah I know, you're gonna hate me, but I'm pedantic!)

--HG--
branch : trunk
2010-07-12 18:00:27 +02:00
Shauren 5ad02b578d Added support for all raid quest types
Added new config option to allow non-raid quest progression when in raid group

code by Vladimir

--HG--
branch : trunk
2010-07-12 14:38:24 +02:00
click 45e2a65fad Update VMap3 to "final" release (REEXTRACTION OF MAPS/VMAPS IS REQUIRED!) - thanks to Lynx3d (again)
- add magic-header to .vmtile files
- calculate waterlevels for non-flat surfaces in a more correct way
- make MSVC shut up about float-issues
- change logging around a bit (output function that the respective logentry comes from)
- remove remaining Stormlib leftovers
- set indoor/outdoor check to enabled by default (more blizzlike)

--HG--
branch : trunk
2010-07-09 18:02:46 +02:00
click 0a5a30a592 Minor cleanups to accomodate CMake-usage on Windows
--HG--
branch : trunk
2010-06-30 18:46:55 +02:00
click f8bb7afa98 And even more CMake-specific cleanups (mutes most of the "non-harmful" warnings - VS is just trying to be too friendly/noisy at times)
--HG--
branch : trunk
2010-06-30 16:51:37 +02:00
Shauren 2ea043484d It is now possible to use CMake on windows for proper build (PCH support included)
Merged PCH header into gamePCH since they became the same after these changes

--HG--
branch : trunk
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
2010-06-30 13:10:13 +02:00
click 09cde73072 Set revision.h to be a prerequisite of worldserver and authserver building on *nix
--HG--
branch : trunk
2010-06-25 18:00:51 +02:00
Machiavelli d54b534dca Small cleanup in Master class, thanks to [email protected]
Closes issue #2793

--HG--
branch : trunk
2010-06-25 01:30:06 +02:00
Machiavelli 0f7657b68c Get rid of Trinity Singleton and Threading patterns and replace them with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es respectively.
Also get rid of unused CountedReference class that used Trinity threading pattern.

--HG--
branch : trunk
2010-06-25 00:18:01 +02:00
click 0b2dad9c97 Remove a possible NaN-value in WorldObject::HasInArc (thanks to arrai)
+ do some hack'n'slash-work on the CMakeLists with my trusted axe ( I just LOVE being a viking - I get to wield an axe for free!)

--HG--
branch : trunk
2010-06-24 17:32:50 +02:00
Xanadu ffaffe3fd7 * Renamed several VS projects and the executables they produce to reflect the new naming convention.
* Cleaned up some useless and redundant preprocessor definitions.
* Fixed the win build so that it correctly uses the mysql lib it built from the sources.
* Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries.
* Also note that Win x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
2010-06-23 01:47:41 +02:00
Machiavelli 06ef6e2553 Update worldserver log message to indicate which database has a config problem, by Ranger.
Minor codestyle applied in function.

--HG--
branch : trunk
2010-06-21 23:58:27 +02:00
click 1c96f52568 Add more CMake-related support for building g3dlib, zlib, bzip2, ace on Windows
--HG--
branch : trunk
2010-06-21 07:17:26 +02:00
click 5d7bed7222 Adjust CMake "searchmacros" bit so that they point to correct locations
--HG--
branch : trunk
2010-06-16 03:43:09 +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
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
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
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
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 061df242a1 Rename trinity-core to worldserver
--HG--
branch : trunk
2010-06-09 15:11:46 +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
Tartalo 4ec97e918e Some fixes for worldserver cmake file
--HG--
branch : trunk
2010-06-08 21:22:43 +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
Tartalo 726a76e93a Some cmake fixes for worldserver
--HG--
branch : trunk
2010-06-08 01:34:51 +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
XTZGZoReX 22950963e9 * Get rid of framework and move the files to game and shared.
--HG--
branch : trunk
2010-06-06 23:44:21 +02:00