Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
30,447 Commits 2 Branches 1 Tag
1106eadac6df7d94de04f9f1642d53f37ca847bc
Commit Graph
30447 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent-Michael dd4d9f44f4 SQL: Add newlines to end of file 2012-11-25 01:11:00 +01:00
ZxBiohazardZx cabfcb1a3d Readd support for quest 11198 (SAI) 
Closes #1421 : Morridune is hostile for Alliance.
Closes #1426 : Attack on Camp Narache
Closes #1518 : Eramas Brightblaze's attack type
Closes #1520 : Banish the Demons
Closes #1843 : Old Crystalbark
Closes #1881 : The Honored Dead
Closes #2075 : Bring Down Those Shields
Closes #2077 : Eyes of the Eagle
Closes #2324 : Battered Hilt
Closes #4363 : Crashin' Thrashin' Racer
Closes #5320 : Fields of Grief
Closes #8408 : ICC Trash Mobs Damage
Closes #8401 : Anatoly will talk
Closes #8405 : A Sister's Pledge and Hour Of The Worg
Closes #8404 : An Experienced Guide
Closes #8382 : Agmar's Hammer missing gossips
Closes #8032 : Destroying the Altars
Closes #7996 : Set Required races for some Argent Tournament quests
Closes #7969 : Pyroblast Cinnamon Ball (37582), G.N.E.R.D.S. (37583), Soothing Spearmint Candy (37584) & Chewy Fel Taffy (37585) duration fix
Closes #7964 : Hyperspeed Acceleration
Closes #7824 : Missing Brewfest Vendors
Closes #7823 : This One Time, When I Was Drunk... Alliance quest giver fix
Closes #7416 : Twilight of the Dawn Runner
Closes #7301 : Ashenvale's spirit healer
Closes #7219 : The Ashenvale Hunt
Closes #7079 : Corporal Thund Splithoof
Closes #7155 : Aleric Hawkins
Closes #7011 : Inactive Fel Reaver
Closes #6959 : There Is No Hope
Closes #6212 : Merciful Freedom
 2012-11-25 01:06:55 +01:00
Vincent-Michael 7ed100a74e Core/Scripting: Small cleanup 2012-11-25 01:01:22 +01:00
Nay 0591c468ac Core/SAI: Add more details to an error log 2012-11-24 23:49:48 +00:00
Nay 8f27dfda62 Core/SAI: Add more details to an error log 2012-11-24 23:48:30 +00:00
Kinzcool 2e04c1280b DB/Gossips: Added proper gossips Ids for Darnassus Sentinel 2012-11-24 16:15:30 -05:00
Shauren c7fd67bdfd Merge pull request #8423 from joschiwald/conditions 
Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails
 2012-11-24 08:25:45 -08:00
ZxBiohazardZx e29be15432 DB/Quests: Convert/remove quest_start_script entries 
THIS (TEMP) REMOVES SUPPORT FOR QUESTS 434,10985,11108,11198!
 2012-11-24 14:42:35 +01:00
joschiwald e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00
Nay 0fa484793a Fix a typo in previous merge 2012-11-23 23:44:43 +00: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
Vincent-Michael ea60648c88 Core: Fix typo 2012-11-24 00:25:56 +01:00
Shauren eb10226b02 Core/Battlegrounds: Fixed loading StartMaxDist (this time properly) 2012-11-24 00:08:15 +01:00
Shauren bc95305d57 Core/Battlegrounds: Fixed loading StartMaxDist 2012-11-23 23:53:36 +01:00
Shocker d2063d2fb3 Build fix 2012-11-24 00:48:21 +02:00
Shocker 7243b988b7 SQL: Rename recent SQL 2012-11-24 00:35:05 +02:00
Shocker 8cbc904f02 Merge pull request #8407 from Gacko/creaturetext 
Core/Scripts: More creaturetext conversions
 2012-11-23 14:33:54 -08:00
kaelima fc974d6fbe Core/Movement: Remove deprecated method Creature::AI_SendMoveToPacket. 2012-11-23 20:18:55 +01:00
kaelima 7fcdbdd3ae Core/Scripts: Fix typo in boss_lethon script 2012-11-23 20:17:19 +01:00
Gacko 4065176897 Core/DB: Convert 14 more scripts to creature text 2012-11-23 16:25:59 +01:00
Gacko 27619b2bd7 Core/DB: Chapter 5 in creature text 2012-11-23 15:59:11 +01:00
Gacko a66adcf6e1 Core/DB: Chapter 2 in creature text 2012-11-23 15:59:10 +01:00
Gacko 14b728255c Core/DB: Converted 11 scripts to creature text 2012-11-23 15:59:10 +01:00