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
17,606 Commits 4 Branches 146 Tags
79b1895223bbf16bfd6484e34e067beea457e4cc
Commit Graph

1132 Commits

Author SHA1 Message Date
Nay
79b1895223 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-23 16:02:26 +00:00
Shauren
621a249188 Scripts/Icecrown Citadel: Fixed a possible crash in Blood Nova spell script 
Closes #7046
 2012-12-23 12:42:28 +01:00
Gacko
2302b04a06 Core/Spell: Last work on Shadows Fate 
- Shadows Fate can now be applied by more than just one player at the same
   time. So on everyone who hits the unit the credit spell with the visual
   will be casted on death.
- The AOE credit spells for the three infusion quests will be casted by
  the boss once. If this would be done on proc, these AOE spells could be
  casted up to 25 times.
  -> 25 AOE credit spells plus 25 Soul Feast credit spells equals Sh**
 2012-12-22 17:49:51 +01:00
kaelima
0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
 2012-12-21 00:00:16 +01:00
Kaelima
05c38b20ea Merge pull request #8668 from joschiwald/random_changes 
Core/Misc:
 2012-12-19 23:48:00 -08:00
joschiwald
f4e7cde1b5 Core/Misc: 
- some simplifications in reputation calculation
- removed aura in SPELL_AURA_LINKED should depends on SpellDifficulty
- remove some unneeded variable declarations when it's already declared
- remove some hacks
- fix some warnings in Lfg stuff
- some codestyle changes
 2012-12-19 12:55:51 +01:00
Trista
5a52acbe40 Core/Quest: Optimize and clean more last commit 
* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* 48141bbfa6
 2012-12-17 10:39:54 +02:00
click
aa3980c744 Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...) 2012-12-17 05:39:04 +01:00
click
1f88f81c5a Core: Fix non-PCH build again 2012-12-17 04:53:32 +01:00
Trista
48141bbfa6 Core/Quest: Song of Wind and Water 
* cleanned a bit and edited old @Treak fix, credits go to him, the quest will* work 100% blizzlike when target_unit_master #8643 gets a fix for vehicle. What concerns the quest is done. I've already fixed the core kill_credit issue, but needs to be discussed.
* leaving the vehicle_AI until they get integrated correctly to SAI, this can be easily converted after. Currently need to make some hacks to make it work close to good if using SAI. (specificly terrain acts weird at that place)

Closes: #5424
 2012-12-17 04:37:27 +02:00
Nay
377d6c7862 Merge pull request #8131 from flippy84/master 
Core/Script: Heigan phase 2
 2012-12-16 17:03:26 -08:00
Vincent_Michael
f96295f6ca DB/Scripts: Implemented creature_text for Trial of the Champion 2012-12-16 21:05:05 +01:00
Vincent_Michael
db6195789d Core: Fix non pch build 2012-12-14 23:31:08 +01:00
Vincent_Michael
d2cc278283 Core/Spells: Rename spell script scripts in correct script name 2012-12-14 23:19:03 +01:00
CeIa
b87cc31106 Scripts/Events/Achievement: fix 'Out With It' 
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-14 01:23:53 +00:00
Gacko
d34a9df70a Core/DB: Last fixes for creaturetext conversion 2012-12-09 20:03:17 +01:00
Vincent_Michael
1e22367ca4 Core/Scripts: Add missing creature_text for eregos 2012-12-08 01:18:26 +01:00
Vincent_Michael
d96f80cc5d Core/Scripts: Fix crash (need convert in sai) 2012-12-07 17:37:30 +01:00
Vincent-Michael
6ed36342a2 Core: Fix non pch build 2012-12-06 19:03:15 +01:00
Gacko
f9c0e3c91b Core/DB: Creature text for 53 script files 2012-12-06 18:08:21 +01:00
Vincent-Michael
40b010e3ad Misc/Scripts: Some fixes for creature_text 2012-12-04 20:12:48 +01:00
Vincent-Michael
5a7c4f43b6 Core: Fix typo 2012-12-04 09:32:39 +01:00
Gacko
33c44594cd Core/DB: Creature text for 26 script files 2012-12-03 22:10:18 +01:00
Gacko
a73a7dc43f Core/DB: Creature text for 37 script files 2012-12-02 19:13:57 +01:00
Vincent-Michael
7afbacd6e1 Core/Ulduar: 
- Implemented kill credit for hodir and assembly of iron
- Some cleanup
 2012-12-01 17:34:00 +01:00
Vincent-Michael
ae4d63bb8e Core: Fix some warnings 2012-12-01 14:58:57 +01:00
blub
5bbd41656c Merge pull request #8522 from joschiwald/creature_text 
Scripts/Ulduar: convert all script_texts to creature_text from this zone
 2012-12-01 05:34:08 -08:00
Vincent-Michael
e4f093cccc Core: Fix more typos (thx Expecto) 2012-12-01 13:51:02 +01:00
joschiwald
de96841579 Scripts/Ulduar: convert all script_texts to creature_text from this zone 2012-12-01 04:27:40 +01:00
joschiwald
32c4e30599 Scripts/Ulduar: cleanup Assembly of Iron 2012-11-30 21:37:46 +01:00
Vincent-Michael
796cf2e8a8 Scripts/HallsOfLightning: Remove hack for Volkhan "Shatter Resistant" 2012-11-27 19:41:53 +01:00
Vincent-Michael
1bde761742 Fix typo (thx Trista) 2012-11-27 19:07:46 +01:00
Vincent-Michael
210757bc46 Scripts/Naxxramas: 
- Remove hack for Sapphiron "The Hundred Club"
- Convert Sapphiron script_texts in creature_text
 2012-11-27 18:34:22 +01:00
Spp
e954498560 Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch 2012-11-27 13:03:12 +01:00
Spp
2251d1bfae Core/Misc: Set mode 0644 for files 2012-11-27 13:03:12 +01:00
Vincent-Michael
8a7ec89883 Core: Fix warnings 2012-11-27 12:36:38 +01:00
w1sht0l1v3
b67afe1fa0 Core/Scripts/Quests: Implement The Battle for Crusaders' Pinnacle. 2012-11-26 23:56:48 +02:00
Vincent-Michael
2a845355eb Core/Script: Remove Scourge Prisoner cpp script, handled by SAI 2012-11-25 18:18:36 +01:00
Nay
24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Spells/SpellEffects.cpp
 2012-11-23 23:39:03 +00:00
Spp
f09d8b3c71 Addition to last commit... "Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)" 2012-11-23 15:24:17 +01:00
Spp
86594d4b7a Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide) 
Closes #8418
 2012-11-23 15:13:00 +01:00
Amit 86
b0b3c9ffbe Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE 2012-11-21 09:31:53 +02:00
Spp
7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
Spp
81606e5d1e Core/Misc: Define some methods const 2012-11-20 09:29:52 +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
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
Gacko
c95228fcf8 Core: Utgarde Keep - Fix warning/error 2012-11-16 14:21:48 +01:00