Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,718 Commits 4 Branches 146 Tags
c3243e20760a0200be98e94de5f56336b1c2bc35
Commit Graph

9058 Commits

Author SHA1 Message Date
Rushor
1681246e54 DB/SAI: Update Isle of Queldanas 2015-07-25 17:20:23 +02:00
Rushor
090c9b8c45 DB/SAI: Update Felwood 2015-07-25 17:13:19 +02:00
Rushor
1eb34fc3a0 DB/SAI: Update Dustwallow Marsh 2015-07-25 16:30:17 +02:00
joschiwald
8a9f1b871a Scripts/Ulduar: fixed freya loot and added missing conditions 
thanks @Keader

Closes #15098
 2015-07-25 15:28:39 +02:00
Rushor
7e2b3ea459 DB/SAI: Update Dun Morogh 2015-07-25 10:56:29 +02:00
Rushor
2aaab040ce DB/Quest: A Flawless Plan 
* closes #12190
* thanks to @Pitcrawler + @Killyana for missing Spawns
 2015-07-25 08:52:47 +02:00
Aokromes
15e020a77f DB/Misc: More 3.3.5a fixes 2015-07-25 03:23:22 +02:00
Aokromes
8b92c83f6b Update 2015_07_24_07_world.sql 2015-07-25 03:16:05 +02:00
Aokromes
b86f678a8b DB/Misc: Revert incorrect moves 2015-07-25 03:03:29 +02:00
Killyana
6bac7d0120 DB/NPC/Quest: Grizzly Hills Giant and Rallying the Troops 
Close #14781
 2015-07-25 02:00:32 +02:00
Carbenium
bc8f5194c4 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 01:16:50 +02:00
Rushor
6ce6445e38 DB/Spawn: Dark Iron Brewer 2015-07-25 00:51:45 +02:00
Rushor
a4b551ceb5 DB/Quest: Into the Soulgrinder 
* much thanks to @Killyana for all the Updates
* updates issue #3178
 2015-07-25 00:14:42 +02:00
Rushor
312da02d94 DB/Misc: Northwatch Foothold + Razor Hill Updates 2015-07-24 23:10:54 +02:00
Kilyana
09b11e2195 DB/NPC: Dark Iron Brewer 
closes #15047
 2015-07-24 22:32:46 +02:00
Rushor
af54aaf6d8 DB/SAI: Update Winterspring 2015-07-24 20:31:52 +02:00
Rushor
3950ea3881 DB/SAI: Update Feralas for 3.3.5 
* closes #15126
* updated by @Killyana
 2015-07-24 19:42:25 +02:00
Killyana
3bfdb548dd DB/Item: Sack of Ulduar Spoils / Large Sack of Ulduar Spoils 
* closes #15059
 2015-07-24 19:20:05 +02:00
Killyana
3c66a88d04 DB/Misc: Fixup evading Creatures 
closes #15094
 2015-07-24 19:17:56 +02:00
Killyana
5330a4c454 DB/Point of Interests: Locales points of interest 
closes #15110
 2015-07-24 19:16:00 +02:00
Killyana
a3f6523010 DB/Pages: Locales for page text 
* closes #15105
 2015-07-24 19:14:27 +02:00
Killyana
11d603a408 DB/Misc: Grim Guzzler Area Events 
closes #15138
 2015-07-24 19:09:50 +02:00
tkrokli
785fcdd838 DB/Misc: Stable Master Xon'cha - Flags 
* closes #15117
 2015-07-24 19:07:06 +02:00
Rushor
a321f56379 DB/Creature: Add Tabledance for Duokna 2015-07-24 17:36:42 +02:00
Rushor
20815105a7 DB/SAI: Update Ghostlands + Darkshore 2015-07-24 17:00:07 +02:00
Aokromes
5c2ea73a92 DB/Misc: More 3.3.5a fixes 2015-07-24 15:31:13 +02:00
Rushor
8faa902e89 DB/Misc: Updates from 6.x 2015-07-22 17:08:01 +02:00
Rushor
14e60a9b10 DB/SAI: Update Azshara 2015-07-22 12:28:01 +02:00
Carbenium
293658fb13 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	.gitattributes
	dep/PackageList.txt
	sql/base/characters_database.sql
	sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
	sql/updates/world/2015_07_01_03_world_335.sql
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2015-07-22 02:26:46 +02:00
Carbenium
82ea8da720 Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4 
Conflicts:
	.travis.yml
	README.md
	sql/updates/world/2015_04_18_00_world.sql
	sql/updates/world/2015_04_18_05_world_335.sql
	sql/updates/world/2015_04_26_03_world_335.sql
	sql/updates/world/2015_05_09_00_world_335.sql
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellInfo.cpp
 2015-07-22 01:33:48 +02:00
Carbenium
224c7dc6ae Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4 
Conflicts:
	README.md
	sql/updates/world/2015_04_04_00_world.sql
	sql/updates/world/2015_04_04_01_world.sql
	sql/updates/world/2015_04_05_06_world_335.sql
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_account.cpp
	src/tools/map_extractor/System.cpp
	src/tools/vmap4_extractor/adtfile.cpp
 2015-07-22 00:54:34 +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
Carbenium
79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Rushor
e29375a337 Update Deadwind Pass 2015-07-21 13:04:02 +02:00
Rushor
e2974746ae DB/Misc: Fixup 2 Runtimeerrors 2015-07-21 12:43:27 +02:00
Rushor
6eb8b0428e DB/SAI: Update Azuremyst Isle Update 2015-07-21 12:20:45 +02:00
Aokromes
a5fa52d54e DB/Misc: Fix startup errors 2015-07-20 19:28:20 +02:00
Rushor
8ab30a9b8d DB/SAI: Update Ashenvale 2015-07-20 19:22:25 +02:00
Aokromes
1a78edfd1e DB/Misc: Fix startup errors 2015-07-20 14:44:06 +02:00
DDuarte
3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate 
Closes #14954
Closes #14955

(cherry picked from commit 673648ee65)
 2015-07-20 01:16:47 +01:00
Rushor
a14a626c3a DB/SAI: Update Zul'Farrak 2015-07-20 00:19:17 +02:00
Rushor
0350088fd2 DB/Pathing: Dragonblight - Lights Trust + Jintha'kalar + Border Zone to Zul'Drak 
* also spawn missing Creatures for Border Zone to Zul'Drak
 2015-07-19 23:23:33 +02:00
Aokromes
a2bfa0f147 DB/Misc: More other branches fixes 2015-07-19 23:09:12 +02:00
Aokromes
1c0cf6021b DB/Misc: Other branches fixes 2015-07-19 23:02:24 +02:00
Aokromes
5bfbf43699 DB/Misc: Fix startup errors 2015-07-19 22:53:34 +02:00
Aokromes
6f4c499296 DB/Misc: Fix more startup errors 2015-07-19 22:41:21 +02:00
Aokromes
4c1fbb5a9f DB/Misc: Fix more startup errors 2015-07-19 22:35:47 +02:00
Aokromes
51904fde02 DB/Misc: Fix some startup errors 2015-07-19 22:14:05 +02:00
Aokromes
7c0fe8f957 DB/Misc: More 3.3.5a fixes 2015-07-19 22:06:14 +02:00