Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,130 Commits 4 Branches 146 Tags
f7a7d02a7f50400cdc2be3c4722afeefe7efce80
Commit Graph

79 Commits

Author SHA1 Message Date
TDB Release
6e62bf5a1e TDB 830.20061 - 2020/06/17 2020-06-17 17:09:48 +00:00
Aokromes
3688b32065 TDB 820.19071 - 2019/07/15 2019-07-15 16:14:05 +02:00
DDuarte
7f2b7dc9c2 TDB 735.00 - 2018/02/19 2018-02-19 22:48:54 +00:00
DDuarte
15b1aaff41 TDB 720.00 - 2016/04/18 2017-04-19 00:25:43 +01:00
DDuarte
a249d86b00 TDB 703.00 - 2016/10/17 2016-10-16 17:38:56 +01:00
DDuarte
a1f59c9d8d TDB 6.04 - 2016/04/11 2016-04-11 02:42:03 +01:00
Carbenium
271390753d TDB 6.03 - 2015/11/08 2015-11-08 02:20:45 +01:00
DDuarte
f5e92f6537 TDB 6.0.2 - 2015/07/14 2015-07-14 00:05:36 +01:00
DDuarte
b06a8e58e7 CRLF to LF 2015-07-10 20:45:29 +01:00
Nayd
5be0cf7120 TDB 6.0.1 - 2015/03/21 
Closes #13816
Closes #13792

Ref #14139
 2015-03-21 17:09:25 +00:00
Naios
352012e531 Core/Updates: Add an automatic database update system. Automatically detects new and edited sql updates through file lists and hashing. Detects renames, deletes and is able to create and auto import full databases. * cleanups in main.cpp of world & bnetserver * refactoring in DatabaseWorkerPool.h & MySQLConnection.cpp 
Make sure you re-run cmake, because boost::iostreams was added as dependency.
Maybe you need to install libboost-iostreams1.55-dev on unix as well.

Import every update manual until (included) those INSERT IGNORE updates for each database.

Thanks DDuarte and Shauren for your amazing ideas, help and advises.

In hope that nobody gets a "Your database structure is not up to date..." anymore ,-)

