Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,654 Commits 4 Branches 146 Tags
91136ea55fe308db37d260969da60c488cf74b81
Commit Graph

4910 Commits

Author SHA1 Message Date
Nay
91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
 2012-12-27 17:52:11 +00:00
Nay
7fe2d7309a DB/Schema: Rename and change types of a few fields in locales_creature_text and locales_npc_text 
locales_creature_text.textGroup -> locales_creature_text.groupid
locales_npc_text.entry -> locales_npc_text.ID
 2012-12-27 16:42:05 +00:00
Naios
978611d7dd Core/DataStores: Upgraded achievement_dbc db storage to 4.3.4 2012-12-27 15:42:55 +01:00
Naios
33ce380c12 Core/DataStores: Upgraded spelldifficulty_dbc db storage to 4.3.4 
* Update 2012_12_27_00_world_spelldifficulty_dbc_434.sql is required
 2012-12-27 15:42:42 +01:00
Nay
b530602b96 DB/Schema: Rename locales_quest.entry to locales_quest.Id for consistency with quest_template table 2012-12-27 14:29:05 +00:00
Gacko
9020084096 DB/Quest: Orgrim's Hammer questline - Thx @Exodius 2012-12-27 14:12:22 +01:00
Gacko
98be46dfd8 Rename sql file 2012-12-27 12:25:47 +01:00
Malcrom
aa92488ac6 DB/SAI: EAI to SAI Conversions 2012-12-27 01:15:34 -03:30
Malcrom
68ffe8a7a9 DB/SAI: EAI to SAI conversions. 2012-12-27 00:10:11 -03:30
Malcrom
18bc253f38 DB/SAI: EAI to SAI Conversions. 2012-12-26 23:16:05 -03:30
Malcrom
011acd0511 DB/SAI: EAI to SAI conversions. 2012-12-26 22:14:54 -03:30
Malcrom
24c4ea0801 DB/SAI: Fix SAI in previous commit. php is a powerful drug 2012-12-26 21:20:12 -03:30
Malcrom
4a7e3937d3 DB/SAI: EAI to SAI conversions 2012-12-26 21:12:24 -03:30
Malcrom
b47c2d7421 DB/SAI: fix error in sql 2012-12-26 20:11:19 -03:30
Malcrom
fd25bdd4b6 DB/SAI: More conversions from EAI to SAI 2012-12-26 20:01:55 -03:30
Vincent_Michael
7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
Malcrom
24ac8f7a2a DB/SAI: Fix error in sql 2012-12-26 18:43:14 -03:30
Malcrom
914d3649c4 DB/SAI: EAI to SAI conversions with text 2012-12-26 18:26:55 -03:30
Malcrom
dba6bfe477 DB/SAI: Fix errors 2012-12-26 17:32:11 -03:30
Malcrom
c96326e4d9 DB/SAI: More conversions from EAI 2012-12-26 16:51:12 -03:30
Malcrom
995208eba2 DB/SAI/EAI: Update Spectral Servant to SAI and fix some EAI text errors. 2012-12-26 16:22:30 -03:30
Vincent_Michael
306c89468d DB/Game Event: Update Darkmoon Faire start times 2012-12-26 20:37:43 +01:00
Malcrom
32441d00f3 DB/SAI: Fix flags on previous commit 2012-12-26 14:52:41 -03:30
Malcrom
95d81d14f8 DB/SAI: Convert Defias EAI to SAI with text 2012-12-26 14:47:29 -03:30
Malcrom
36b1ed213e DB/SAI: Convert Kobold's from EAI to SAI with text 2012-12-26 14:20:05 -03:30
Malcrom
f499b52fd6 DB/SAI: Some convertions from EAI to SAI with text 2012-12-26 13:47:33 -03:30
huri
0622cf8b64 Scripts/Spells: Fixed Mage's Improved Flamestrike, Ice 
Shards, Shatter, Shattered Barrier, Incanter's Absorption,
 Improved Mana Gem, Improved Freeze
 2012-12-26 18:03:41 +01:00
