Commit Graph

15 Commits

Author SHA1 Message Date
Aokromes
0b8b2906ff DB/Misc: Update travis file structure 2015-09-08 19:21:19 +02:00
Aokromes
fd49e2109b DB/Misc: Fix travis database 2015-08-11 13:15:04 +02:00
Carbenium
963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
2015-07-22 00:37:27 +02:00
Carbenium
fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
2015-07-22 00:26:09 +02:00
Nayd
2774d03be0 Update world_database.sql 2015-03-22 20:02:52 +00:00
Nayd
360075129e TDB 335.58 - 2015/03/21 2015-03-21 22:06:46 +00:00
DDuarte
dbf5aa73e5 SQL: Update /dev/world_database.sql 2014-10-30 13:46:06 +00:00
DDuarte
9ad5dce64c SQL: Update /dev/world_database.sql 2014-10-30 13:29:33 +00:00
Vincent-Michael
31234c0ca0 SQL: Sync world_database after tdb 335.56 release 2014-09-21 17:09:51 +02:00
Vincent-Michael
2d277bc167 SQL: Update for 4.3.4 2014-09-21 17:07:20 +02:00
DDuarte
eeaf7ef6fa Revert "SQL: Update dev/world_database.sql"
This reverts commit 09f9f3b6b1.

I forgot that world_database.sql should only get updated in TDB releases.
2014-09-19 18:42:09 +01:00
DDuarte
09f9f3b6b1 SQL: Update dev/world_database.sql 2014-09-19 18:18:18 +01:00
DDuarte
073221c395 SQL: Update /dev/world_database.sql
Forgotten change of 27479cf571
2014-09-13 02:57:05 +01:00
DDuarte
55a501c1ca SQLs: Update /dev/world_database.sql
Again, do NOT import this file.
2014-08-27 14:13:51 +01:00
DDuarte
0affa9168c SQLs: Move world_database.sql to dev folder
Simply because people can't read instruction guides...
2014-08-04 14:11:03 +01:00