Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
25,517 Commits 2 Branches 1 Tag
230db1a5f595f20f96bbd46a0d63fccc3ef16e34
Commit Graph
19669 Commits
Author SHA1 Message Date
Carbenium 230db1a5f5 Fix merge 2015-07-21 21:28:39 +02:00
Carbenium 9d3b94f7f2 Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4 
Conflicts:
	sql/updates/world/2015_01_09_01_world.sql
	sql/updates/world/2015_01_18_00_world.sql
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/tools/CMakeLists.txt
 2015-07-21 21:21:09 +02:00
Carbenium 7bb3d51383 Fix merge fail 2015-07-21 21:13:55 +02:00
Carbenium 3447276d4f Merge commit 'f3e86d3e686b8f7e29f55b884f6c8cb226ee1598' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	doc/UnixInstall.txt
	src/server/game/Accounts/RBAC.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/Commands/cs_mmaps.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
	src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
	src/server/shared/Cryptography/Authentication/AuthCrypt.h
	src/server/shared/Cryptography/HMACSHA1.cpp
	src/server/shared/Cryptography/HMACSHA1.h
	src/server/shared/Packets/WorldPacket.h
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/mesh_extractor/ADT.cpp
	src/tools/mesh_extractor/ADT.h
	src/tools/mesh_extractor/CMakeLists.txt
	src/tools/mesh_extractor/Cache.h
	src/tools/mesh_extractor/Chunk.cpp
	src/tools/mesh_extractor/Chunk.h
	src/tools/mesh_extractor/ChunkedData.cpp
	src/tools/mesh_extractor/ChunkedData.h
	src/tools/mesh_extractor/Constants.h
	src/tools/mesh_extractor/ContinentBuilder.cpp
	src/tools/mesh_extractor/ContinentBuilder.h
	src/tools/mesh_extractor/DBC.cpp
	src/tools/mesh_extractor/DBC.h
	src/tools/mesh_extractor/DoodadHandler.cpp
	src/tools/mesh_extractor/DoodadHandler.h
	src/tools/mesh_extractor/Geometry.cpp
	src/tools/mesh_extractor/Geometry.h
	src/tools/mesh_extractor/LiquidHandler.cpp
	src/tools/mesh_extractor/LiquidHandler.h
	src/tools/mesh_extractor/MPQ.cpp
	src/tools/mesh_extractor/MPQ.h
	src/tools/mesh_extractor/MPQManager.cpp
	src/tools/mesh_extractor/MPQManager.h
	src/tools/mesh_extractor/MapChunk.cpp
	src/tools/mesh_extractor/MapChunk.h
	src/tools/mesh_extractor/MeshExtractor.cpp
	src/tools/mesh_extractor/Model.cpp
	src/tools/mesh_extractor/Model.h
	src/tools/mesh_extractor/ObjectDataHandler.cpp
	src/tools/mesh_extractor/ObjectDataHandler.h
	src/tools/mesh_extractor/TileBuilder.cpp
	src/tools/mesh_extractor/TileBuilder.h
	src/tools/mesh_extractor/Utils.cpp
	src/tools/mesh_extractor/Utils.h
	src/tools/mesh_extractor/WDT.cpp
	src/tools/mesh_extractor/WDT.h
	src/tools/mesh_extractor/WorldModelGroup.cpp
	src/tools/mesh_extractor/WorldModelGroup.h
	src/tools/mesh_extractor/WorldModelHandler.cpp
	src/tools/mesh_extractor/WorldModelHandler.h
	src/tools/mesh_extractor/WorldModelRoot.cpp
	src/tools/mesh_extractor/WorldModelRoot.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2015-07-21 20:58:09 +02:00
Carbenium b9c871fdb7 Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4 
Conflicts:
	sql/updates/world/2014_12_30_00_world.sql
	sql/updates/world/2014_12_30_01_world.sql
	src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
 2015-07-21 20:45:16 +02:00
Carbenium 2530db5a51 Fix merge 2015-07-21 20:40:21 +02:00
Carbenium 79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium e17af4b098 Fix merge fail 2015-07-21 19:11:36 +02:00
Carbenium c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Carbenium fc13ce42df Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4 
Conflicts:
	sql/updates/world/2014_11_05_00_world.sql
 2015-07-21 18:53:04 +02:00
Carbenium 8d47083319 Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
 2015-07-21 18:51:30 +02:00
Carbenium 1940583e36 Fix merge error 2015-07-21 18:38:49 +02:00
Carbenium 68fd138476 Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 2015-07-21 18:30:05 +02:00
Carbenium 9f1d71a53f Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2015-07-21 18:22:27 +02:00
Carbenium 63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_21_00_world.sql
 2015-07-21 18:17:08 +02:00
Carbenium 38027226ff Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
 2015-07-21 18:04:43 +02:00
Carbenium 1350a08ee4 Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4 2015-07-21 17:54:19 +02:00
Aokromes 1c0cf6021b DB/Misc: Other branches fixes 2015-07-19 23:02:24 +02:00
Aokromes 88cbf569a2 Fix another typo 2015-07-19 20:37:25 +02:00
Aokromes 8164d51071 Fix typo 2015-07-19 20:33:59 +02:00
Aokromes d3fec662dd DB/World: Backport schema changes from 6.x branch (renames) 2015-07-19 20:01:43 +02:00
Aokromes 5775457fb4 Fix Compile 2015-07-19 18:42:24 +02:00
Aokromes 586f08a923 Tools: Remove mesh_extractor, missed stage 2015-07-19 14:18:20 +02:00
Aokromes 5e6cd5a6f7 Tools: Remove mesh_extractor 
mesh_extractor is not ready for production
 2015-07-19 14:13:38 +02:00
