Commit Graph
1128 Commits
Author SHA1 Message Date
Spp fff684ec78 Remove duplicate code after some old merge 2012-11-19 12:03:45 +01:00
Spp 7f061fc57f Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
2012-11-19 10:09:58 +01:00
tibbi 1f9db80b69 Scripts/ToC: Trial of the Crusader rewrite
Closes #8272
Closes #7013
Closes #7552
Closes #5561
Closes #4221
Closes #2701
Closes #2079
Closes #5082
Closes #6503
Closes #6784

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-11-19 00:42:25 +00:00
Gacko 45b07f0931 Scripts&DB: Nexus - Ormorok
Following improvements:
- Spellscript for crystal spikes
- Spawn crystal tanglers with spell
- Usage of event map
- Correct usage of frenzy
- Heroic spells
- Target selection for crystal tanglers

Details for the spell script:
There are 4 spells. Each of them spawns the same trigger but in another direction. The trigger gets an aura which triggers the spell which summoned him after 250ms. This time is too long, so it triggers on apply. Don't worry - test ingame first, it's working blizzlike (I watched some videos on YT to find out which is the best amount of time difference between spawn and next summon).

Some summon types don't store the spell id which summoned them. The trigger is one of them which are not doing so. So I had to move the line, which stores the spell id in the summon out of the if. This could be done more specific, but it works fine. This improvement is required to find out which spell the aura applied to the summoned trigger has to cast to keep the right direction.

Closes #8193

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-11-18 23:46:03 +00:00
Nay bb8e31d1bd Merge pull request #8259 from Warpten/supLion
Scripts/Ruby Sanctum: Tweaks and stuff.
2012-11-18 13:51:58 -08:00
Spp b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Spp 339d2b1257 Fix compile 2012-11-17 03:18:37 +01:00
Gacko c95228fcf8 Core: Utgarde Keep - Fix warning/error 2012-11-16 14:21:48 +01:00
Gacko 4e95c64bad Core: Utgarde Keep - Codestyle 2012-11-12 19:16:26 +01:00
Gacko 5126c0ad8b Core/DB: Utgarde Keep - Proto Drake 2012-11-11 18:43:04 +01:00
Gacko a2748fde4b Core/DB: Utgarde Keep - Corrections 2012-11-10 18:08:40 +01:00
Gacko cc0842f46b Core/DB: Utgarde Keep
- Script areatrigger near Ingvar to activate the proto drake
- Assign heroic spells
- Mount proto drake rider to proto drake
2012-11-10 17:33:07 +01:00
Warpten 05c8cbaa4b Scripts/Ruby Sanctum:
* Move Dark / Flame Breaths handling to generic_halionAI.
* Also apply Twilight Precision to Twilight Halion.
* Fix some mistakes in the corporeality handling code, and remove some unused enums.

Fixes #8176.
2012-11-09 18:12:29 +01:00
Spp c51380690f Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Server/WorldSession.h
2012-11-09 14:26:27 +01:00
Spp 333b8e5159 Core/Build: Enable Clang PCH support and OS X specific features
Core: Fix warnings here and there
2012-11-09 13:13:45 +01:00
Spp 35d63a9799 Merge branch 'master' into 4.3.4
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
2012-11-08 11:25:38 +01:00
click e587d8c1af Core. Fix non-PCH building (again)... 2012-11-03 15:04:30 +01:00
Spp c97fc99e16 Merge branch 'master' into 4.3.4
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp d2ba73d97f Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions)
Core/Misc: tab to spaces and remove trailing whitespaces
2012-10-29 12:28:12 +01:00
Spp 876ad50dcd Core/Misc: Tweaked ThreatContainer internals
(and many cosmetic changes here and there)
2012-10-26 14:31:19 +02:00
Subv 55892048ef Merge pull request #8127 from Gacko/childrens_week
Core/DB: Children's Week
2012-10-25 07:43:02 -07:00
tibbi f8ce00acca correcting SotA teleports + cleanup 2012-10-24 14:51:42 +01:00
Spp 60d4343d8e Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h
2012-10-23 14:16:05 +02:00
Spp 663db1cee3 Core/Misc: Add default count param to HasItemCount 2012-10-23 13:11:57 +02:00
Kaelima 1ff5b83657 Merge pull request #8074 from Warpten/halionUpdate
Scripts/Ruby Sanctum: Misc fixes.
2012-10-23 03:58:48 -07:00
Warpten a664a356e2 Scripts/Ruby Sanctum:
* Fixed a crash caused by the grid.
* Update spawnmasks.
* Misc updates and corrections.

Closes #8079.
Closes #8078.
Closes #8081.
Closes #8077.
2012-10-22 21:18:21 +02:00
Subv 43d57c7547 Core/Build: Build fix from previous merge 2012-10-21 17:28:04 -05:00
Subv 1fc3aad9d7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCfmt.h
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/scripts/Kalimdor/feralas.cpp
2012-10-21 17:18:35 -05:00
Subv 82c251dc3d Merge pull request #8088 from Gacko/q13038
Core/DB: Quest 'Distortions in time'
Closes #3011
2012-10-21 15:11:50 -07:00
Gacko 9c4cf9b39c Core/DB: Children's Week 2012-10-21 14:33:20 +02:00
Spp d0334bf948 Core/Dungeon Finder: Some optimizations.
- Store teleport coordinates to avoid recalculations each time someone has to be teleported
- Correct teleport error msg when player is charming or using vehicle
- Internal changes in storage types
- Proper code for missing achievement lock type
- Better debug msgs
- Trying to get rid of "Player*" and "Group*" inside LFGMgr as much as possible (Step 1)
2012-10-18 09:15:10 +02:00
Subv 705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
2012-10-16 21:55:01 -05:00
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
Spp 14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +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
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
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
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
w1sht0l1v3 26b998d94c Core/Scripts: Typo fix. 2012-10-07 14:28:39 +03: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