Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,607 Commits 4 Branches 146 Tags
b566f544df9fa648039ba2bd615baba9eb27741e
Commit Graph

15219 Commits

Author SHA1 Message Date
Kaelima
b566f544df Merge pull request #8771 from NorthStrider/Holy_Power 
[4.3.4] Core/Unit: Fixed Holy Power gain
 2012-12-25 18:58:39 -08:00
Subv
9a11b59ba8 Core/Vehicles: Fixed riding vehicles and mind control auras. 
Actually, fixed everything that allows you to control another unit.
 2012-12-25 21:50:39 -05:00
Northstrider
74bcb07adc Core/Unit: Set Holy Power ammount to 3. Holy Power can now be gained by using Crusader Strike. 2012-12-26 03:02:41 +01:00
Vincent_Michael
e65da39f23 Core: Fix non pch build 2012-12-26 02:50:19 +01:00
Vincent_Michael
5d30811397 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.h
 2012-12-26 02:06:43 +01:00
Subv
3742205866 Copyright: Added missing license information. 2012-12-25 19:40:57 -05:00
Subv
587710feb5 Scripts/HallsOfOrigination: Added script for Earthrager Ptah. 
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
 2012-12-25 19:36:01 -05:00
Vincent_Michael
cfb6a1b4d5 Core/Quest: Add missing changes for monthly quests 2012-12-26 01:12:04 +01:00
Vincent_Michael
6e921feebd Core: Fix some codestyle 2012-12-25 02:56:19 +01:00
Vincent_Michael
fa5f2b4c60 Core: Fix non pch build 2012-12-25 02:51:40 +01:00
Subv
d4f936a4fa Scripts/HallsOfOrigination: Fixed Temple Guardian Anhuur's Reverberating Hymn spell damage. 2012-12-24 19:02:10 -05:00
Subv
f9e592e9c7 Scripts/HallsOfOrigination: Some work on Halls of Origination. 
Temple Guardian Anhuur's script added.
ToDo: Make the triggers invisible.

Merry Christmas folks!
 2012-12-24 18:25:57 -05:00
Nay
81fee56bfe Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.h
 2012-12-24 22:20:17 +00:00
Trista
6189eeb8e6 Core/Movement: Fix codestyle -7092e9350bbb8123de688be0bf5dd87d8196d34f 2012-12-24 23:59:25 +02:00
Vincent_Michael
d3d9dfd734 Core/Script: Add some talks for Zul'Gurub 2012-12-24 21:38:28 +01:00
Shauren
75e7cf7eb5 Core/Quests: Added support for 10/25 man only raid quests 2012-12-24 19:53:28 +01:00
Shauren
f43b9df400 Core/Spells: Added missing changes to 77b85b2ea0 2012-12-24 19:13:00 +01:00
Subv
77b85b2ea0 Core/Spells: Fixed loading of spell data corrections. 2012-12-24 12:34:46 -05:00
Vincent_Michael
b4996c90ff Core: Fix some codestyle 2012-12-24 17:26:42 +01:00
Vincent_Michael
7b534774b6 Core/Spells: Remove spell script "spell_gen_damage_reduction_aura" 2012-12-24 17:22:33 +01:00
Vincent_Michael
accc83a76d Core/Scripts: Fix typo 2012-12-24 17:22:33 +01:00
Subv
c6c07c1477 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-12-24 11:13:50 -05:00
Trista
7092e9350b Core/Movement: Final fix for MSG_MOVE_TELEPORT 
* Creator Subv, (thx to Shauren also who stated that this packed should be used when researchs were started)
- You all should'be thankful, that bug was a real bitch
* Fix creatures using NearTeleportTo (example Urom in Oculus, Skeram/Viscidus in AQ and Heigan in Naxxramas)
 2012-12-24 18:04:58 +02:00
