Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
27,003 Commits 2 Branches 1 Tag
b3ea9fbbe53fb3558d88f0254455c609ea8be352
Commit Graph
4488 Commits
Author SHA1 Message Date
ariel- b3ea9fbbe5 Map local guids 6.x -> 4.3.4 
Ported the following commits:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
 2016-01-11 01:50:45 -03:00
Carbenium 221f1405b6 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	sql/updates/world/2015_08_29_00_world.sql
	sql/updates/world/2015_08_29_01_world.sql
	sql/updates/world/2015_08_30_00_world.sql
	sql/updates/world/2015_08_31_01_world.sql
	sql/updates/world/2015_09_02_00_world.sql
	sql/updates/world/2015_09_02_01_world.sql
	sql/updates/world/2015_09_02_04_world.sql
	sql/updates/world/2015_09_03_00_world.sql
	sql/updates/world/2015_09_03_01_world.sql
	sql/updates/world/2015_09_03_02_world.sql
	sql/updates/world/2015_09_03_03_world.sql
	sql/updates/world/2015_09_03_04_world.sql
	sql/updates/world/2015_09_03_06_world.sql
	sql/updates/world/2015_09_03_07_world.sql
	sql/updates/world/2015_09_03_08_world.sql
	sql/updates/world/2015_09_03_09_world.sql
	sql/updates/world/2015_09_03_10_world.sql
	sql/updates/world/2015_09_03_11_world.sql
	sql/updates/world/2015_09_04_00_world.sql
	sql/updates/world/2015_09_04_01_world.sql
	sql/updates/world/2015_09_04_02_world.sql
	sql/updates/world/2015_09_04_03_world.sql
	sql/updates/world/2015_09_07_00_world.sql
	sql/updates/world/2015_09_07_01_world.sql
	sql/updates/world/2015_09_07_02_world.sql
	sql/updates/world/2015_09_07_03_world.sql
	sql/updates/world/2015_09_07_04_world.sql
	sql/updates/world/2015_09_07_05_world.sql
	sql/updates/world/2015_09_08_00_world.sql
	src/common/Collision/Management/MMapManager.cpp
	src/common/Cryptography/Authentication/AuthCrypt.cpp
	src/common/Cryptography/Authentication/AuthCrypt.h
	src/common/Cryptography/HMACSHA1.cpp
	src/common/Cryptography/HMACSHA1.h
	src/server/CMakeLists.txt
	src/server/collision/CMakeLists.txt
	src/server/game/CMakeLists.txt
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.cpp
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_cheat.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
 2015-09-15 20:42:34 +02:00
jackpoz 16e9882aa8 Core/Dungeon Finder: Improve ".lfg queue debug" command 
Log roles of every combinations in ".lfg queue debug" output
 2015-09-05 17:08:37 +02:00
treeston a83437af3d Script/BoreanTundra: Fix dialog and final waypoint for quest 11570: "Escape from the Winterfin Caverns" 
This fixes the following bugs:

