Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AuctionHouse/AuctionHouseMgr.h src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Handlers/NPCHandler.cpp
This commit is contained in:
commit
0bebf40fe7
2824 files changed
+1553
-406
No files matched your search
@@ -41,13 +41,26 @@ project website at http://www.TrinityCore.org
|
||||
Documentation including installation instructions can be found inside
|
||||
the doc directory.
|
||||
|
||||
SQL files to create the database can be found in the sql/create and sql/base directory.
|
||||
You need to download world database from http://www.trinitycore.org/f/files/ be sure you get the higher numbered database.
|
||||
When installing a core the 1st time you need to import also the files at sql/updates/world directory.
|
||||
To save time importing multiple files, you can use copy *.sql world_updates.sql under Windows or cat *.sql > world_updates under Linux.
|
||||
You need to update your core (recompile and overwrite binaries) when updating your database, usually you can't use one older core with a newer database or a newer core with a older database.
|
||||
When updating your core you also need to import the files at sql/updates/auth and sql/updates/characters along with sql/updates/world files.
|
||||
You can't merge all the sql files on sql/updates into a single file, because they belong to 3 different databases and they don't use database name.
|
||||
SQL files to create the databases can be found in the sql/create and
|
||||
sql/base directories.
|
||||
You need to run sql/create/create_mysql.sql 1st and then
|
||||
sql/base/auth_database.sql and sql/base/characters_database.sql
|
||||
You need to download world database from http://www.trinitycore.org/f/files/
|
||||
be sure you get the higher numbered database.
|
||||
When installing a core the 1st time you need to import also the files at
|
||||
sql/updates/world directory.
|
||||
sql/updates/auth and sql/updates/characters databases only needs to be run
|
||||
when updating one existing server.
|
||||
To save time importing multiple files, you can use copy *.sql world_updates.sql
|
||||
under Windows or cat *.sql > world_updates under Linux.
|
||||
|
||||
You need to update your core (recompile and overwrite binaries) when updating
|
||||
your database, usually you can't use one older core with a newer database or a
|
||||
newer core with a older database.
|
||||
When updating your core you also need to import the files at sql/updates/auth
|
||||
and sql/updates/characters along with sql/updates/world files.
|
||||
You can't merge all the sql files on sql/updates into a single file, because
|
||||
they belong to 3 different databases and they don't use database name.
|
||||
|
||||
TrinityCore Requirements
|
||||
Platform: Linux, Windows or Mac
|
||||
@@ -58,3 +71,10 @@ CMake ≥ 2.8.0 (max 2.8.9 under linux)
|
||||
OpenSSL ≥ 0.9.8o
|
||||
GCC ≥ 4.3 (Linux only)
|
||||
MS Visual Studio ≥ 9 (2008) (Windows only)
|
||||
A bit of brain, wiki can become outdated with the release of new TDB versions
|
||||
if wiki refers to TDB 50 and you see TDB 52 get the higher number.
|
||||
Some reading skills, search forum, read http://www.trinitycore.org/f/topic/1518-
|
||||
and http://www.trinitycore.org/f/topic/37- before posting a bug report or ask for
|
||||
help on forum.
|
||||
Search for existing bug reports before post your bug report, don't post multiple
|
||||
bugs on a single ticket.
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 2824 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user