Commit Graph
6624 Commits
Author SHA1 Message Date
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
Unholychick 0d5a0c81a8 Scripts/Ulduar: Fix a visual issue with Mimirons Rocket Strike
In p2 he should fire left or right rocket at random, not always left one. ref https://www.youtube.com/watch?v=oY-nZ0EjDRw

Fix Mimiron DB target attacking players.
2015-07-26 03:30:29 +02:00
joschiwald 8a9f1b871a Scripts/Ulduar: fixed freya loot and added missing conditions
thanks @Keader

Closes #15098
2015-07-25 15:28:39 +02:00
Warpten a82e55f684 Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames. 2015-07-24 17:11:30 +02:00
Shauren caf808163d Misc: Removed tabs
(cherry picked from commit 4e83094354551b2b7efe40053cb57286b96c861b)
2015-07-24 12:05:14 +01:00
Gacko 73fd4fb49c Fix non pch build.
(cherry picked from commit 49a6f7b7bd9fb87ece479636e9aaccf3ea02e6da)
2015-07-24 11:52:28 +01:00
Shauren b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
Vincent-Michael 5c5533c355 Core: Remove whitespaces
(cherry picked from commit 5705555f1f9a259f2d4d52980ccb68d1b909b7a2)

Conflicts:
	src/server/game/Server/Packets/TicketPackets.h
2015-07-24 11:35:34 +01:00
Carbenium aaf3f090ea Fix build 2015-07-24 01:49:34 +02:00
Carbenium 293658fb13 Merge branch '3.3.5' into 4.3.4
Conflicts:
	.gitattributes
	dep/PackageList.txt
	sql/base/characters_database.sql
	sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
	sql/updates/world/2015_07_01_03_world_335.sql
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
Carbenium 86c34de614 Merge commit '718c238524e5d9bc4d43c56c4870c78af794f520' into 4.3.4
Conflicts:
	dep/PackageList.txt
	dep/libmpq/AUTHORS
	dep/libmpq/FAQ
	dep/libmpq/README
	dep/libmpq/THANKS
	dep/libmpq/bindings/d/mpq.d
	dep/libmpq/bindings/python/mpq.py
	dep/libmpq/configure.ac
	dep/libmpq/debian/control
	dep/libmpq/debian/copyright
	dep/libmpq/doc/man1/libmpq-config.1
	dep/libmpq/doc/man3/Makefile.am
	dep/libmpq/doc/man3/libmpq.3
	dep/libmpq/doc/man3/libmpq__archive_close.3
	dep/libmpq/doc/man3/libmpq__archive_files.3
	dep/libmpq/doc/man3/libmpq__archive_offset.3
	dep/libmpq/doc/man3/libmpq__archive_open.3
	dep/libmpq/doc/man3/libmpq__archive_size_packed.3
	dep/libmpq/doc/man3/libmpq__archive_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__archive_version.3
	dep/libmpq/doc/man3/libmpq__block_close_offset.3
	dep/libmpq/doc/man3/libmpq__block_open_offset.3
	dep/libmpq/doc/man3/libmpq__block_read.3
	dep/libmpq/doc/man3/libmpq__block_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__file_blocks.3
	dep/libmpq/doc/man3/libmpq__file_compressed.3
	dep/libmpq/doc/man3/libmpq__file_encrypted.3
	dep/libmpq/doc/man3/libmpq__file_imploded.3
	dep/libmpq/doc/man3/libmpq__file_number.3
	dep/libmpq/doc/man3/libmpq__file_offset.3
	dep/libmpq/doc/man3/libmpq__file_read.3
	dep/libmpq/doc/man3/libmpq__file_size_packed.3
	dep/libmpq/doc/man3/libmpq__file_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__strerror.3
	dep/libmpq/doc/man3/libmpq__version.3
	dep/libmpq/libmpq/Makefile.am
	dep/libmpq/libmpq/common.c
	dep/libmpq/libmpq/common.h
	dep/libmpq/libmpq/explode.c
	dep/libmpq/libmpq/explode.h
	dep/libmpq/libmpq/extract.c
	dep/libmpq/libmpq/extract.h
	dep/libmpq/libmpq/huffman.c
	dep/libmpq/libmpq/huffman.h
	dep/libmpq/libmpq/mpq-internal.h
	dep/libmpq/libmpq/mpq.c
	dep/libmpq/libmpq/mpq.h
	dep/libmpq/libmpq/pack_begin.h
	dep/libmpq/libmpq/pack_end.h
	dep/libmpq/libmpq/platform.h
	dep/libmpq/libmpq/wave.c
	dep/libmpq/libmpq/wave.h
	dep/libmpq/tools/crypt_buf_gen.c
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2015-07-22 02:13:10 +02:00
Carbenium 6dfaec3d97 Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4
Conflicts:
	.gitattributes
	CONTRIBUTING.md
	sql/updates/world/2015_05_11_04_world.sql
	sql/updates/world/2015_05_27_00_world.sql
	sql/updates/world/2015_05_27_01_world.sql
	sql/updates/world/2015_06_06_01_world_335.sql
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	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/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_rogue.cpp
2015-07-22 02:09:32 +02:00
Carbenium 82ea8da720 Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
Conflicts:
	.travis.yml
	README.md
	sql/updates/world/2015_04_18_00_world.sql
	sql/updates/world/2015_04_18_05_world_335.sql
	sql/updates/world/2015_04_26_03_world_335.sql
	sql/updates/world/2015_05_09_00_world_335.sql
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellInfo.cpp
2015-07-22 01:33:48 +02:00
Carbenium 224c7dc6ae Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4
Conflicts:
	README.md
	sql/updates/world/2015_04_04_00_world.sql
	sql/updates/world/2015_04_04_01_world.sql
	sql/updates/world/2015_04_05_06_world_335.sql
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_account.cpp
	src/tools/map_extractor/System.cpp
	src/tools/vmap4_extractor/adtfile.cpp
2015-07-22 00:54:34 +02:00
Carbenium 963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
2015-07-22 00:37:27 +02:00
Carbenium fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
2015-07-22 00:26:09 +02:00