Commit Graph
14604 Commits
Author SHA1 Message Date
Nay 94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2012-09-30 15:46:00 +01:00
Nay 39dba3f22f Merge pull request #7891 from tibbi/title_converter
adding Title converter to faction converter, original author Silinoron
2012-09-30 07:40:51 -07:00
Nay 0eb86ac370 Merge pull request #7896 from tibbi/wsg
some WSG improvements
2012-09-30 07:38:20 -07:00
Nay 8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
Nay 35412ddc3c Merge pull request #7892 from Tuxity/holyPower434
[434] Holy power handler
2012-09-30 05:10:08 -07:00
Retriman 8110ab1ed5 Core/Script:
* Update creature_text for boss Elder Nadox
* Clean Space

work whitch @Durotar
2012-09-30 01:28:36 -04:00
durotar 49179651b1 Core/Script: update creature_text for boss Mimiron 2012-09-29 14:07:52 -05:00
Sovak dea3ca95f6 Core/Build: Fix compile
Signed-off-by: Sovak <Sovak007@gmail.com>
2012-09-29 13:43:14 +02:00
tibbi dcf68a02f6 typo 2012-09-28 19:54:17 +01:00
Kandera cb8fc503dd Core/Battlefield: revert part of previous commit to fix build. 2012-09-28 10:41:44 -04:00
Kandera db455e317e Core/Battlefield: fix build from previous commit 2012-09-28 09:45:50 -04:00
Subv 431db10e1a Core/Battlefield: fix world states on player login for wintergrasp 2012-09-28 09:44:34 -04:00
tibbi 45af997cca some WSG improvements
* correct worldstates
* remove focused/brutal assault on a flag capture
2012-09-28 14:39:06 +01:00
Tuxity eee2a4bd9c Core/Spells: Add holy power resource handler. By @Greymane 2012-09-28 11:17:18 +02:00
w1sht0l1v3 f2e92b81a3 Core/Scripts: Some fixes for Razorscale. 2012-09-28 01:37:34 +03:00
tibbi 187133bc0e emptyline 2012-09-27 22:40:59 +01:00
tibbi 404a036fa9 adding Title converter to faction converter, original author Silinoron 2012-09-27 22:38:19 +01:00
kaelima 138c52c967 Core/Battleground: Change notice about unhandled areatriggers to debug info and removed the GM notice.
Added comment for a field in HandleBattlefieldListOpcode. And removed useless bool in BattlefieldWG::OnGameObjectCreate.
2012-09-27 22:15:06 +02:00
durotar 7e1ee7afb1 Core/Script: update creature_text for Custodian of Time (quest 10277) 2012-09-27 12:45:39 -05:00
kandera 8408c52c40 Merge pull request #7883 from tibbi/shield_generator
correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT
2012-09-27 09:35:08 -07:00
tibbi 5c4832c33e Correctly update visibility for transports, author GriffonHeart 2012-09-27 11:13:36 +01:00
tibbi 3fae05f6f3 correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT 2012-09-27 00:31:00 +01:00
Subv 1bb39edd02 Core/Maps: Use DBC value to determine the maximum depth that a player can reach in an area before being teleported back up. 2012-09-26 12:10:23 -05:00
Subv 0d8a8e9486 Core/Entities: Updated some pet stats code to Cataclysm. 2012-09-26 11:03:46 -05:00
Subv df12eba820 Core/Entities: Use the Ranged Attack Power multiplier from the DBC to calculate ranged attack power bonus from agility 2012-09-26 10:50:44 -05:00
Kandera 15663749a6 Core/Spells: fix gnomeregan pride. Closes #5721 thx gecko32 2012-09-26 10:32:39 -04:00
Kandera a3b32cf2c5 Core/Battlefield: remove duplicate if. probably due to bad merge 2012-09-26 09:14:08 -04:00
Kandera c5ada4b487 Core/Spells: fix typo from previous commit that caused a crash. 2012-09-26 09:11:30 -04:00
Spp f0f97ab851 Core/Logging: Fix crash when trying to log a message while config is being reloaded
Closes #7878
2012-09-26 13:42:53 +02:00
Nay 424ac73766 Core/Spells: Properly (hopefully) merge 335's Beacon of Light + 434 changes (also fixes build)
Closes #7871
Closes #7872
2012-09-25 19:58:18 +01:00
Nay 15c05ed771 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
2012-09-25 09:26:48 +01:00
Vincent-Michael 118825601b Core/Spells: fix misdirection removal on cancel. Closes #7776 2012-09-24 12:39:02 -04:00
Xanvial 1c1405cb25 Core/Scripts: fix rotface oozes from spawning after death. Closes #7736 2012-09-24 12:35:09 -04:00
Kandera 3cf359068e Core/Spells: Fix things from commit da4067cb30 thx dracosvk 2012-09-24 12:16:37 -04:00
Kandera 5adc3d28a4 Core/Player: fix teleporting while on vehicle. Closes #7812 thx joschiwald 2012-09-24 12:08:25 -04:00
faq 58d3758f4c Core/Spell: Correcting previos PR. splitamount is already calculated in core and removing not in. variable 2012-09-24 18:35:10 +03:00
kandera 8be79542ca Merge pull request #7859 from Faq/Divine2
Implementing split dmg cap to Divine Sacrifice. Author Tibbi
2012-09-24 08:19:50 -07:00
faq da4067cb30 Implementing split dmg cap to Divine Sacrifice. Author Tibbi
+correcting previos sql

Closes #6024
2012-09-24 18:18:30 +03:00
kandera c0c64da286 Merge pull request #6788 from Vincent-Michael/charmer
Core/Spells: Fix no combo points after Mind Control
2012-09-24 07:55:32 -07:00
Kandera dc935ef8b1 Core/Spells: fix beacon of light being on a non player. 2012-09-24 10:37:58 -04:00
kandera a4e3709dd3 Merge pull request #7811 from Faq/SplitDamage2
Core/Spells: Implementing some hooks for split damage taken, fixes the l...
2012-09-24 05:24:01 -07:00
Nay 1f79ac8c30 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-23 22:17:12 +01:00
Nay a7386bd1b3 Scripts: Fix some code style issues in scripts 2012-09-23 22:16:28 +01:00
Nay 91fd408446 Merge pull request #7842 from Elron103/pull-requests2
Core/GameObject: Implement method GetDisplayId, use it for GameObjectModels
2012-09-23 07:49:18 -07:00
Nay e4d08c1186 Merge pull request #7555 from Gacko/quest11648
Core: Quest - The art of persuasion
2012-09-23 07:48:40 -07:00
Gacko 2da0af9595 Core: Utgarde Keep - Shadow Axe - MovementInform 2012-09-23 16:44:11 +02:00
Gacko 39a704671d Core: Utgarde Keep - Last corrections 2012-09-23 16:10:46 +02:00
Elron103 d45a768810 Core/GameObject: Implement method GetDisplayId, use it for GameObjectModels 2012-09-22 18:01:51 +02:00
Nay 95d713ac6f Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-22 10:56:41 +01:00
Gacko e9a2b3f10e Scripts/Sm: Fix quest I was a lot of things
(Modified - Nayd)

Closes #6295
Closes #7577
2012-09-22 02:26:55 +01:00