Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,284 Commits 4 Branches 146 Tags
0bebf40fe7fc6ffdf3e86452f14e3bf647380b15
Commit Graph

2826 Commits

Author SHA1 Message Date
Vincent_Michael
e90ec5608e DB/Scripts: Implemented creature_text for Infinite Corruptor 2012-12-18 00:23:46 +01:00
Spp
a227a34947 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/PetAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
 2012-12-17 12:13:51 +01:00
Trista
5a52acbe40 Core/Quest: Optimize and clean more last commit 
* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* 48141bbfa6
 2012-12-17 10:39:54 +02:00
click
aa3980c744 Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...) 2012-12-17 05:39:04 +01:00
click
1f88f81c5a Core: Fix non-PCH build again 2012-12-17 04:53:32 +01:00
Trista
48141bbfa6 Core/Quest: Song of Wind and Water 
* cleanned a bit and edited old @Treak fix, credits go to him, the quest will* work 100% blizzlike when target_unit_master #8643 gets a fix for vehicle. What concerns the quest is done. I've already fixed the core kill_credit issue, but needs to be discussed.
* leaving the vehicle_AI until they get integrated correctly to SAI, this can be easily converted after. Currently need to make some hacks to make it work close to good if using SAI. (specificly terrain acts weird at that place)

Closes: #5424
 2012-12-17 04:37:27 +02:00
Nay
377d6c7862 Merge pull request #8131 from flippy84/master 
Core/Script: Heigan phase 2
 2012-12-16 17:03:26 -08:00
Nay
352ed3ec53 Merge pull request #8667 from Kirkhammett/engi_fix 
Core/Script: Fix Dimensional Ripper spell learning
 2012-12-16 17:01:48 -08:00
Shocker
1293de90be Core/Spells: Correct effect index check for Earth's Grasp 2012-12-17 01:53:52 +02:00
Vincent_Michael
f96295f6ca DB/Scripts: Implemented creature_text for Trial of the Champion 2012-12-16 21:05:05 +01:00
Filip
6611947a2a Core/Script: Fix Dimensional Ripper spell learning 2012-12-15 02:04:53 +01:00
Vincent_Michael
db6195789d Core: Fix non pch build 2012-12-14 23:31:08 +01:00
Vincent_Michael
d2cc278283 Core/Spells: Rename spell script scripts in correct script name 2012-12-14 23:19:03 +01:00
CeIa
b87cc31106 Scripts/Events/Achievement: fix 'Out With It' 
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-14 01:23:53 +00:00
Vincent_Michael
ebae4ab249 Core/Hunter: Fix Call of the Wild targets 
Closes #8618
Closes #8610
 2012-12-10 10:36:59 +01:00
WishToDie
6266303841 Fix crash in Blackfathom Deeps. 
Thx Vincent-Michail
Closes #8557
 2012-12-10 07:06:11 +02:00
Gacko
d34a9df70a Core/DB: Last fixes for creaturetext conversion 2012-12-09 20:03:17 +01:00
Subv
b28d1ec531 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-08 14:22:47 -05:00
Vincent_Michael
1e22367ca4 Core/Scripts: Add missing creature_text for eregos 2012-12-08 01:18:26 +01:00
Subv
1750391fca Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-07 19:12:00 -05:00
Vincent_Michael
0aea6c8512 Core/Scripts: Add missing creature_text 2012-12-07 19:41:30 +01:00
Vincent_Michael
d96f80cc5d Core/Scripts: Fix crash (need convert in sai) 2012-12-07 17:37:30 +01:00
Warpten
e6c763f433 Core/Spells: Fixed multiple spell effects where RadiusEntry is NULL but where MaxRadiusEntry is a valid radius entry. 
Also fixed COD and money being swapped when sending mails, and another typo when sending battleground log data.
 2012-12-07 17:29:31 +01:00
Gacko
8fbec4156b Core/DB: Creature text for 22 script files 2012-12-07 10:04:40 +01:00
Spp
fb2e5c3c58 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/azshara.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/scripts/Kalimdor/darkshore.cpp
	src/server/scripts/Kalimdor/durotar.cpp
	src/server/scripts/Kalimdor/dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/feralas.cpp
	src/server/scripts/Kalimdor/moonglade.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/scripts/Kalimdor/stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/tanaris.cpp
	src/server/scripts/Kalimdor/the_barrens.cpp
	src/server/scripts/Kalimdor/thousand_needles.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2012-12-07 09:22:43 +01:00
