Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,661 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
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
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
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
Spp
f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Retriman
139a953325 Core/Script: Dungeon Ahnkahet Boss Amanitar. 
*Convert creaturescript to BossAI.
*Fix spawn Mushroom
*Fix DisplayID Mushroom.
*Fix gral. Timers in spells whitch dbm 3.3.5a
*Fix remove mini spell.
 2012-10-01 16:41:05 -04:00
Retriman
4596fc776e Core/Script: Update spelldifficulty for Boss Anubarak 2012-09-30 18:43:10 -04:00
Retriman
2e75ecd74b Core/Script: 
* Update creature_text for boss Jedoga Shadowseeker
 2012-09-30 17:32:48 -04:00
Nay
97163a2496 Merge pull request #7918 from Retriman/master 
Core/Script:  Update creature_text for boss Herald Volazj
 2012-09-30 08:32:59 -07:00
Retriman
6591dd6b10 Core/Script: 
* Update creature_text for boss Herald Volazj

thanks @Aokromes, for soundId text
 2012-09-30 11:29:31 -04:00
Nay
4c3266c7af Tools&Core: Whitespace cleanup 
No one likes whitespace, right?
 2012-09-30 15:52:10 +01:00
Nay
94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-30 15:46:00 +01:00
Nay
746252fe4e Merge remote-tracking branch 'origin/master' into mmaps 2012-09-30 15:43:20 +01:00
Nay
8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
Retriman
8110ab1ed5 Core/Script: 
* Update creature_text for boss Elder Nadox
* Clean Space

work whitch @Durotar
 2012-09-30 01:28:36 -04:00
durotar
49179651b1 Core/Script: update creature_text for boss Mimiron 2012-09-29 14:07:52 -05:00
Subv
6b23d2f771 Core/Build: Fixed build 2012-09-28 19:08:01 -05:00
Subv
a706b8027a Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-09-28 17:56:08 -05:00
Kandera
cb8fc503dd Core/Battlefield: revert part of previous commit to fix build. 2012-09-28 10:41:44 -04:00
Subv
431db10e1a Core/Battlefield: fix world states on player login for wintergrasp 2012-09-28 09:44:34 -04:00
kaelima
753f43718e Address a few compile errors. Correct spacing in HandleMmapPathCommand. 2012-09-28 15:04:47 +02:00
w1sht0l1v3
f2e92b81a3 Core/Scripts: Some fixes for Razorscale. 2012-09-28 01:37:34 +03:00
durotar
7e1ee7afb1 Core/Script: update creature_text for Custodian of Time (quest 10277) 2012-09-27 12:45:39 -05:00
Nay
6dae8a5a49 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-25 09:27:08 +01:00
Nay
15c05ed771 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-25 09:26:48 +01:00
Vincent-Michael
118825601b Core/Spells: fix misdirection removal on cancel. Closes #7776 2012-09-24 12:39:02 -04:00
Xanvial
1c1405cb25 Core/Scripts: fix rotface oozes from spawning after death. Closes #7736 2012-09-24 12:35:09 -04:00