Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,690 Commits 4 Branches 146 Tags
dd61ba2844fc96b3344183fe0b05ce65985fa8be
Commit Graph

7431 Commits

Author SHA1 Message Date
Vincent-Michael
796cf2e8a8 Scripts/HallsOfLightning: Remove hack for Volkhan "Shatter Resistant" 2012-11-27 19:41:53 +01:00
Vincent-Michael
1bde761742 Fix typo (thx Trista) 2012-11-27 19:07:46 +01:00
Vincent-Michael
210757bc46 Scripts/Naxxramas: 
- Remove hack for Sapphiron "The Hundred Club"
- Convert Sapphiron script_texts in creature_text
 2012-11-27 18:34:22 +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
Gacko
3bfce15019 Core/DB: Corrections for creature text conversion 2012-11-26 23:13:56 +01: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
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
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
2a845355eb Core/Script: Remove Scourge Prisoner cpp script, handled by SAI 2012-11-25 18:18:36 +01:00
Vincent-Michael
7ed100a74e Core/Scripting: Small cleanup 2012-11-25 01:01:22 +01: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
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
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
Shocker
d2063d2fb3 Build fix 2012-11-24 00:48:21 +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
Spp
f09d8b3c71 Addition to last commit... "Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)" 2012-11-23 15:24:17 +01:00
Spp
86594d4b7a Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide) 
Closes #8418
 2012-11-23 15:13:00 +01:00
Kevin Darcel
b82db85e75 Merge pull request #8374 from Huri/4.3.4 
Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fo...
 2012-11-23 01:40:11 -08:00
Spp
3cf7eb23f9 Missing change from merge 2012-11-22 15:08:28 +01:00
Spp
b9b57c2d62 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp
 2012-11-22 15:04:59 +01:00
Tuxity
2f1000a9ed Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players. 2012-11-22 01:39:54 +01:00
Tuxity
f5a54f8cbe Misc: Whitespace and tabs cleanup 2012-11-21 18:26:28 +01:00
cyberbrest
f205bc9b4f Core/Currency: Add support of Conquest points cap for arena and bg 
Remove obselete code for arena points distribution

Thanks to @Zakamurite
 2012-11-21 18:25:23 +01:00
Amit 86
b0b3c9ffbe Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE 2012-11-21 09:31:53 +02:00
Vincent-Michael
84d88cbcec Core: Fix warnings 2012-11-21 00:43:24 +01:00
Vincent-Michael
695836cb01 Core: Fix non pch build 2012-11-21 00:15:58 +01:00
ZxBiohazardZx
8bd462b6d1 Core/scritps: change enum to fix compile 2012-11-20 23:20:14 +01:00
ZxBiohazardZx
074b2e3936 Merge pull request #8371 from Gacko/creaturetext 
Core/DB: Some script to creature text conversions...
 2012-11-20 13:53:55 -08:00
Gacko
1e5e7056dc Core/DB: Converted 7 more scripts to creature text 2012-11-20 22:03:10 +01:00
Spp
08b7439f48 Typo Fix after 81606e5 (Thanks to vlad852 for noticing) 2012-11-20 19:02:58 +01:00
Gacko
9dc06f8bd9 Core/DB: Some script to creature text conversions... 2012-11-20 18:08:18 +01:00
huri
43d5af1ebd Core/Spells: Fixed Arcane Brilliance, Dalaran Brilliance, Power Word: Fortitude, Shadow Protection, Mark of the Wild, Blessing of Kings, Blessing of Might 2012-11-20 17:29:15 +01:00
Spp
1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp
7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
Spp
b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp
81606e5d1e Core/Misc: Define some methods const 2012-11-20 09:29:52 +01:00
Vincent-Michael
7aa967e966 Scripts/AQ: Fix warnings (thx razhael) 2012-11-19 16:24:59 +01:00