Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-17 07:29:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,370 Commits 4 Branches 147 Tags
548aa119ac2884bb1c34f80e2fb077a66bcdfd9f
Commit Graph

3565 Commits

Author SHA1 Message Date
Nay
7dcbb7d9bf Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 22:39:36 +01:00
w1sht0l1v3
02096f1c23 Core/Scripts: Anub'Arak encounter changes and fixes. 2012-09-11 22:52:47 +03:00
Nay
b1c4118a33 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 01:13:41 +01:00
Shauren
a301cf5bec Build fix. 2012-09-10 20:48:38 +02:00
Shauren
0390f9d708 Scripts/Icecrown Citadel 
* Despawn Mutated Abomination when second phase transition ends, not begins
* Prevent Unbound Plague jumping every 0.5 seconds to bypass the mechanic by raid members stacking in one place
* Fixed Volatile Ooze not picking targets when everyone stood close to the tank
* Fixed Ooze adds pickning new targets after old one gets lost

Closes #7610
Closes #7611
Closes #7665
 2012-09-10 20:32:13 +02:00
Spp
358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Nay
4896a1775e Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-10 00:54:29 +01:00
oMadMano
e377550280 Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer 
Closes #5700
 2012-09-09 16:24:06 +02:00
Vincent-Michael
637894da1a Core/Spells: Fix typo (I need sleep) 2012-09-09 04:19:17 +02:00
Vincent-Michael
2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script 
Closes #6545
 2012-09-09 04:02:47 +02:00
Nay
50327363ca Merge remote-tracking branch 'origin/master' into mmaps 2012-09-09 02:26:31 +01:00
Nay
d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2
c243185a3a Removed a line of debug code 2012-09-08 19:01:33 -04:00
Myran2
5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Subv
b8343391c2 Core/Scripts: Muglash should walk instead of running. 2012-09-08 07:51:54 -05:00
blub
16989dea6a Merge pull request #7690 from Geodar/master 
Core/Scripts: Fix typo
 2012-09-08 04:29:08 -07:00
Vincent-Michael
9c54cf3312 Core: Fix warnings 2012-09-08 13:24:42 +02:00
Geodar
2c441808f1 Core/Scripts: Fix Typo in 7121f015ed 2012-09-08 08:02:00 +02:00
Nay
6c1bdb3d3c Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-08 01:32:47 +01:00
Subv
7121f015ed Core/Scripts: Fixed a copy/paste mistake from previous commit 2012-09-07 18:31:19 -05:00
Subv
673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect. 
Author: Josh
closes #7275
 2012-09-07 18:26:14 -05:00
tibbi
286feb6940 Scripts/ToTC: Correcting Jaraxxus Volcano and Nether Portal behaviour 
Closes #7687
Closes #7467
 2012-09-07 18:01:02 +01:00
Nay
407286fe81 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-07 03:34:23 +01:00
Nay
21d43781ac Tabs to spaces... 2012-09-07 03:33:16 +01:00
Subv
0709d67e08 Merge pull request #7678 from Aokromes/master 
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
 2012-09-06 19:08:29 -07:00
Aokromes
6970a28f24 Scripts/Scarlet Monastery: Final boss kill credit closes #7341 
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
 2012-09-07 05:01:04 +03:00
kaelima
5eb22e5b64 Core/Vehicles: 
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
 2012-09-07 03:17:04 +02:00
Vincent-Michael
6f38fb1011 Core: Fix some code style 2012-09-07 02:21:38 +02:00
Nay
0522e50c86 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Spells/Spell.cpp
 2012-09-06 18:01:51 +01:00
Vincent-Michael
5954011a90 Core/Spells: clean up some code and move to spell script. Closes #7195 2012-09-06 11:00:37 -04:00
Venugh
c9eb42f246 Core/Commands: Implemented mmaps commands. 2012-09-06 00:36:24 +02:00
Nay
ca440756a8 Scripts/Commands: Fix .reload creature_template # 2012-09-05 19:50:09 +01:00
kaelima
7c971be3c5 Core/Misc: Fix some warnings and logic mistakes found by static code analysis 2012-09-05 17:18:05 +02:00
Shauren
147920c464 Merge pull request #7664 from Elron103/pull-requests 2012-09-05 06:40:56 -07:00
Elron103
6a701af13d Scripts/PitOfSaron: Fix Krick not casting Toxic Waste and Shadow Bolt 2012-09-05 15:34:07 +02:00
Nay
36b3e06a7e Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-09-04 19:11:04 +01:00
Nay
73172c67f0 Misc: Convert from CRLF to LF in cs_misc.cpp 
Also cleanedup whitespace
 2012-09-04 16:14:15 +01:00
Shauren
1e9fc84a12 Core: Warning fixes 
C4100: 'x' : unreferenced formal parameter
C4310: cast truncates constant value
C4389: '==' : signed/unsigned mismatch
C4668: 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
C4701: potentially uninitialized local variable 'x' used
C4826: Conversion from 'HMODULE' to 'DWORD64' is sign-extended. This may cause unexpected runtime behavior.
C6067: Parameter '3' in call to 'sprintf' must be the address of the string
C6387: 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle'
 2012-09-04 14:40:41 +02:00
Nay
b2bcc52fda Revert "Core: Blood Furnace - Broggok event" 
This reverts commit 153e88a16b.
 2012-09-04 01:03:06 +01:00
Subv
c0b031af4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-09-03 16:11:18 -05:00
Gacko
913645d5c7 Core: Blood furnace - Update method header to lastest rev 2012-09-03 22:25:26 +02:00
Gacko
153e88a16b Core: Blood Furnace - Broggok event 
Move prisoners back in cages after respawn. They didn't reset correctly
for players which were still in the instance after wipe
 2012-09-03 20:09:45 +02:00
Nay
c7fed98b9d Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	dep/PackageList.txt
 2012-09-03 15:51:34 +01:00
w1sht0l1v3
f46982ee7a Scripts: Fix non pch build 2012-09-03 16:15:18 +03:00
w1sht0l1v3
128d99b29b Core/Scripts: Rewrite Cold Hearted quest. 
Closes #1758 .
 2012-09-03 15:50:08 +03:00
Nay
77c8e0a2a4 Merge pull request #7625 from Elron103/pull-requests 
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
 2012-09-02 17:05:34 -07:00
Elron103
1e361bc43a Scripts/MoltenCore: Fix boss Golemagg enrage behaviour 2012-09-03 01:57:01 +02:00
Nay
40c22de0b7 Merge pull request #7587 from acrathos/master 
DB/SAI: Thorim and Lok'lira the Crone
 2012-09-02 07:47:57 -07:00
Gacko
9060294ab0 Core: Quest 'The art of persuasion' - Typo 2012-09-02 11:54:02 +02:00
Nay
ffe8c75f17 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-01 22:20:33 +01:00