Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,314 Commits 4 Branches 146 Tags
b21749a68c19fb1dc6a7d72fc85f6d148b3b753f
Commit Graph

4933 Commits

Author SHA1 Message Date
Vincent-Michael
b21749a68c Core/Spells: Fix shaman talent "Feedback" 
Note: For Chain Lightning need more fix
 2013-06-16 23:00:54 +02:00
Vincent-Michael
8c42b4ce8a Core/Spells: Fix shaman lava surge proc 2013-06-16 17:56:40 +02:00
Vincent-Michael
b3f0d094b1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-14 23:44:46 +02:00
Vincent-Michael
9aea25f06c Scripts/ZulAman: 
- Hard reset for old scripts
- Add pre Event (is not complete)
- Some cleanup
 2013-06-14 23:39:02 +02:00
Malcrom
cecbb79a39 DB/SAI: Needs this too :) 2013-06-13 23:20:50 -02:30
Malcrom
7a6aef0f9f DB/SAI: Fix creature in botanica 2013-06-13 23:15:04 -02:30
Vincent-Michael
87d9d1d705 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/Spells/spell_pet.cpp
	src/server/scripts/Spells/spell_shaman.cpp
 2013-06-13 19:35:01 +02:00
Malcrom
5f83c81ce5 DB/Creature: Redo spawning for entry 33211 "Lake Frog" 2013-06-13 12:08:21 -02:30
Aokromes
77dc4147d0 DB/Creature: Add missing lake frog spawns 
By Vincent_Michael closes #10015
 2013-06-13 16:15:33 +02:00
Pitcrawler
ca100a30f0 DB/Quests: Fix Convocation at Zul'Heb, closes #9122 2013-06-13 12:44:07 +02:00
Malcrom
4065a8509f Script: Add scripting for Quest A Blade Fit For A Champion 
Still need pooled spawning for entry 33224. Aokromes has info if someone wants to do it.
 2013-06-13 00:50:21 -02:30
Pitcrawler
2f771d4950 DB/Quests: Fix Badlands Reagent Run II, closes #9880 
Thanks @joschiwald and @Kirkhammett
 2013-06-12 21:15:17 +02:00
Pitcrawler
1dfda35221 DB/Quests: Fix Adding Injury to Insult, closes #3848 
Improves b85e4eb724
 2013-06-12 20:34:23 +02:00
Malcrom
8778f5abdf DB/SAI: Fix SAI for Sunseeker Harvester 2013-06-11 22:12:42 -02:30
Malcrom
e8d1501198 DB/Creature: Set Entry 18955 "Camera Shaker - 30-90 seconds" as trigger and remove random movement 2013-06-11 22:03:35 -02:30
Vincent-Michael
0bebf40fe7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
 2013-06-11 22:07:11 +02:00
Malcrom
935a1cf607 DB/SAI: Move Quel'dorei Magewraith from EAI to SAI. Added quest complete action to fix quest 9595. 
closes #3047
 2013-06-10 20:13:24 -02:30
Malcrom
cf8060f62d DB/Gossip: Complete gossip for Quarter Master Miranda Breechlock 2013-06-10 15:40:24 -02:30
Malcrom
dfb950af53 DB/SAI/Conditions: Add SmartAI to Quarter Master Miranda Breechlock to give player item when selecting I need another Argent Dawn Commission. 
closes #6352
 2013-06-10 12:36:15 -02:30
Vincent-Michael
86811d5d66 SQL: Fix sql import error 2013-06-09 20:37:42 +02:00
Pitcrawler
3e29d89a71 DB/Quests: Fix To Westguard Keep! 
Add missing taxiflight gossip option
 2013-06-09 18:39:33 +02:00
Pitcrawler
fb28dcb3c4 DB/Quests: Fix The Explorer's League Outpost 
Move a corescript to SAI
 2013-06-09 18:10:03 +02:00
