Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,690 Commits 4 Branches 146 Tags
dd61ba2844fc96b3344183fe0b05ce65985fa8be
Commit Graph

7431 Commits

Author SHA1 Message Date
Spp
fff684ec78 Remove duplicate code after some old merge 2012-11-19 12:03:45 +01:00
Spp
bf8b642a47 Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4) 2012-11-19 12:02:33 +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
Subv
a337abc436 Scripts/Instances: Added missing definition from previous commit. 2012-11-18 20:53:27 -05:00
Subv
bbe146d104 Scripts/Instances: Save Magister's Terrace door (and statue) state. 
Closes #6889
 2012-11-18 20:33:03 -05:00
Nay
27cf98dac1 Scripts/AQ: Fix non PCH build 2012-11-19 01:02:31 +00:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00: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
krofna
aea5fec30d Scripts/AQ: Implement Ossirian the Unscarred 
Fix yell on kurinaxx death

Warning fix

Closes #8254

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:37:43 +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
oMadMano
477d17b0fc Core/Spells: Fixed Improved Cone of Cold. 2012-11-17 14:10:47 -05: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
Shocker
572788c3c0 Core/Commands: Fix .npc add item 2012-11-16 23:23:38 +02:00
Subv
d55771267a Core/EventAI: Removed table creature_ai_summons. 2012-11-16 12:30:48 -05:00
Subv
ecf3f6c2c7 Merge pull request #8291 from Gacko/utgardekeep 
Core/DB: Utgarde Keep
 2012-11-16 05:33:16 -08:00
Gacko
c95228fcf8 Core: Utgarde Keep - Fix warning/error 2012-11-16 14:21:48 +01:00
Spp
279b7f4c10 Core/Misc: Minor changes here and there 2012-11-16 09:51:44 +01:00
Spp
978fc4b7b9 Fix compile 2012-11-16 09:09:27 +01:00
Spp
a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
kaelima
c9801e83c6 Script/Emerald Dragons: Fixed a couple of issues with emerald dragon world bosses and some cleanup. 
Renamed one sql from yesterday
 2012-11-14 09:02:17 +01:00
kaelima
3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Gacko
4e95c64bad Core: Utgarde Keep - Codestyle 2012-11-12 19:16:26 +01:00
rocky517
7249865a12 Update src/server/scripts/Commands/cs_mmaps.cpp 2012-11-12 14:43:51 +02:00
Spp
f53a04add0 Core/Scripts: Added Worgen and Goblin races to .pinfo command. 2012-11-12 10:31:56 +01:00
Spp
5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files 
Core: Minor changes here and there
 2012-11-12 10:29:52 +01:00
Tuxity
516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
Gacko
5126c0ad8b Core/DB: Utgarde Keep - Proto Drake 2012-11-11 18:43:04 +01:00
Shauren
63076ae58b Merge pull request #8260 from Warpten/cleanup 
Core/Scripts: Cleanup alterac_valley.cpp.
 2012-11-11 06:20:19 -08:00
Pitcrawler
660f7e72be DB/SAI: Fix some Howling Fjord gossips 
Closes #4973
 2012-11-11 12:28:31 +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
51b23af98d Core/Scripts: Cleanup alterac_valley.cpp. 2012-11-09 18:14:30 +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
Spp
9659f0335f Core/Guilds: Multiple changes 
- Fix Delete Rank
- Fix Rank order after Rank is deleted
- Send correct event after Guild Tab purchase
- Better debug msgs
- Move news to Event Logs (internal struct is like Event Logs and Bank Event Logs). Max news configurable
 2012-11-07 23:21:19 +01:00
kaelima
68291eed03 Merge git://github.com/TrinityCore/TrinityCore into mmaps 2012-11-07 16:43:13 +01:00
ille
dd2e02f157 Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget() 2012-11-05 12:44:45 +01:00
kaelima
3c13454ad7 Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-11-05 12:02:08 +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
9074c11a90 Core/Dungeon Finder: Update "Current group roles" according to people in queue. 
Core/Dungeon Finder: Properly update internal lfg group structure at server load
 2012-10-29 20:13:42 +01:00
Spp
14027262ee Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load. 2012-10-29 13:58:48 +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
Gacko
ead804df92 Core: Fix compile warnings 2012-10-25 22:08:10 +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