Aokromes 7680c90abd Update (C) date 2015-07-19 13:37:44 +02:00
Your Name dc9c3362ab Core/Players: Fix being able to water walk after being revived 
By IvanVojtko, closes #10950, closes #11323
 2015-07-19 10:19:23 +02:00
Nyeriah c4ad70e7f4 Scripts/Stonecore: Prevent Slabhide from dying during air phase 2015-04-24 14:11:13 -03:00
Northstrider b5393d4b9b Core/Creatures: remove virtual mounts from creatures on death 
Closes https://github.com/TrinityCore/TrinityCore/pull/14396
 2015-04-19 14:56:54 +02:00
MitchesD a3a7d65c20 Core/SAI: fix typo 
(cherry picked from commit 9ed21eb5b176986dd73c2a467e665fe449499155)
 2015-04-02 21:28:44 +02:00
Rat 037fd1b1bb Core/Phases: backported 6.x phase fixes 2015-04-02 20:32:09 +02:00
MitchesD 1103f0889d Core/SmartScripts: added SMART_ACTION_SET_COUNTER and SMART_EVENT_COUNTER_SET 
as per request of DB developers

(cherry picked from commit 23b1c042adbe3a460457aa11f017c90e6600bfa2)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScript.h
 2015-04-02 18:52:19 +02:00
Rushor 5ebf89ce16 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation 
closes #12165

(cherry picked from commit 6080234e98)
 2015-03-25 16:35:15 +01:00
AriDEV f4a83fc08a Server/Entities: Should Fix Compile Error Under GCC 4.8+ 
Signed-off-by: AriDEV <aridev666@gmail.com>
 2015-03-15 21:08:27 +01:00
Shauren 8460c40c6f Core/DataStores: Corrected field names in SpellPowerEntry 2015-03-08 13:16:30 +01:00
Duarte Duarte a324ee8a22 Typo 2015-02-22 06:06:58 +00:00
Shauren 6cc38ad7d2 Core/Spells: Restored totem category check 
Revert "Core/Totems: In cata totem items are no longer needed"

This reverts commit 45e0cae7be

(cherry picked from commit ea9eccae8596d440c372b0d9709d4def4b46e648)

Conflicts:
	src/server/game/Entities/Item/ItemPrototype.h
 2015-02-22 06:06:34 +00:00
Gooyeth b68768e984 Core/Spells: Correction Stuck effect (4.3.4) 
The player dies if heathstone is in cooldown, else the player is teleported to home.

Thanks @F03SD and @Kinzcool.
 2015-01-27 14:01:45 -06:00
Gooyeth 3d49285c39 Core/Spells: Update Stuck effect 4.3.4 
The stuck effect in Cataclysm and MoP the player dies, in WoD the player is teleported to home.

Closes #13939
 2015-01-26 20:23:08 +00:00
Hristo Bogdanov 0b8a86886b Core/Creatures: No gray aggro config 
(Custom) Adds option to disable aggro from gray creatures when the players are above/below certain levels.

Closes #13919
 2015-01-26 19:44:58 +00:00
Duarte Duarte ed158c9c1b Merge pull request #13893 from Unholychick/3.3.5 
Core/Spells: Use BonusAmount for periodic damage
 2015-01-26 19:01:16 +00:00
Nayd 2ed0af7d75 Fix typo in CMakeLists.txt 2015-01-25 15:26:30 +00:00
Nayd 48f6e341d5 Tools: Remove mesh_extractor 
mesh_extractor is not ready for production and it will be developed
in a different branch

(cherry picked from commit a87442be68da4e2ea51a10e3bd8a07ef7b9765b2)

Conflicts:
	src/tools/mesh_extractor/ContinentBuilder.h
	src/tools/mesh_extractor/DBC.cpp
 2015-01-25 15:22:33 +00:00
Nyeriah 9bd7b0e571 Scripts/SunwellPlateau: Correct a summon group entry and misc clean up 2015-01-18 23:05:18 -02:00
Nyeriah 866eff64aa Scripts/HellfireRamparts: Add a missing reset call and correct spawn masks for Reinforced Fel Iron Chests 
Thanks to @ariel- for noticing the missing _Reset();

Closes #13747
 2015-01-18 20:56:05 -02:00
click 48fa7fa992 Core: Make core build without PCH enabled. 2015-01-18 02:07:25 +01:00
Unholychick 03a5d6d0c9 Core/Spells: Use BonusAmount for periodic damage 
Closes #13887
 2015-01-16 23:23:51 +01:00
joschiwald 81f1e03a5a Core/Spells: fixed Shatter crit chance modifier 
Closes #13885
 2015-01-11 12:28:18 +01:00
MitchesD f94cfc6577 Scripts/Misc: some random changes after recent commits and cleanup 2015-01-10 22:58:03 +01:00
Rushor db849e7fcc Scripts/Stratholme: Move Maleki the Pallid to Eventmaps 
Closes #13871
 2015-01-10 05:19:59 +00:00
Nyeriah 0baa4deb3f Scripts/HellfireRamparts: Clean up a forgotten no longer used variable 2015-01-10 03:02:26 -02:00