Signed-off-by: Naios <naios-dev@live.de>
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2015-03-21 14:09:38 +00:00
Nayd
08a98c6237 Line ending fix, sorry. 2015-01-19 00:07:10 +00:00
DDuarte
9e12b969c3 TDB 434.09 - 2014/10/19 2014-10-19 04:56:59 +01:00
DDuarte
69f1bb118f Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_22_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_02_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_00_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_02_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_01_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_04_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_15_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_16_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_17_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_04_world.sql
	sql/updates/world/017_2014_09_21_04_world.sql
	sql/updates/world/017_2014_09_21_05_world.sql
	sql/updates/world/017_2014_09_21_06_world.sql
	sql/updates/world/017_2014_09_21_07_world.sql
	sql/updates/world/040_2014_09_22_00_world.sql
	sql/updates/world/040_2014_09_23_00_world.sql
	sql/updates/world/040_2014_09_23_01_world.sql
	sql/updates/world/040_2014_09_23_02_world.sql
	sql/updates/world/040_2014_09_23_03_world.sql
	sql/updates/world/040_2014_09_23_04_world.sql
	sql/updates/world/040_2014_09_24_00_world.sql
	sql/updates/world/040_2014_09_24_01_world.sql
	sql/updates/world/040_2014_09_25_00_world.sql
	sql/updates/world/040_2014_09_25_01_world.sql
	sql/updates/world/040_2014_09_25_02_world.sql
	sql/updates/world/040_2014_09_26_00_world.sql
	sql/updates/world/040_2014_09_26_01_world.sql
	sql/updates/world/040_2014_09_26_02_world.sql
	sql/updates/world/040_2014_09_26_03_world.sql
	sql/updates/world/040_2014_09_27_00_world.sql
	sql/updates/world/040_2014_09_27_01_world.sql
	sql/updates/world/048_2014_09_27_02_world.sql
	sql/updates/world/048_2014_09_27_03_world.sql
	sql/updates/world/050_2014_09_28_00_world.sql
	sql/updates/world/050_2014_09_28_01_world.sql
	sql/updates/world/050_2014_09_29_00_world.sql
	sql/updates/world/050_2014_09_29_01_world.sql
	sql/updates/world/050_2014_09_29_02_world_335.sql
	sql/updates/world/050_2014_09_29_03_world.sql
	sql/updates/world/050_2014_09_30_00_world_335.sql
	sql/updates/world/051_2014_09_30_01_world.sql
	sql/updates/world/051_2014_09_30_02_world.sql
	sql/updates/world/052_2014_10_01_00_world.sql
	sql/updates/world/053_2014_10_01_01_world.sql
	sql/updates/world/054_2014_10_02_00_world.sql
	sql/updates/world/058_2014_10_04_00_world.sql
	sql/updates/world/062_2014_10_05_01_world.sql
	sql/updates/world/062_2014_10_05_02_world.sql
	sql/updates/world/062_2014_10_05_03_world.sql
	sql/updates/world/062_2014_10_05_04_world.sql
	sql/updates/world/062_2014_10_05_05_world.sql
	sql/updates/world/062_2014_10_05_06_world.sql
	sql/updates/world/062_2014_10_05_07_world.sql
	sql/updates/world/062_2014_10_06_00_world.sql
	sql/updates/world/062_2014_10_06_01_world.sql
	sql/updates/world/062_2014_10_06_02_world.sql
	sql/updates/world/062_2014_10_06_03_world.sql
	sql/updates/world/062_2014_10_06_04_world.sql
	sql/updates/world/062_2014_10_06_05_world.sql
	sql/updates/world/065_2014_10_06_06_world.sql
	sql/updates/world/065_2014_10_07_00_world.sql
	sql/updates/world/065_2014_10_07_01_world.sql
	sql/updates/world/065_2014_10_08_00_world.sql
	sql/updates/world/065_2014_10_08_01_world.sql
	sql/updates/world/065_2014_10_08_02_world.sql
	sql/updates/world/065_2014_10_09_00_world.sql
	sql/updates/world/065_2014_10_09_01_world.sql
	sql/updates/world/065_2014_10_09_02_world.sql
	sql/updates/world/071_2014_10_10_00_world.sql
	sql/updates/world/071_2014_10_10_01_world_335.sql
	sql/updates/world/071_2014_10_10_03_world.sql
	sql/updates/world/071_2014_10_10_04_world_335.sql
	sql/updates/world/071_2014_10_10_05_world.sql
	sql/updates/world/072_2014_10_04_01_world.sql
	sql/updates/world/072_2014_10_05_00_world.sql
	sql/updates/world/074_2014_10_10_06_world.sql
	sql/updates/world/074_2014_10_11_00_world.sql
	sql/updates/world/075_2014_10_11_01_world.sql
	sql/updates/world/075_2014_10_11_02_world.sql
	sql/updates/world/075_2014_10_11_03_world.sql
	sql/updates/world/075_2014_10_11_04_world.sql
	sql/updates/world/075_2014_10_11_05_world.sql
	sql/updates/world/075_2014_10_11_06_world.sql
	sql/updates/world/075_2014_10_11_07_world.sql
	sql/updates/world/075_2014_10_12_00_world.sql
	sql/updates/world/075_2014_10_12_01_world.sql
	sql/updates/world/075_2014_10_12_04_world.sql
	sql/updates/world/075_2014_10_12_06_world.sql
	sql/updates/world/075_2014_10_12_07_world.sql
	sql/updates/world/077_2014_10_13_00_world.sql
	sql/updates/world/077_2014_10_13_01_world.sql
	sql/updates/world/077_2014_10_15_00_world.sql
	sql/updates/world/077_2014_10_16_00_world.sql
	sql/updates/world/077_2014_10_17_00_world.sql
	sql/updates/world/077_2014_10_18_00_world.sql
	sql/updates/world/077_2014_10_18_01_world.sql
	sql/updates/world/077_2014_10_18_02_world.sql
	sql/updates/world/077_2014_10_18_03_world.sql
	sql/updates/world/077_2014_10_18_04_world.sql
	sql/updates/world/2014_09_21_04_world.sql
	sql/updates/world/2014_09_21_05_world.sql
	sql/updates/world/2014_09_21_06_world.sql
	sql/updates/world/2014_09_21_07_world.sql
	sql/updates/world/2014_09_22_00_world.sql
	sql/updates/world/2014_09_23_00_world.sql
	sql/updates/world/2014_09_23_01_world.sql
	sql/updates/world/2014_09_23_02_world.sql
	sql/updates/world/2014_09_23_03_world.sql
	sql/updates/world/2014_09_23_04_world.sql
	sql/updates/world/2014_09_24_00_world.sql
	sql/updates/world/2014_09_24_01_world.sql
	sql/updates/world/2014_09_25_00_world.sql
	sql/updates/world/2014_09_25_01_world.sql
	sql/updates/world/2014_09_25_02_world.sql
	sql/updates/world/2014_09_26_00_world.sql
	sql/updates/world/2014_09_26_01_world.sql
	sql/updates/world/2014_09_26_02_world.sql
	sql/updates/world/2014_09_26_03_world.sql
	sql/updates/world/2014_09_27_00_world.sql
	sql/updates/world/2014_09_27_01_world.sql
	sql/updates/world/2014_09_27_02_world.sql
	sql/updates/world/2014_09_27_03_world.sql
	sql/updates/world/2014_09_28_00_world.sql
	sql/updates/world/2014_09_28_01_world.sql
	sql/updates/world/2014_09_29_00_world.sql
	sql/updates/world/2014_09_29_01_world.sql
	sql/updates/world/2014_09_29_02_world_335.sql
	sql/updates/world/2014_09_29_03_world.sql
	sql/updates/world/2014_09_30_00_world_335.sql
	sql/updates/world/2014_09_30_01_world.sql
	sql/updates/world/2014_09_30_02_world.sql
	sql/updates/world/2014_10_01_00_world.sql
	sql/updates/world/2014_10_01_01_world.sql
	sql/updates/world/2014_10_02_00_world.sql
	sql/updates/world/2014_10_04_00_world.sql
	sql/updates/world/2014_10_04_01_world.sql
	sql/updates/world/2014_10_05_00_world.sql
	sql/updates/world/2014_10_05_01_world.sql
	sql/updates/world/2014_10_05_02_world.sql
	sql/updates/world/2014_10_05_03_world.sql
	sql/updates/world/2014_10_05_04_world.sql
	sql/updates/world/2014_10_05_05_world.sql
	sql/updates/world/2014_10_05_06_world.sql
	sql/updates/world/2014_10_05_07_world.sql
	sql/updates/world/2014_10_06_00_world.sql
	sql/updates/world/2014_10_06_01_world.sql
	sql/updates/world/2014_10_06_02_world.sql
	sql/updates/world/2014_10_06_03_world.sql
	sql/updates/world/2014_10_06_04_world.sql
	sql/updates/world/2014_10_06_05_world.sql
	sql/updates/world/2014_10_06_06_world.sql
	sql/updates/world/2014_10_07_00_world.sql
	sql/updates/world/2014_10_07_01_world.sql
	sql/updates/world/2014_10_08_00_world.sql
	sql/updates/world/2014_10_08_01_world.sql
	sql/updates/world/2014_10_08_02_world.sql
	sql/updates/world/2014_10_09_00_world.sql
	sql/updates/world/2014_10_09_01_world.sql
	sql/updates/world/2014_10_09_02_world.sql
	sql/updates/world/2014_10_10_00_world.sql
	sql/updates/world/2014_10_10_01_world_335.sql
	sql/updates/world/2014_10_10_03_world.sql
	sql/updates/world/2014_10_10_04_world_335.sql
	sql/updates/world/2014_10_10_05_world.sql
	sql/updates/world/2014_10_10_06_world.sql
	sql/updates/world/2014_10_11_00_world.sql
	sql/updates/world/2014_10_11_01_world.sql
	sql/updates/world/2014_10_11_02_world.sql
	sql/updates/world/2014_10_11_03_world.sql
	sql/updates/world/2014_10_11_04_world.sql
	sql/updates/world/2014_10_11_05_world.sql
	sql/updates/world/2014_10_11_06_world.sql
	sql/updates/world/2014_10_11_07_world.sql
	sql/updates/world/2014_10_12_00_world.sql
	sql/updates/world/2014_10_12_01_world.sql
	sql/updates/world/2014_10_12_04_world.sql
	sql/updates/world/2014_10_12_06_world.sql
	sql/updates/world/2014_10_12_07_world.sql
	sql/updates/world/2014_10_13_00_world.sql
	sql/updates/world/2014_10_13_01_world.sql
	sql/updates/world/2014_10_15_00_world.sql
	sql/updates/world/2014_10_16_00_world.sql
	sql/updates/world/2014_10_17_00_world.sql
	sql/updates/world/2014_10_18_00_world.sql
	sql/updates/world/2014_10_18_01_world.sql
	sql/updates/world/2014_10_18_02_world.sql
	sql/updates/world/2014_10_18_03_world.sql
	sql/updates/world/2014_10_18_04_world.sql
 2014-10-19 03:49:11 +01:00