Subv
73d1ef7271 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-24 10:35:37 -05:00
Subv
f6f3680995 Core/BuildSystem: Added some more headers to the collisions project PCH 2012-12-24 10:34:36 -05:00
Subv
6e7734c318 Core/Spells: Fixed interrupting of some bosses spells 2012-12-24 10:13:15 -05:00
Subv
1d45bc0413 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-24 09:00:07 -05:00
Subv
bba1571099 Core/Chat: Corrected SMSG_MESSAGECHAT in a few more places 2012-12-24 08:59:18 -05:00
Vincent_Michael
ec6f7541b7 Core: Fix merge fail 2012-12-24 14:38:31 +01:00
Warpten
8a52e6b1e3 Core/Battlegrounds: Corrected one typo in SMSG_BATTLEFIELD_STATUS_ACTIVE. 2012-12-24 01:52:29 +01:00
Trista
fb3245d125 Scripts/Quest: Gambling Debt and Words of Power 
* Quest support for Gambling Debt. Closes: #3122
* Fix bugging script for Words of Power: Closes: #7349
* Fix codestyle that vs broke from: 8c82c075cc
 2012-12-24 01:35:55 +02:00
Subv
181b8fca51 Core/Chat: CHAT_MSG_RAID_BOSS_WHISPER also sends extra data 
Note: SMSG_MESSAGECHAT is bloated all around the core, a complete mess.
 2012-12-23 18:31:30 -05:00
Subv
497dcc5974 Core/Chat: Fixed raid boss emotes. 2012-12-23 18:15:15 -05:00
Trista
8c82c075cc Scripts/Quest: Defending Wyrmrest Temple 
* insert complete db sniff support, appart from missing spawns
* remove achievement from disables (supported by core - timed one)
* insert core support for spells and the defender itself, since SAI makes it act weird (maybe in future when SAI get integrated someone will convert it)

Closes #1861 on 90% (except spawns (there are enough, but a lot more needed and minnor stuff that are core side connected with vehicles spellcastresults)
 2012-12-24 00:51:39 +02:00
Subv
64775fba3e Fixed a merge fail 2012-12-23 13:51:17 -05:00
Subv
7a2c81bfd0 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2012-12-23 13:24:59 -05:00
Subv
c33a1724ae Core/Spells: Spells that are usable while stunned should no longer have problems with stun auras that don't apply any mechanic. 2012-12-23 13:21:00 -05:00
stfx
51fadb57e0 Allow setting afk/dnd message in afk/dnd state 
Also use the same variable to store the message for AFK and DND

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-23 17:49:47 +00:00
stfx
01ef119703 Fix receiving whispers while being dnd 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-23 17:49:46 +00:00
Subv
6ff69a10b3 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-12-23 12:44:22 -05:00
Subv
a0ad8f7a46 Core/Entities: Also send MSG_MOVE_TELEPORT to the player 2012-12-23 12:39:51 -05:00
Gacko
006cc1797a Core: Fix warning 
boss_sindragosa.cpp:235: warning: unused parameter ‘killer’
 2012-12-23 18:04:42 +01:00
Subv
522d5c4f3c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-23 09:33:57 -05:00
Subv
24466d721c Core/Entities: Missing change from previous commit 
Calling UpdateObjectVisibility() will make sure that the semi-far teleports (those where the destination position is not in direct sight) will work correctly.
 2012-12-23 09:33:29 -05:00
Subv
f4bd89ba03 Build/Core: Fixed build. 2012-12-23 09:07:32 -05:00
Subv
eff2a994b1 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-12-23 08:34:10 -05:00
Subv
3869bb7b3a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
 2012-12-23 08:33:13 -05:00
Subv
143340b38c Core/Movement: Fixed near teleports, big thanks to @Trista who basically figured this out on his own. 2012-12-23 08:09:56 -05: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
Warpten
8c53f042ad Core/StatsSystem: Typos, typos everywhere. Thanks @Wayt for noticing. 2012-12-22 23:46:46 +01:00