Commit Graph

2468 Commits

Author SHA1 Message Date
Subv
fba9c0a82e Scripts/Halion: Fixed some warnings 2012-10-16 09:39:56 -05:00
Gacko
1da4a8503c Core: Quest 'Distortion in time' - Codestyle
Replace enum name eCloseRift with CloseRift and add underscore to private
member counter.
2012-10-16 12:01:48 +02:00
Gacko
887509b1de Core/DB: Quest 'Distortions in time' 2012-10-14 19:18:41 +02:00
Gacko
59557091a6 Core/DB: Quest 'Distortions in time' 2012-10-14 17:24:59 +02: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
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
tibbi
5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay
972b418103 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-10-07 14:51:21 +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
Subv
f7d3600e7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-10-04 19:39:09 -05: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
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
Retriman
256afa097d Core/Script: Dungeon Ahnkahet Boss Amanitar.
*Fix whitespaces
*Fix modelid1 -> modelid2
thnks @Aokromes
2012-10-02 21:51:06 -04:00
Retriman
dae312b3c3 Core/Script: Dungeon Ahnkahet Boss Amanitar.
*Add commented/sugestion from 139a953325 (thanks @ joschiwald).
*Add beter displayID. thanks @Aokromes from u point.
2012-10-02 21:44:18 -04:00
thesensei
91367bb39f Core/Oculus: Fixes here and there, implement phasing
* Implement phasing (sniffed)
    * Add drakes proper support (events, texts, conditions for spells), remove npc_spellclick_spells
    * Add proper support for Gossip npcs
    * Removed the arcane shield Urom use first time we are about to meet him, because he only get it after he spawns a wave, added Evocation casts from sniff/retail that also break the teleportation visual bug
    * Some db updates based on Aokromes sniffs
    I intended to do it all, but there are core issues I have no knowledge to fix and I don't want to jump to other things before fixing them. :) So, I will submit boss updates, if I ever fix them. There are still stuff do do for drakes spells left from before.
    * Majour thanks to Shauren for helping me with summoning spells and w/e I ask him and all who answered my questions.
2012-10-02 22:13:40 +03:00
kaelima
5d71a544d2 Script/Ruby Sanctum: Smoother lifting/landing transition for Saviana Ragefire. 2012-10-02 15:33:54 +02:00
Spp
7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp
380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00