DDuarte
5474ed1882 TDB 335.57 - 2014/10/20 2014-10-19 03:40:47 +01:00
DDuarte
12d9b544ef SQL: Add ALL sqls from the TDB 4.3.4 repo 2014-10-19 03:08:58 +01:00
Vincent-Michael
e592a7bdbb TDB 434.08 - 2014/09/21 2014-09-21 13:47:57 +02:00
Vincent-Michael
25c363e1d3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-21 13:29:29 +02:00
Vincent-Michael
69c1e0d758 TDB 335.56 - 2014/09/21 2014-09-21 13:26:27 +02:00
Vincent-Michael
2433a184ca TDB 434.07 - 2014/08/24 2014-08-24 17:53:12 +02:00
Vincent-Michael
10e00f32fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-24 17:24:20 +02:00
Vincent-Michael
d088a368f1 TDB 335.55 - 2014/08/24 2014-08-24 17:22:24 +02:00
Vincent-Michael
79286ef743 TDB 434.6 - 2014/07/05 2014-07-06 00:24:01 +02:00
Vincent-Michael
1b02c85c17 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 23:44:33 +02:00
Vincent-Michael
8edecb0da6 TDB 335.54 - 2014/07/05 2014-07-05 22:50:21 +02:00
Vincent-Michael
e4b14b943d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Object/Object.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/Unit/Unit.h
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_character.cpp
	src/server/scripts/Commands/cs_lookup.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-04-05 20:43:05 +02:00