Pitcrawler
1f785905d5 DB/Quests: Fix Danger! Explosives!, closes #6850 closes #9458 2013-06-08 16:21:24 +02:00
Vincent-Michael
fda3905799 DB/Creature: Fix startup error 2013-06-07 19:02:09 +02:00
Pitcrawler
1adf4624bb DB/Quests: Fix Foolish Endeavors, closes #1880 closes #9849 
Thanks to @dr-j for a major part of the work!

Also rename a file.
 2013-06-05 16:37:15 +02:00
kirkhammett
948a572339 DB/SAI: some fixes for The Art of Being a Water Terror 
Closes #9870
 2013-06-05 12:25:21 +02:00
Vincent-Michael
3f35182369 DB/Conditions: Fix db error 2013-06-04 21:14:25 +02:00
Malcrom
803e004111 DB/Conditions: Fix stupid mistake. 2013-06-04 12:33:53 -02:30
Malcrom
e91e4024db DB/Conditions: Fix a couple condition errors and rename 2 sql files 2013-06-04 12:27:34 -02:30
Shauren
f03f443150 SQL: Corrected file names after recent pull request 2013-06-04 14:53:04 +02:00
kirkhammett
fae3015044 DB/SAI: 
Fix Zul'Aman - Npc Amani Bear Mount bug
Closes #9878
Fix Deep in the bowels of the Underhalls
Closes #9868
Closes #3415
 2013-06-04 10:17:08 +02:00
fedehacker
b8a457d0ae DB/Creature: only show Blix Fixwidget during Brewfest 
Closes #9923
 2013-06-04 10:14:11 +02:00
Malcrom
9084311ebd DB/Gossip: Add gossip for Shaman trainers 2013-06-03 23:34:31 -02:30
Malcrom
148b8e3129 DB/Conditions: Fix a mistake in sql. 2013-06-03 22:30:42 -02:30
Malcrom
eea6ab54cc DB/Conditions: Add conditions for rogue quest. 2013-06-03 21:39:20 -02:30
Malcrom
2b4806f0da DB/Conditions: Fix gossip conditions for riding trainers. 2013-06-03 21:00:16 -02:30
Vincent-Michael
efb4fb4959 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2013-06-03 18:19:18 +02:00
Vincent-Michael
f6c1a9a8c4 Core: Fix warning 2013-06-03 18:04:42 +02:00
LeGuybrush
15f856ae1e Update 2013_05_26_00_world_trinity_string.sql 
Remove BOM
 2013-06-03 04:02:55 -03:00
Malcrom
8266fe9b86 DB/Conditions: Add option conditions for Shaman trainers. 2013-06-03 00:03:04 -02:30
Malcrom
51aa56beab DB/Conditions: Add option conditions for Priest trainers. 2013-06-02 23:50:36 -02:30
Malcrom
4e5baa4f16 DB/Conditions: Add option conditions for Rogue trainers. 2013-06-02 22:32:37 -02:30
Subv
1d1bb84cf9 Merge pull request #9854 from Ascathor/master 
Core/Command: Optimized .pinfo more
 2013-06-02 17:52:27 -07:00
Malcrom
87032a4630 DB/Conditions: Add option conditions for Hunter trainers. 2013-06-02 22:09:02 -02:30
Malcrom
937ef9e63e DB/Conditions: Replace condition accidently removed. 2013-06-02 22:05:22 -02:30
Malcrom
24e528d4fd DB/Conditions: Add option conditions for Druid trainers. 2013-06-02 21:37:33 -02:30
Malcrom
149992d205 DB/Conditions: Add gossip option conditions for Warrior trainers. 2013-06-02 21:29:03 -02:30
Malcrom
ee603802b0 DB/Conditions: Add gossip option conditions for paladin trainers. 2013-06-02 21:14:37 -02:30
Malcrom
617b0c0f7c DB/Conditions: Add gossip option conditions for Warlock trainers. 2013-06-02 21:06:32 -02:30
Malcrom
476dc0e636 DB/Conditions: Add gossip option conditions for mage trainers. 2013-06-02 20:35:41 -02:30