Commit Graph
100 Commits
Author SHA1 Message Date
Vincent_Michael 1be263e05b DB/Conditions: Add level restriction for "Drums of War" 2013-01-19 02:31:32 +01:00
Vincent_Michael 0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Vincent_Michael fbcb2e5335 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-17 23:49:26 +01:00
Vincent_Michael 9391d087fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-15 23:33:36 +01:00
Vincent_Michael ddd765359f SQL: Fix sql import problems 2013-01-15 23:22:18 +01:00
Vincent_Michael 4b8615e468 DB/Game Event: Add missing changes in 6428af8f16 2013-01-15 22:53:30 +01:00
Vincent_Michael 6428af8f16 DB/Game Event: Fix Hallow's End start time (thx gonzo1247) 2013-01-15 20:36:24 +01:00
Vincent_Michael 7cb9bf1c2c DB/Creature: Add Missing spawn for Lunk-tusk 2013-01-15 12:29:50 +01:00
Vincent_Michael 8c4f59c6f9 SQL: Fix sql import problem 2013-01-15 12:04:46 +01:00
Vincent_Michael 6f8aa6a782 Core/Spells: Reorder more scripts in some script files and some cosmetic stuff 2013-01-14 20:28:32 +01:00
Vincent_Michael d72d3df706 SQL: Rename some SQLs for 4.3.4 branch in correct name 2013-01-14 14:42:54 +01:00
Vincent_Michael c9ec5b4ce8 DB/Game Event: Update some game events start time for 2013 2013-01-14 12:07:37 +01:00
blub 673a85e183 Merge pull request #8928 from joschiwald/spellscripts_reorder3
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-12 18:19:55 -08:00
Vincent_Michael abe4b656c8 Scripts/Mechanar:
* cleanup for door system
* Convert mechano lord capacitus in c++
2013-01-13 01:07:11 +01:00
Vincent_Michael 9e91bcfe40 SQL: Fix "No newline at end of file" in bf7f58365f 2013-01-12 19:38:48 +01:00
Vincent_Michael bf7f58365f Scripts/Misc: Some cleanups 2013-01-12 19:35:32 +01:00
Vincent_Michael a02fa868a8 Core: Fix build 2013-01-12 19:01:49 +01:00
Vincent_Michael 84cdd538bb Core/Commands: Fix sql warnings with pinfo at ban players 2013-01-12 18:52:51 +01:00
Vincent_Michael cc5e40e8ee Scripts/Scholomance: Fix warning 2013-01-12 13:54:14 +01:00
blub 41817bc259 Merge pull request #8917 from joschiwald/spellscripts_reorder2
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-11 17:50:48 -08:00
Vincent_Michael 2fcd4c381c DB/Conditions: Convert shadowstep spell script in conditions 2013-01-11 23:37:54 +01:00
Vincent_Michael b13e5694b6 Core/Conditions: Implement CONDITION_UNIT_STATE = 21 2013-01-11 23:37:53 +01:00
Vincent_Michael 66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
2013-01-11 19:10:10 +01:00
Vincent_Michael ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
Vincent_Michael 6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
Vincent_Michael f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
Vincent_Michael 9f9f797d5d Scripts/TOCR: Fix some faction champions crash
Closes #8393
2013-01-08 23:01:26 +01:00
Vincent_Michael db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
2013-01-08 16:32:54 +01:00
Vincent_Michael 8c58184535 Core: Fix non pch build 2013-01-07 23:40:20 +01:00
Vincent_Michael 8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00
Vincent_Michael 05e03e7634 SQL: Rename SQL merged in PR 2013-01-07 23:09:34 +01:00
blub be5d3e5fd8 Merge pull request #8755 from krofna/crofixes
Script/AQ: Implement Buru the Gorger
2013-01-07 14:04:53 -08:00
blub 669e2ed20f Merge pull request #8725 from krofna/krefixes
Script/AQ: Rewrite Skeram
2013-01-07 14:03:28 -08:00
Vincent_Michael ecedb798aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Conditions/ConditionMgr.h
2013-01-07 16:39:01 +01:00
Vincent_Michael ff3928ca6d Core: Fix warnings 2013-01-05 20:30:57 +01:00
Vincent_Michael d5163d846f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.cpp
2013-01-05 17:01:46 +01:00
Vincent_Michael 7dd0cd4403 Core: Fix non pch build 2013-01-05 16:33:28 +01:00
Vincent_Michael ff48ea8a52 DB/SAI: Fix crash with quest "Thirst Unending"
Closes #8856
2013-01-04 21:02:05 +01:00
Vincent_Michael 0f71fd8e23 Core: Fix build 2013-01-03 23:48:50 +01:00
Vincent_Michael 00ca57e2cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_reload.cpp
2013-01-03 23:41:36 +01:00
Vincent_Michael a28d2d22f3 Core: Fix non pch build 2013-01-03 23:40:12 +01:00
Vincent_Michael f6ee4e3769 Core: Fix build 2013-01-03 18:15:23 +01:00
Vincent_Michael 6889f7cde6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
2013-01-03 18:07:53 +01:00
Vincent_Michael 6a29a957dd Core/Spells: Rename SPELL_EFFECT_PLAYER_NOTIFICATION to SPELL_EFFECT_PLAY_SOUND 2013-01-03 18:00:26 +01:00
Vincent_Michael eba9abd2ee Core/Spells: Update no fly zone for wintergrasp 2013-01-03 17:37:39 +01:00
Vincent_Michael aa43ecd18d Core/Spells: Removed no fly zone for dalaran 2013-01-03 16:58:38 +01:00
Vincent_Michael 43f1c08e96 DB/Ulduar: Fix Kologarn Stone Grip in 25m mode 2013-01-03 02:54:46 +01:00
Vincent_Michael 57c275f3e1 Core: Fix warning 2013-01-02 21:42:50 +01:00
Vincent_Michael cc99c739c6 Core/MT: Fix model for "Pure Energy"
Closes #8838
2013-01-02 16:58:23 +01:00
Vincent_Michael 52fd561f47 DB/Creature: Removed "Grand Apothecary Putress" from Shattrath City
Patch 3.0.3 (2008-11-04): Removed from Shattrath City.
2013-01-02 05:15:53 +01:00
Vincent_Michael 336752a409 Core: Add missing changes in f7e7f5fe26 2013-01-02 03:25:08 +01:00
Vincent_Michael e0db317530 SQL: Fix sql import problem 2013-01-02 03:06:55 +01:00
Vincent_Michael 56096b7704 DB/Creatures: Some fix for Wyrmrest Skytalon
Closes #8733
2013-01-02 02:43:41 +01:00
Vincent_Michael 88e6071ff6 Core: Fix build 2013-01-02 02:28:00 +01:00
Vincent_Michael 7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael 11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +01:00
Vincent_Michael cc65aba789 Update copyright note for 2013.
Happy new year.
2013-01-01 00:41:01 +01:00
Vincent_Michael eac473df61 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-12-31 15:28:03 +01:00
Vincent_Michael 8431be6bc6 SQL: rename sql for 4.3.4
Core/ZulGurub: revert my logic fail in 4232658c62
2012-12-31 14:15:24 +01:00
Vincent_Michael 4232658c62 Core:/ZulGurub: Fix mandokir decapitate targets 2012-12-31 12:58:16 +01:00
Vincent_Michael e7d02bfb7f Core/Spells: Implemented effect SPELL_EFFECT_DAMAGE_FROM_MAX_HEALTH_PCT 2012-12-31 02:10:04 +01:00
Vincent_Michael ee9b7dfef8 Core/Command: Add command for near creature finding 2012-12-30 17:10:54 +01:00
Vincent_Michael 834f98f6bb Core/ZulGurub: Added script for Bloodlord Mandokir
ToDo: Remove hack :P
2012-12-30 03:02:39 +01:00
Vincent_Michael ae47b641e1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-12-29 15:33:57 +01:00
Vincent_Michael abbbf55931 Core/Spell: Removed a obsolete spell fix for cata 2012-12-28 19:38:01 +01:00
Vincent_Michael 9281eb42da Core: Fix build 2012-12-28 19:11:55 +01:00
Vincent_Michael cb5687f583 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
2012-12-27 19:52:01 +01:00
Vincent_Michael c93559c02d Core: Fix build 2012-12-27 19:50:16 +01:00
Vincent_Michael e48bbac93f Core: Fix warning in 7b9b67a3b3 2012-12-27 01:42:25 +01:00
Vincent_Michael ece2f7c7ab Add missing changes in 7b9b67a3b3 (fucking save button) 2012-12-26 23:23:49 +01:00
Vincent_Michael 7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
Vincent_Michael 306c89468d DB/Game Event: Update Darkmoon Faire start times 2012-12-26 20:37:43 +01:00
Vincent_Michael e65da39f23 Core: Fix non pch build 2012-12-26 02:50:19 +01: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
Vincent_Michael cfb6a1b4d5 Core/Quest: Add missing changes for monthly quests 2012-12-26 01:12:04 +01:00
Vincent_Michael 6e921feebd Core: Fix some codestyle 2012-12-25 02:56:19 +01:00
Vincent_Michael fa5f2b4c60 Core: Fix non pch build 2012-12-25 02:51:40 +01:00
Vincent_Michael d3d9dfd734 Core/Script: Add some talks for Zul'Gurub 2012-12-24 21:38:28 +01:00
Vincent_Michael b4996c90ff Core: Fix some codestyle 2012-12-24 17:26:42 +01:00
Vincent_Michael 7b534774b6 Core/Spells: Remove spell script "spell_gen_damage_reduction_aura" 2012-12-24 17:22:33 +01:00
Vincent_Michael accc83a76d Core/Scripts: Fix typo 2012-12-24 17:22:33 +01:00
Vincent_Michael ec6f7541b7 Core: Fix merge fail 2012-12-24 14:38:31 +01:00
Vincent_Michael 62b2f0c528 SQL: Rename in correct names 2012-12-24 13:02:46 +01:00
Vincent_Michael a3b34e2894 Core: Fix more some codestyle 2012-12-22 01:13:56 +01:00
Vincent_Michael 63ea4b1056 Core: Fix some codestyle in 957571e18c 2012-12-21 22:22:36 +01: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
Vincent_Michael 852d65f7ca SQL: Rename SQL merged in PR 2012-12-20 16:48:24 +01: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
Vincent_Michael a2832805af SQL: Fix sql import problems 2012-12-19 07:02:54 +01:00
Vincent_Michael 7dd019e7bb Misc/Script: Convert winter veil mistletoe event in sai 2012-12-18 22:27:48 +01:00
Vincent_Michael bcff526d28 Core/Script: Add missing changes in c364c367b1 2012-12-18 19:31:41 +01:00
Vincent_Michael c364c367b1 Core/Script: Fix some codestyle and warnings 2012-12-18 19:16:00 +01:00
Vincent_Michael 3e318686b0 Core: Fix non pch build 2012-12-18 15:33:15 +01:00
Vincent_Michael c75d274362 Core: Fix typos 2012-12-18 14:46:06 +01:00
Vincent_Michael bb93eb0f7e Core/Character: Fix logic fail with world state in b2928e59fa 2012-12-18 14:13:09 +01:00