Nay
f4602811d5
Merge pull request #8483 from kkhugs/4.3.4
...
Small levelup health fix with heirlooms
2012-11-27 08:32:53 -08:00
QT
8b555ffa9f
Move _ApplyAllLevelScaleItemMods to above SetFullHealth so player will have full health regardless of heirlooms equipped (blizzlike)
2012-11-27 09:27:38 -07:00
Spp
aab59442a4
Fix merge error
2012-11-27 15:06:40 +01:00
Spp
404129963c
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ArenaTeamHandler.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSpline.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Spells/Auras/SpellAuraDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_disable.cpp
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/ungoro_crater.cpp
src/server/shared/Packets/ByteBuffer.h
src/tools/map_extractor/dbcfile.h
2012-11-27 14:15:12 +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
Shauren
25f1d61923
Merge pull request #8473 from Gacko/creaturetext
...
Core/DB: Convert 25 more scripts to creature text
2012-11-27 03:12:09 -08:00
Spp
99e050fb27
Core/Misc: Tab2spaces, remove trailing whitespaces and remove dupe code after merge
2012-11-27 11:56:23 +01:00
Shauren
02aae2858b
Core/Authserver: Always send realm address to clients in dotted ip format.
2012-11-27 11:30:48 +01:00
Shauren
e9ede29592
Core/Auras: Added missing break in AuraEffect::CalculateAmount (accidentally removed in cea752fadf)
2012-11-27 11:25:29 +01:00
Shauren
cea752fadf
Merge pull request #8481 from Ne3x/unholy_blight_fix
...
Core/Spells: Fix Unholy Blight not stacking correctly
2012-11-27 01:28:56 -08:00
Spp
611ffbb189
Core/Units: make SetHover virtual
2012-11-27 07:45:08 +01:00
Ne3x
4e03a67045
Core/Spells: Fix Unholy Blight not stacking correctly Note: As of patch 3.2.0: The damage supposed to accumulate similar to Ignite and Deep wounds. Source: http://www.wowwiki.com/Unholy_Blight
...
Closes : #8265
2012-11-26 21:03:45 -08:00
click
50944711c8
Core: Change phrasing on the logmessage given when a gameobject loses its reference owner
2012-11-27 02:44:30 +01:00
click
0b177376b0
Core: Move BF-handler invitation/queuing-logmessages to outDebug() (the information given there aren't really considered "errors"...)
2012-11-27 02:32:47 +01:00
click
1d7105914a
Core: Fix some silly warnings (some stupid remnants from old times that has bugged me enough)
...
No need to recompiling anything, it's just a visual change to make the compilers STFU about variable initializations
2012-11-27 02:24:12 +01:00
click
8ef48ecc99
Core/Buildsystem: Clean up compileflags when compiling with warnings fully enabled.
...
-Wwrite-strings is default enabled when -Wall is set in clang/gcc, hence removed.
-Woverloaded-virtual is now enabled for C++-code only, this removes the useless warnings when dabbling with C-only code.
2012-11-27 00:43:38 +01:00
Vincent-Michael
371fbf5d31
SQL: Fix sql import problem
2012-11-26 23:46:13 +01:00
Gacko
3bfce15019
Core/DB: Corrections for creature text conversion
2012-11-26 23:13:56 +01:00
WishToDie
9129b440ea
Fix No newline at end of file.
2012-11-27 00:06:05 +02:00
w1sht0l1v3
b67afe1fa0
Core/Scripts/Quests: Implement The Battle for Crusaders' Pinnacle.
2012-11-26 23:56:48 +02:00
Gacko
7accb42cc4
Core/DB: Convert 25 more scripts to creature text
2012-11-26 22:55:12 +01:00
w1sht0l1v3
1ff6b10fb7
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
2012-11-26 23:51:49 +02:00
w1sht0l1v3
44f3930cf0
Fix compile after bdbafc0184
2012-11-26 23:50:14 +02:00
click
4762ad726f
Core/Buildsystem: Start cleaning up the mess created after "implementing" support for clang/OSX-based compiles - initial cleanup, more will come
...
If OSX-compile fucks up because of this, then report fixes on the tracker as usual, not through hotpatches going through other lead devs.
2012-11-26 22:42:23 +01:00
Subv
bdbafc0184
Core/Conditions: Add CONDITION_GENDER = 20
2012-11-26 14:35:28 -05:00
Spp
ad6b5fb419
Core/Dungeon Finder: Fix reward for last member of each group being disbanded to join new lfg group
...
- Move some messages to Trace
- Add some cases where internal data wasn't updated with new state
- Reverts 441712fbb and ae507e5 (Old State should only store those states you can Restore from a Rolecheck/Proposal)
Closes #8339
Closes #8420
Closes #8421
2012-11-26 20:20:47 +01:00
Shauren
4dffccb93f
Core/Spells: Corrected radius calculation
2012-11-26 11:11:30 +01:00
Shauren
5e9acb3341
Core/Player: Fixed crashes happening when player logs in to a battleground which has ended and doesn't have valid return location stored in database.
...
Closes #5441
Closes #7093
Closes #8242
2012-11-26 10:34:11 +01:00
joschiwald
2a4ba49664
Core/Guilds: Fix bank money log after 58ec4e53 (due to bad opcode structure).
...
Closes #8432
2012-11-26 08:48:51 +01:00
Spp
8ae0f2332c
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
src/server/scripts/Kalimdor/azshara.cpp
2012-11-26 08:43:29 +01:00
Shauren
fdf0c32857
Merge pull request #8451 from Warpten/434
...
Core/Spells: Fixed Leap of Faith.
2012-11-25 12:42:55 -08:00
Warpten
f01f695c7d
Core/Spells: Fixed Leap of Faith and renamed a spell script to match standards.
2012-11-25 21:07:08 +01:00
Vincent-Michael
941be9cdc4
DB/Conditions:
...
- Fix startup db error
- Fix spawn for Plant Chieftain's Totem
2012-11-25 19:10:06 +01:00
Vincent-Michael
2a845355eb
Core/Script: Remove Scourge Prisoner cpp script, handled by SAI
2012-11-25 18:18:36 +01:00
Nay
5c21480431
Merge pull request #8435 from Warpten/434
...
434: Enable a few opcodes
2012-11-25 06:27:38 -08:00
Warpten
4bb9b13e01
Core/Guilds: Handle CMSG_GUILD_SET_GUILD_MASTER. You can now promote any guild member to the GuildMaster rank.
...
Also enable talents inspection and automagically refusing guild invites.
2012-11-25 14:01:51 +01:00
ZxBiohazardZx
c44c6248ec
DB/Misc: Various fixes from issuetracker:
...
correct SAI parameters, should fix quest "Not On My Watch" Closes #4149
Add SAI for quest "Eliminate the Competition" Closes #4206
add SAI for quest "Bringing Down the Iron Thane" Closes #4252
add SAI for event after quest "The Dragonforged Hilt" Closes #4888
2012-11-25 12:49:31 +01:00
ZxBiohazardZx
f9b2fac9eb
DB/Misc: Various fixes from the issuetracker, Various Authors, see issues for details
...
Fix issue for warlock quest "The Binding" Closes #373
add SAI and gossip for quest "Glyph Chasing" Closes #1682
add spells for quest "On Ruby Wings" Closes #3068
add spawns for quest "Vengeful Souls" Closes #3232
add conditions and spells for quest "Seal of Ascension" Closes #3608
add SAI for quest "Hungry Nether Rays" Closes #3656
add SAI for quest "The Restless Dead" Closes #3853
2012-11-25 12:27:50 +01:00
Shauren
66234a835c
Core/Battlefield: Compile fix
2012-11-25 11:14:19 +01:00
Shauren
ba18fe1e56
Core/Spells: Fixed combat log for spells that affect item durability
2012-11-25 11:13:39 +01:00
Shauren
00044b5d32
Core/PacketIO: Parse the MGS_MOVE_STOP packet embedded into spell cast packets with flag 0x2
2012-11-25 11:12:53 +01:00
Shauren
408793a736
Core/Players: Logic fixes for tradeable soulbound items
2012-11-25 11:12:16 +01:00
Shauren
108db4f6eb
Core/Items: Cloned items should not retain refundable/tradeable flags
2012-11-25 11:11:26 +01:00
Shauren
0cd59ec210
Merge pull request #8318 from blipi/battlefield_fix
...
Core/Battlefield: Fix crashes due to invalid pointers use
2012-11-25 01:57:42 -08:00
Shauren
bd2e5b1be8
Core/Battlegrounds: Fixed GameMasters logging out in arena counting as player killed for any teams.
...
Closes #7429
2012-11-25 10:34:59 +01:00
Shauren
0462f0b149
Core/Battlegrounds: Corrected arena logout win conditions
2012-11-25 10:27:11 +01:00
Shauren
5de19484ee
Core/Spells: Removed selecting shapeshift model based on race and skin color for creatures.
2012-11-25 10:23:24 +01:00
Vincent-Michael
bc01f34ce5
SQL: Rename SQL merged in PR
2012-11-25 01:17:26 +01:00