Duarte Duarte
e4c57d839d TDB 335.53 - 2014/03/29 2014-03-29 04:58:38 +00:00
Vincent-Michael
99aa4649d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/CMakeLists.txt
 2013-08-09 20:02:21 +02:00
Nay
32c8555e1e DB/NPCs: Remove AIName from npcs that do not have EAI or SAI scripts 
Closes #10483
 2013-08-09 14:21:34 +01:00
Vincent-Michael
0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2013-07-28 18:41:57 +02:00
Nay
009317d2a0 SQLS/Old: Move some misplaced files 2013-07-28 16:54:13 +01:00
Nay
b95b19b3cb TDB 424.05 2013-07-17 00:56:05 +01:00
Nay
b27777fa3e TDB 335.52 - 2013/07/17 2013-07-17 00:56:04 +01:00
Nay
3875ae0c66 TDB 335.52 - 2013/07/17 2013-07-17 00:27:42 +01:00
Vincent-Michael
0bebf40fe7 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
 2013-06-11 22:07:11 +02:00
Vincent-Michael
93c86b0c52 SQL: Add missing sql in old 3.3.5a file 2013-06-11 21:48:24 +02:00
LeGuybrush
7cec09dda5 More organizing of sql/old, hooray! 2013-06-07 16:27:20 -04:00
LeGuybrush
1df4bb2ed1 Organize sql/old 2013-06-03 15:17:51 -04:00
Vincent_Michael
71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Nay
fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00:00
Nay
2277f6db44 TDB 434.04 2013-02-15 17:10:24 +00:00
Nay
82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
Nay
e685b7bd9e TDB 335.51 - 2013/02/14 
Ref #8947
Closes #9077
 2013-02-15 17:00:09 +00:00
Nay
3a4bb8fae0 TDB 434.03 2013-01-23 05:10:56 +00:00
Spp
d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Nay
d4398eaafe TDB 335.50 - 2013/01/14 2013-01-13 18:53:32 +00:00
Spp
7f061fc57f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2012-11-19 10:09:58 +01:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
Nay
a95511f35e (TDB 335.49) Also move 4.x-only SQLs to the old directory 2012-09-15 21:18:23 +01:00
Nay
06f96f47e7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql
 2012-09-15 21:13:35 +01:00