Commit Graph

4880 Commits

Author SHA1 Message Date
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
Malcrom
ab7c789678 DB/Creature: Malygos 25 mode fix. Also fix file extention on previous push.
Closes #8658
2012-12-23 22:49:38 -03:30
Malcrom
df8b228cc2 DB/SAI: Val'kyr Taskmistress Combat AI 2012-12-23 22:41:25 -03:30
Trista
fb3245d125 Scripts/Quest: Gambling Debt and Words of Power
* Quest support for Gambling Debt. Closes: #3122
* Fix bugging script for Words of Power: Closes: #7349
* Fix codestyle that vs broke from: 8c82c075cc
2012-12-24 01:35:55 +02:00
Trista
8c82c075cc Scripts/Quest: Defending Wyrmrest Temple
* insert complete db sniff support, appart from missing spawns
* remove achievement from disables (supported by core - timed one)
* insert core support for spells and the defender itself, since SAI makes it act weird (maybe in future when SAI get integrated someone will convert it)

Closes #1861 on 90% (except spawns (there are enough, but a lot more needed and minnor stuff that are core side connected with vehicles spellcastresults)
2012-12-24 00:51:39 +02:00
Subv
7a2c81bfd0 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
2012-12-23 13:24:59 -05:00
Pitcrawler
bdd625fda3 DB/SAI: Fixes quest: Hell Hath a Fury 2012-12-23 19:02:08 +01:00
Nay
368e7113ce DB/Players: Fix message sent when DND is enabled
Closes #8428

Also update some sql file names
2012-12-23 17:54:19 +00:00
Subv
eff2a994b1 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-23 08:34:10 -05:00
Subv
3869bb7b3a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
2012-12-23 08:33:13 -05:00
Kinzcool
bb8a4c40ba DB/Creature Text: Added sound & updated some texts with sniffed data for Millhouse Manastorm 2012-12-23 02:08:45 -05:00
Kinzcool
b0c7b01b8e DB/Creature Text: Added sounds for Warden Mellichar 2012-12-23 01:18:13 -05:00
Gacko
f1d960a589 DB: The Crusaders Pinnacle chain. Thx @Exodius 2012-12-22 23:07:49 +01:00
Warpten
05b3cf57b7 DB: Fixed importing 2012_12_08_00_character_worldstate.sql 2012-12-22 19:01:11 +01:00
Trista
95a201352d DB/SAI: Finish off converting quest_end_scripts
* http://www.trinitycore.org/f/topic/7556-looking-for-people-to-convert-quest-end-scripts/
* fixup some timing errors I made on previous
* someone has to kill table + core linking to it
2012-12-22 01:43:18 +02:00
Vincent_Michael
10d957e3ad SQL: Fix "No newline at end of file" in af4f42383f 2012-12-21 20:32:41 +01:00
Vincent_Michael
af4f42383f DB/Conditions: Add conditions for Sigil of the Ebon Blade for only Lithe Stalker 2012-12-21 20:26:50 +01:00
Vincent_Michael
3e5e3aa2e1 DB/Conditions: Add some conditions for spell targets 2012-12-21 19:34:11 +01:00
joschiwald
4116ba75e3 DB/Conditions: Fix typo in f4e7cde1b5 (argh .... i've failed) 2012-12-20 23:19:29 +01:00
Vincent_Michael
852d65f7ca SQL: Rename SQL merged in PR 2012-12-20 16:48:24 +01:00
Subv
957571e18c Merge pull request #8662 from MrSmite/ItemContainer_1.1
Item Loot Saving
2012-12-20 07:00:29 -08:00
Kaelima
05c38b20ea Merge pull request #8668 from joschiwald/random_changes
Core/Misc:
2012-12-19 23:48:00 -08:00
Vincent_Michael
13c8869c78 SQL: Fix typo in 2a5fcdddd7 (need sleep :/) 2012-12-20 01:53:45 +01:00
Vincent_Michael
2a5fcdddd7 DB/Conditions: Fix door exploit with item "Vial of Frost Oil"
Closes #6658
2012-12-20 01:38:37 +01:00
Vincent_Michael
37ecd4ddf7 DB/Conditions: Fix door exploit with item "Filled Cerulean Vial"
Closes #8716
2012-12-20 01:16:35 +01:00
Pitcrawler
c0ab7c8d62 DB/SAI: Some minor corrections 2012-12-19 20:28:46 +01:00
Mislav Blažević
200968c2dd Script/AQ: Add Creature Text for Viscidus and fix model scaling 2012-12-19 13:29:55 +01:00
joschiwald
f4e7cde1b5 Core/Misc:
- some simplifications in reputation calculation
- removed aura in SPELL_AURA_LINKED should depends on SpellDifficulty
- remove some unneeded variable declarations when it's already declared
- remove some hacks
- fix some warnings in Lfg stuff
- some codestyle changes
2012-12-19 12:55:51 +01:00
Spp
80b1b6c494 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp
2012-12-19 08:23:34 +01:00
Vincent_Michael
a2832805af SQL: Fix sql import problems 2012-12-19 07:02:54 +01:00
Trista
90857739dc DB/SAI: Convert more quest_end_scripts
* 12657, 12597 ,10988, 10850, 10447 and 9565
2012-12-19 01:04:29 +02:00