Escortee NPC quotes are out of order (see #15396 (comment))
Final escort waypoint is located incorrectly and causes the escorted NPC to drop all the way to the bottom of the ocean before quest completion is awarded.

Closes #15396

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2015-09-02 02:02:34 +01:00
Incorrect 3748dddaa4 Core/Scripts: Remove duplicate code 2015-08-30 05:24:32 +03:00
joschiwald 05429b3593 Scripts/BWL: cleanup instancescript 2015-08-29 18:20:59 +02:00
joschiwald 2b21fbb58e Scripts/Ulduar: fixed sara get killed by guardians of yogg saron 2015-08-29 16:24:06 +02:00
duhow 558ce7d877 Scripts/Commands: Add taxinodes cheat status to 
* Some cleanup

Closes #15065
 2015-08-26 21:47:47 +02:00
StormBytePP 5406f82044 Scripts/VioletHold: Fix correct boss erekem repeat time interval 
Updates coverity issue #1318019
 2015-08-25 13:24:27 +02:00
jackpoz 95bae7143f Scripts/VioletHold: Fix issue reported by static analysis 
Coverity defect IDs: 1318019
 2015-08-24 22:37:59 +02:00
jackpoz f50df72820 Scripts/VioletHold: Fix crash in Xevozz boss fight 
Fix crash happening during Xevozz boss fight caused by passing a local list by reference to a lambda expression
Closes #15345
 2015-08-24 14:52:18 +02:00
StormBytePP 405f823f68 Core/BuildSystem: Merged crypto and gitrevision into common, cleaned include directory lists (to mimic 6.x buildsystem) 2015-08-24 03:38:54 +02:00
StormBytePP 3a4f54197c Scripts/Build: Fixed noPCH compile 2015-08-23 16:43:44 +02:00
joschiwald df21162fe4 Scripts/VioletHold: rewrote the whole instance 
thanks @MitchesD for help
 2015-08-23 14:43:11 +02:00
StormBytePP 68e6c95f16 Core/Scripts: Fix noPCH compile 2015-08-22 21:05:37 +02:00
Nyeriah b28849003c Scripts/OnyxiasLair: Force Onyxia to enter evade mode if pulled out of her room 2015-08-22 00:14:46 -03:00
Nyeriah 8b27b61978 Scripts\MoltenCore: Disable Ragnaros' combat movement 2015-08-21 23:20:45 -03:00
Nyeriah fe07614916 Scripts/TheEye: Update Kael'thas Sunstrider's script 
Closes #4180
Closes #4181
Closes #8479
Updates #1885
 2015-08-21 22:57:29 -03:00
jackpoz 5e1722c2f4 Script/Commands: Add new "debug loadcells" command 
Closes #15292
 2015-08-21 22:54:59 +02:00
joschiwald 30fc4f9f63 Scripts/Ulduar: fixed hodir kill credit 
Closes #15303
 2015-08-17 23:27:42 +02:00
StormBytePP 0cc3d883e1 Core/Build: Renamed Revision.h to GitRevision.h to avoid compile failure when old revision.h file is present 2015-08-16 23:08:01 +02:00
jackpoz 2f92a2f58e Scripts/Misc: Replace some unsafe WorldObject* class members in scripts with ObjectGuid 
Replace some unsafe WorldObject* class members and derived types in scripts with ObjectGuid.
Code cleanup.
 2015-08-16 22:29:56 +02:00
StormBytePP 1f66d719f2 Core/BuildSystem: Merge collision, debugging, threading, utilities and configuration into "common" which does not depend on shared anymore and moved database out of shared library 
These changes enables to build tools only without even having MySQL installed
 2015-08-16 21:23:15 +02:00
Shauren 222eaccc51 Build fix for WheatyExceptionReport, c++ exceptions must not be thrown in SEH handlers 2015-08-16 18:08:03 +02:00
StormBytePP 94f69fb1bc Core/Build: Removed obsolete SystemConfig.h and made genrev be part of shared library, which allows cache hits to happen more likely 2015-08-16 17:15:38 +02:00
joschiwald c1e3fdc826 Merge pull request #15156 from LuqJensen/Ice-barrier 
Core/Spells: Fix Shattered Barrier triggering on dispel
 2015-08-15 20:02:46 +02:00
Carbenium 52043d7b5f Core/Scripts: Added some missing overrides 2015-08-12 22:17:47 +02:00
Carbenium 99ab531e76 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2015_07_29_00_world.sql
	sql/updates/world/2015_07_29_01_world.sql
	sql/updates/world/2015_08_01_00_world.sql
	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_pet.cpp
 2015-08-12 21:05:39 +02:00
jackpoz ea4d9c0d9e Core/Misc: Remove unneeded ToCreature() casts 
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet(), IsTotem(), IsSummon(), IsGuardian(), IsHunterPet() and IsVehicle() from Creature to Unit
 2015-08-12 14:05:14 +02:00
jackpoz d243630acf Core/Misc: Remove unneeded ToCreature() casts 
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet() from Creature to Unit
 2015-08-12 12:48:33 +02:00
jackpoz 5f0f152345 Scripts/Misc: Fix possible crash 
Fix possible NULL-dereference exception happening in PlayerOrPet checks used in Ulduar and Temple Of Ahn Qiraj
 2015-08-12 12:43:59 +02:00
Aokromes 5ceb04ed47 Core/Misc: 3.3.5a fixes 2015-08-11 12:59:11 +02:00
David Carlos Manuelda e3c3b8f08f Core/Misc: Added some missing overrides 2015-08-11 12:44:35 +02:00
jackpoz eb2e8f873a Merge pull request #15058 from Golrag/rorface 
Scripts/Rotface: Fix Ooze flood targets.

Fixes #15031
 2015-08-09 18:35:17 +02:00
Aokromes 1b57196b4e Core/Misc: 3.3.5a fixes 2015-08-09 10:50:16 +02:00
Unholychick 226a737233 [3.3.5] Core/Spells: Fix Shattered Barrier triggering on dispel 
Prevents Shattered Barrier talent from triggering when Ice Barrier is dispelled. It should only trigger when Ice Barrier is removed by damage(destroyed).
Closes #14555
Closes #14605
 2015-08-08 22:11:07 +02:00
jackpoz efc4c60c53 Scripts/Kalimdor: Remove unused script 
Remove unused C++ script replaced by d69a31d238
 2015-08-08 19:36:41 +02:00
Aokromes f791d23dc7 Core/Misc: Remove duplicate code 2015-08-02 03:13:35 +02:00
Aokromes d39b762d88 Core/Misc: 3.3.5a fixes 2015-08-02 03:06:49 +02:00
LuqJensen 59fe55dfc9 Scripts/Spells: Fix Rapid Recuperation 
Closes #15180
 2015-08-01 17:21:42 +02:00
Kittnz b42cf8755b Core/Script: Fix Corporal Keeshan 2015-08-01 13:53:32 +02:00
Kittnz 93ca42759d Core/Script: Set Faction at start of escort for Corporal Keeshan 
Request by DRJ
 2015-08-01 13:38:10 +02:00
Warpten 80ec3e1515 Scripts/RubySanctum: Widen random angles for meteor flames. 
Don't QQ because "OMG you're not testing any of your stuff", I can't build TC atm.

Memo: Meteor Flames have
```
[12] UNIT_CREATED_BY_SPELL: 74689/1.046616E-40
```

which isn't in DBCs, exists, but is not seen in sniffs.
(cherry picked from commit 0dc6ea161dce755a702f2e26d93ca2a1f46a903f)
 2015-07-28 20:36:21 -03:00
Aokromes 9684d48d1d Core/Script: Newline 2015-07-28 06:54:07 +02:00
Aokromes cbe178881c Core/Scripts: Typo fix 2015-07-28 06:21:47 +02:00
Warpten ef93d1174d Scripts/RubySanctum: Fixed Meteor Flames 
(cherry picked from commit 982b59d2ec280fa4eebfc95aa526b5d0b9f8675e)

Update boss_halion.cpp
(cherry picked from commit 50c23bbcb869f52d6102f3bb0192bada9da521a1)
 2015-07-27 17:37:28 -03:00
Aokromes 7473269899 Core/Scripts: More 3.3.5a fixes 2015-07-27 22:17:48 +02:00
Aokromes c80c77ff71 Core/Misc: Fix some warnings 2015-07-27 09:52:04 +02:00
Carbenium 81ae7c4eb6 Fix build after merge 2015-07-26 16:52:59 +02:00
Carbenium 86eb651757 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_07_14_00_world.sql
	sql/updates/world/2015_07_14_01_world_335.sql
	sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
	sql/updates/world/2015_07_19_05_world.sql
	sql/updates/world/2015_07_21_00_world.sql
	sql/updates/world/2015_07_24_00_world.sql
	sql/updates/world/2015_07_24_01_world.sql
	sql/updates/world/2015_07_24_02_world.sql
	sql/updates/world/2015_07_24_03_world.sql
	sql/updates/world/2015_07_24_04_world.sql
	sql/updates/world/2015_07_24_05_world.sql
	sql/updates/world/2015_07_25_03_world.sql
	sql/updates/world/2015_07_25_04_world.sql
	src/server/collision/Management/MMapManager.cpp
	src/server/collision/Management/MMapManager.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/Utilities/Util.cpp
 2015-07-26 16:52:35 +02:00