Malcrom
49a067726d DB/SAI: Convert Zereketh The Unbound to SAI 2012-12-26 12:51:23 -03:30
Malcrom
da1f004145 DB/SAI: Convert Rhahk'Zor from EAI to SAI 2012-12-26 12:28:59 -03:30
Malcrom
30e2ab8e0f DB/SCRIPTS: Fix text for High Botanist Freywinn and remove creature_ai_texts. 2012-12-26 11:52:05 -03:30
Vincent_Michael
e65da39f23 Core: Fix non pch build 2012-12-26 02:50:19 +01:00
Subv
12f9fd3f88 Core/Scripts: Add script to the Heroic version of Flame Bolt 2012-12-25 20:11:06 -05:00
Vincent_Michael
5d30811397 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.h
 2012-12-26 02:06:43 +01:00
Subv
587710feb5 Scripts/HallsOfOrigination: Added script for Earthrager Ptah. 
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
 2012-12-25 19:36:01 -05:00
Malcrom
a01087295b DB/SAI: Fix Errors in Previous SAI 2012-12-25 20:26:45 -03:30
Malcrom
d47dfc9eb4 DB/SAI: Forgot end of line :) 2012-12-25 20:08:01 -03:30
Malcrom
0d91306416 DB/SAI: Final part of Quest 12512 "Leave No One Behind" 
Will not work until Spells are scripted.
 2012-12-25 20:06:20 -03:30
Malcrom
05f3f6fc82 DB/SAI: first Stage of quest 12512: Leave No One Behind 2012-12-25 03:02:03 -03:30
Trista
272bcdb292 DB/SAI: Whitebark's Memory and Respite for a Tormented Soul 
* Closes: #4840 and #6478
 2012-12-25 04:15:29 +02:00
Subv
f9e592e9c7 Scripts/HallsOfOrigination: Some work on Halls of Origination. 
Temple Guardian Anhuur's script added.
ToDo: Make the triggers invisible.

Merry Christmas folks!
 2012-12-24 18:25:57 -05:00
Nay
81fee56bfe Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.h
 2012-12-24 22:20:17 +00:00
Trista
a05bc2fcfd DB/Quest: Jin'arrak's End 
* This covers all that involve main quest mechanics npcs + awarding quest
* However 2nd effect of http://www.wowhead.com/spell=48059 needs to be scripted, it is supposed to spawn a lot of guids - it's the event
* It closes the problem in #4552, however event remains so leaving it open, I won't spawn them
 2012-12-25 00:05:08 +02:00
Malcrom
6b7716a7e7 DB/SAI: correct some issues with Eliza's Grave Dirt Previous Commit 
Fix by vincent_michael
 2012-12-24 13:11:01 -03:30
Vincent_Michael
7b534774b6 Core/Spells: Remove spell script "spell_gen_damage_reduction_aura" 2012-12-24 17:22:33 +01:00
Subv
73d1ef7271 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-24 10:35:37 -05:00
Malcrom
1a4d21a02d DB/Conditions: Add missing condition for Attunement to the core for horde 
Closes #5619
 2012-12-24 11:31:33 -03:30
Vincent_Michael
62b2f0c528 SQL: Rename in correct names 2012-12-24 13:02:46 +01:00
Gacko
7860969e4d DB/SAI: correct some issues with Eliza's Grave Dirt 
Closes #8709
 2012-12-24 12:31:16 +01:00
Malcrom
cbae843326 DB/reputation_reward_rate: Set correct daily quest reputation gain for faction: The Kalu'ak 2012-12-24 01:58:44 -03:30
Malcrom
523f3eeff3 DB/Object: Add Warpwood Pod Spawns to Dire Maul 2012-12-24 00:35:51 -03:30