Commit Graph
2105 Commits
Author SHA1 Message Date
Spp 14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +02:00
Subv fc796fb879 Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift) 2012-10-15 18:01:16 -05:00
Subv fe55f735c1 Scripts/Spells: Updated some more spells to 4.3.4 2012-10-15 14:27:56 -05:00
Naios 61dce1a02e Core/PhaseMgr: Implemented Phase Definitions, Terrainswap and multiphasing
* fixes cataclysm aura effect SPELL_AURA_PHASE without phasemasks defined in miscValueA
* implements CONDITION_SOURCE_TYPE_PHASE_DEFINITION

Thanks to:
 - Cyberbrest: For the hard research work about multiphasing.
 - Venugh: He helped me with a lot of strange compile Errors.
 - Shauren: For the 4.3.4 phaseshift packet.
 - Booksize: He showed me how terrainswap works

Signed-off-by: Naios <[email protected]>
2012-10-15 20:31:41 +02:00
Subv c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
2012-10-15 11:15:25 -05:00
Subv 963aa5a159 Scripts/Spells: Updated some warlock spellscripts to 4.3.4 2012-10-14 19:18:18 -05:00
Nay e60aafcf35 Merge pull request #8065 from MrSmite/PetAI_Cleanup_1
PetAI Cleanup
2012-10-12 16:27:35 -07:00
MrSmite d28a62e579 Cleanup PetAI, remove unnecessary and broken JustDied(). Closes #7242
Thanks to Oiler2112 for suggestions and testing.
2012-10-12 16:48:33 -04:00
Warpten c8c4291c6f Core/Commands: Allow .modify money to take another parameter structure:
Example uses:
* .modify money 325g 25s 12c is the same as .modify money 3252512
* .modify money -12g is the same as .modify money -120000
* .modify money -12g 45s is the same as .modify money -115500
* .modify money 25c 18g is the same as .modify money 18g 25c
2012-10-12 22:13:28 +02:00
Nay abe81119b4 Core/Script: Fix item unusual compass.
By Kaelima and Retriman

Closes #8039
2012-10-12 01:28:37 +02:00
kaelima a1c0d81fd6 Fix build
Remove 2 unused header includes
2012-10-11 08:34:00 +02:00
Subv a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
2012-10-10 10:29:18 -05:00
Subv 1f699f2cd3 Core/Scripts: Fixed the command to restore deleted characters. 2012-10-10 10:14:26 -05:00
Subv ecc2362c69 Scripts/Commands: Fixed the command to restore a deleted character.
Thanks @vlad852
2012-10-10 09:25:25 -05:00
Subv ef6e7e0914 Merge pull request #8001 from tibbi/reputation_convert
correct reputation converting at faction change
2012-10-10 06:43:47 -07:00
kaelima 2958f64ffc Scripts/Misc: Correct two wrong urand's
(found by Aokromes)
2012-10-09 14:53:29 +02:00
Nexflame 4fabb0ba32 Fix Compile 2012-10-08 22:52:13 +03:00
tibbi 5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay 44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
2012-10-07 14:57:18 +01:00
Gigatotem 2b1a8004ba Spells/Hunter: Readiness
Fixes Readiness resetting the cooldown of Gift of the Naaru. Needs testing
2012-10-07 13:44:05 +02:00
w1sht0l1v3 26b998d94c Core/Scripts: Typo fix. 2012-10-07 14:28:39 +03:00
kaelima 8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
kaelima bb08d429a3 Fix non-pch build 2012-10-07 00:53:37 +02:00
kaelima 5273949315 Fixed compile and renamed one sql files 2012-10-07 00:08:04 +02:00
Kaelima 6b56acaa28 Merge pull request #7913 from Warpten/theRubySanctum
Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
2012-10-06 14:27:59 -07:00
Warpten c971447855 Scripts/Ruby Sanctum: Halion, the Twilight Destroyer. 2012-10-06 22:47:52 +02:00
Nay d641775a1f Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion
startDelay is 1 for all hunter traps

