Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,959 Commits 4 Branches 146 Tags
fc796fb879fcf399b7e05636e2876c53b261f8f2
Commit Graph

4616 Commits

Author SHA1 Message Date
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
Subv
e10c4afc35 SQL: Renamed SQL from previous merge. 2012-10-15 13:46:42 -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 <naios-dev@live.de>
 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
Warpten
e3d8c666bd Scripts/Ruby Sanctum: 
* Fixed Halion's health pool in the Twilight Realm.
* Updated missing expansion fields for Saviana Ragefire, General Zarithrian.
* Have Halion bind players to instance on any other mode than 10NM.
* Link template entries depending on difficulties.

Closes #8017.
Closes #8024.
 2012-10-12 23:04:56 +02:00
Kandera
923cad31f3 Wintergrasp: move keep banner spawns to db. fix invisible stalker position. 2012-10-11 11:33:22 -04: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
af00564184 SQL: Renamed SQL from previous pull request. 2012-10-10 09:15:34 -05:00
Subv
6b5aa93dda Merge pull request #8035 from Retriman/BG 
DB:
 2012-10-10 07:08:51 -07:00
Retriman
028b6e778c DB: Remove all bgs from e1bee86ee6 2012-10-10 11:06:15 -04:00
Subv
93189bacc5 SQL/StackRules: Added one more stack rule. 
Totem of Wrath and Heart of the Crusader should not stack.
 2012-10-09 12:04:04 -05:00
Subv
5eccf9f4da SQL/StackRules: Added one more stack rule. 
Blood Frenzy (Warrior) and Savage Combat should not stack.
ref #7667
 2012-10-09 11:22:46 -05:00
Subv
cce014a2ba SQL/StackRules: Added a stack rule for some spells. 
Improved Scorch, Improved Shadow Bolt and Winter's Chill should not stack
ref #7667
 2012-10-09 11:01:51 -05:00
tibbi
c0e0f1d89b allow glyph1 be null like other glyph slots 2012-10-09 16:58:29 +01:00
Subv
c6f4f0287a Merge pull request #7999 from tibbi/Cinderglacier 
Make Rune of Cinderglacier not proc off dots
 2012-10-07 17:57:58 -07:00
zxbiohazardzx
608ed2cf1d DB/Loot: increase dropchance for Plump Buzzard Wing 
Closes #7989
 2012-10-07 17:43:13 +02: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
tibbi
ef4f89b405 Make Rune of Cinderglacier not proc off dots 2012-10-07 13:44:30 +01:00
w1sht0l1v3
1a89de87c1 Fixup a guid issue in 2012_10_06_04_world_misc_spawns.sql 2012-10-07 15:01:16 +03: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
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
Kandera
1c4220fbe3 Core/Battlefield: fix the wintergrasp and ioc teleporters. 2012-10-05 14:25:29 -04:00
w1sht0l1v3
b77102b4bc Missing comma. 2012-10-05 17:16:29 +03: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
b32878f02f DB/Texts: add removed texts from ab3430762d. rename another sql file 2012-10-04 10:30:49 -04: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
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
ZxBiohazardZx
e4cdd0956a DB/Loot : correct some lootids, remove pointless sharedid, Thx Kandera for the assist 2012-10-02 21:17:14 +02: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
Subv
174deb131a SQL: Rename SQL from previous merge. 2012-09-30 17:47:47 -05:00
Retriman
4596fc776e Core/Script: Update spelldifficulty for Boss Anubarak 2012-09-30 18:43:10 -04:00
Retriman
128c8c0562 DB: Typo in sql (order logical) 2012-09-30 17:34:41 -04:00
Retriman
2e75ecd74b Core/Script: 
* Update creature_text for boss Jedoga Shadowseeker
 2012-09-30 17:32:48 -04:00
Retriman
f2cb98373b DB: Fix SounID in Herald Volazj 2012-09-30 12:10:48 -04:00
Nay
990bef2bff SQL: Rename SQL merged in PR 2012-09-30 16:34:06 +01: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
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
8ac05aff2d SQL: Rename SQL merged in PR 2012-09-30 15:43:05 +01:00
Nay
39dba3f22f Merge pull request #7891 from tibbi/title_converter 
adding Title converter to faction converter, original author Silinoron
 2012-09-30 07:40:51 -07: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
w1sht0l1v3
a2091aede3 DB/Models: Creature model updates for VoA and ToCr. 2012-09-29 19:24:29 +03:00