Vincent-Michael
6ed36342a2 Core: Fix non pch build 2012-12-06 19:03:15 +01:00
Gacko
f9c0e3c91b Core/DB: Creature text for 53 script files 2012-12-06 18:08:21 +01:00
Vincent-Michael
082c3f4267 Core/Hunter: Fix Furious Howl targets 2012-12-04 20:50:01 +01:00
Vincent-Michael
40b010e3ad Misc/Scripts: Some fixes for creature_text 2012-12-04 20:12:48 +01:00
Vincent-Michael
0a3972db7c Core/Quest: Removed table quest_start_scripts 2012-12-04 11:23:10 +01:00
Vincent-Michael
5a7c4f43b6 Core: Fix typo 2012-12-04 09:32:39 +01:00
Gacko
33c44594cd Core/DB: Creature text for 26 script files 2012-12-03 22:10:18 +01:00
Gacko
a73a7dc43f Core/DB: Creature text for 37 script files 2012-12-02 19:13:57 +01:00
Vincent-Michael
7afbacd6e1 Core/Ulduar: 
- Implemented kill credit for hodir and assembly of iron
- Some cleanup
 2012-12-01 17:34:00 +01:00
Vincent-Michael
ae4d63bb8e Core: Fix some warnings 2012-12-01 14:58:57 +01:00
Warpten
4d111c10f0 Scripts/Spells: Fixed Rogue's Recuperate, Mage's Conjure Refreshment and Paladin's Sacred Shield. 
Also fixed SQL file naming.
 2012-12-01 14:58:56 +01:00
blub
6a34a4a95b Merge pull request #8510 from Gacko/creaturetext 
Core/DB: Creature text for 24 script files
 2012-12-01 05:37:35 -08:00
blub
5bbd41656c Merge pull request #8522 from joschiwald/creature_text 
Scripts/Ulduar: convert all script_texts to creature_text from this zone
 2012-12-01 05:34:08 -08:00
Vincent-Michael
e4f093cccc Core: Fix more typos (thx Expecto) 2012-12-01 13:51:02 +01:00
Gacko
e8186669c5 Core/DB: Creature text for 24 script files 2012-12-01 11:59:38 +01:00
joschiwald
de96841579 Scripts/Ulduar: convert all script_texts to creature_text from this zone 2012-12-01 04:27:40 +01:00
joschiwald
32c4e30599 Scripts/Ulduar: cleanup Assembly of Iron 2012-11-30 21:37:46 +01:00
ille
8f9ee58e63 scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement 2012-11-30 18:57:56 +01:00
Vincent-Michael
ddb6c95042 Core/Spells: Convert Replenishment in spell script 2012-11-30 18:27:34 +01:00
Vincent-Michael
cddc0a09ba Scripts/WailingCaverns: Remove hack for achievement "Wailing Caverns" 2012-11-27 20:06:02 +01:00
Vincent-Michael
796cf2e8a8 Scripts/HallsOfLightning: Remove hack for Volkhan "Shatter Resistant" 2012-11-27 19:41:53 +01:00
Vincent-Michael
1bde761742 Fix typo (thx Trista) 2012-11-27 19:07:46 +01:00
Vincent-Michael
210757bc46 Scripts/Naxxramas: 
- Remove hack for Sapphiron "The Hundred Club"
- Convert Sapphiron script_texts in creature_text
 2012-11-27 18:34:22 +01:00
Spp
404129963c Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ArenaTeamHandler.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSpline.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_disable.cpp
	src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.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_thekal.cpp
	src/server/scripts/EasternKingdoms/redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/ungoro_crater.cpp
	src/server/shared/Packets/ByteBuffer.h
	src/tools/map_extractor/dbcfile.h
 2012-11-27 14:15:12 +01:00
Spp
e954498560 Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch 2012-11-27 13:03:12 +01:00