Fix non PCH build (boss_elder_madox.cpp)
Remove a double parentheses in LFGGroupScript
2012-10-06 17:01:29 +01:00
Nay d27a3955f0 Core/Misc: Tabs to spaces and whitespace cleanup 2012-10-06 16:55:01 +01:00
Nay 6497bea601 Merge pull request #7987 from CeIa/master
Core/Script: Iron assemby encounter
2012-10-06 08:46:45 -07:00
Nay e369742dc7 SQL: Rename SQLs from 65c6b89d01 2012-10-06 16:44:35 +01:00
Nay 65c6b89d01 Merge pull request #7970 from Retriman/DungeonsSII
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
2012-10-06 08:42:32 -07:00
Shauren ca55807eeb Compile fix 2012-10-05 23:31:16 +02:00
CeIa f353ec1454 Fix encounter in progress on the iron assembly 2012-10-05 22:19:05 +02:00
Retriman 486cf48dd0 Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
Fix typo sorry.
2012-10-05 15:19:59 -04:00
Kandera 1c4220fbe3 Core/Battlefield: fix the wintergrasp and ioc teleporters. 2012-10-05 14:25:29 -04:00
Kandera 2e247bd99a Core/Spells: Master's Call should not remove stun effects. 2012-10-05 11:45:22 -04:00
Kandera f120d87427 Core/Scripts: add another missing include. 2012-10-05 09:45:02 -04:00
Kandera 6524e9f265 Core/Scripts: add missing include from 42c047bebc 2012-10-05 09:23:20 -04:00
kandera 416a45a3a4 Merge pull request #7855 from horn/master
Core/LFG: Implemented seasonal bosses options and fixed entrance points for dungeons with multiple parts (like Dire Maul, Scarlet Monastery etc.)
2012-10-05 06:05:53 -07:00
kandera 42c047bebc Merge pull request #7839 from Warpten/soulwell
Core/Spells: Fixed Soulwell charges removal on use.
2012-10-05 06:04:24 -07:00
Retriman 626aa92514 Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
*Convert creatureScript to BossAI.
*Move heroic spell to SpellDifficulty.
*Add SpellScript Aura Elder Nadox.
*Fix Despawn Summon.
*Fix Timers whith dbm addon.
**And other bugs related in issues TC
2012-10-04 23:30:29 -04:00
horn c3f6c8141a Core/LFG: Implemented seasonal bosses options and fixed entrance points for dungeons with multiple parts (like Dire Maul, Scarlet Monastery etc.)
TODO:
- implement spawning seasonal bosses by Dungeon Finder
- script seasonal bosses - all of them needs to call RewardDungeonDoneFor function in their JustDied to be able to complete dungeon (see boss_headless_horseman.cpp)
- replace lfg_entrances coords by sniffed values
- create missing template for item 54537 (Heart-Shaped Box)
2012-10-05 00:43:58 +02:00
kandera 9d676611ec Merge pull request #7928 from Retriman/master
Core/Script: Update spelldifficulty for Boss Anubarak
2012-10-04 06:30:41 -07:00
Kandera cef436e38e Core/Oculus: fix compile. 2012-10-04 09:26:10 -04:00
kandera 6a8706a725 Merge pull request #7944 from Trista/master
Scripts/Oculus: Fixes here and there, implement phasing
2012-10-04 05:58:32 -07:00
Spp f570383fba Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.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/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp 02d68e4610 Core: Fix build without PCH 2012-10-03 15:40:01 +02:00
Nay 880a9d5cda Merge pull request #7954 from Retriman/Nexus
Core/Script: Dungeon Nexus Boss Anomalus
Closes #7946
2012-10-03 04:43:22 -07:00
Retriman 2840e2ac8a Core/Script: Dungeon Nexus Boss Anomalus
*Fix bug Chaotic Rift's model related in #7946
2012-10-03 00:12:10 -04:00
Subv 93a78d9bb5 Merge pull request #7950 from Retriman/ahorasi!
Core/Script: Dungeon Ahnkahet Boss Amanitar.
2012-10-02 18:34:27 -07:00