Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,162 Commits 4 Branches 146 Tags
08003577de2ea70fcbf4410eb889b67023bed700
Commit Graph

22162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DDuarte
08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	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_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.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/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
DDuarte
33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.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/zulaman.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_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.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/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte
352a2682b1 Core&Scripts: Compile fix 2014-01-10 17:23:14 +00:00
joschiwald
41b613186e Core/Battlefield: some codestyle changes 2014-01-10 17:42:08 +01:00
joschiwald
7378baee49 Scripts/PoS/Garfrost: cleanup saronit blocks after death 2014-01-10 17:37:03 +01:00
joschiwald
7ec7fcf78c Core/SAI: drop unneeded code 2014-01-10 17:36:04 +01:00
Duarte Duarte
14512d6abb Core: MSG_NULL_ACTION was renamed to NULL_OPCODE in this branch 
Fix build
 2014-01-10 06:50:59 +00:00
DDuarte
3c9ae378f1 Core/Chat: Fix chat addon packets (languages & prefixes) 2014-01-10 06:30:22 +00:00
DDuarte
25d1be5a75 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.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/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-01-10 06:13:26 +00:00
DDuarte
86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
Kittnz
dc09715312 DB/Spawns: remove duplicate NPCs on Zeppelin from Orgrimmar to Thunder Bluff 
Closes #11420
 2014-01-09 23:44:14 +01:00
joschiwald
6fff9d08b2 Fix build 2014-01-09 23:31:52 +01:00
joschiwald
e80d1f3465 Scripts/BloodFurnace: 
* cleanup InstanceScript
* fix broggok poison cloud

Scripts/Naxxramas/Grobbulus:
* fix poison cloud
* fix mutating injection
 2014-01-09 23:17:02 +01:00
joschiwald
1a5c0ad92f DB/Creature: update more creature templates 2014-01-08 16:12:36 +01:00
joschiwald
2b9234b32a DB: update some creature templates 2014-01-07 00:06:30 +01:00
joschiwald
a60ba240b7 Core/Entities: add some log messages in CheckCreatureTemplate 
* Happy Error Spam
 2014-01-06 20:30:11 +01:00
Shauren
619edff196 Misc: 
* Tools: Fixed a compile warning
* Commands: Fixed npcflag format in .npc info
 2014-01-06 13:53:29 +01:00
Shauren
15cbe5858c Core/Movement: Fixed vehicle passengers disappearing clientside 
Closes #11411
 2014-01-06 13:51:40 +01:00
joschiwald
95f14f921b Scripts/HoS: update Maiden of Grief 2014-01-05 16:47:07 +01:00
Shauren
ad84759d2f Core/Threading: Handle CMSG_ZONEUPDATE only in WorldSession update - changing zones triggers changing chat channels, what is not a thread safe operation 2014-01-05 00:52:10 +01:00
joschiwald
738afccfc1 DB/Spells: correct more spelldifficulty_dbc entries 
* add log message to find wrong entries
 2014-01-05 00:49:54 +01:00
joschiwald
853b9e9c58 DB/Spells: remove duplicate/invalid entries from spelldifficulty_dbc 
* For new entries: use spellid0 as id to avoid conflicts with dbc file
 2014-01-04 23:29:36 +01:00
joschiwald
cd76d32907 Core/Entities: correct creature damage, offhand damage should work too 
* todo: some creatures need dmg_multiplier update in creature_template
 2014-01-04 18:22:06 +01:00
Warpten
ff61e4d79d Scripts/Halion: Fixed Soul Consumption's pull effect. 
Thanks to Winterfell for pointing out the issue.
 2014-01-04 17:48:51 +01:00
jackpoz
1f170c99ef Core/Instances: Fix Instance binding 
Fix players not being bound to instance if the group was disbanded before killing any boss.
Fixes #437
 2014-01-03 18:56:11 +01:00
Shauren
9d6904f03d Core/Vehicles 
* Fixed vehicle orientation on transports
* Fixed exiting vehicles on moving transports
 2014-01-02 14:20:05 +01:00
jackpoz
82181a8622 Core/Loot: Fix Master Loot exploit 
Fix Master Loot exploit allowing any online Player to receive loot.
 2014-01-01 21:42:15 +01:00
Vincent_Michael
e773c9a693 Update more copyright note for 2014. 
I have no excuse for my fail :/
 2014-01-01 18:20:16 +01:00
Shauren
b5e0caaa72 Merge pull request #11394 from Dehravor/guild-create-log 
Core/Guild: Fix an exploit related to CMSG_GUILD_CREATE
 2014-01-01 06:09:14 -08:00
Dehravor
14287326c7 Core/Guild: Fix an exploit related to CMSG_GUILD_CREATE 2014-01-01 13:52:03 +01:00
Vincent_Michael
20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Subv
a63780fd90 Tools/MeshExtractor: Fixed continent meshes, exclude triangles with material 0xFF from the mesh. 2013-12-31 18:03:04 -05:00
Subv
060bc7817f Tools/MeshExtractor: Added some consts 2013-12-31 17:19:18 -05:00
Subv
7b9dbfb1db Tools/MeshExtractor: Fixed a few leaks and added the liquid vertices to the output data. 2013-12-31 16:22:24 -05:00
Subv
31bd3bab3f Tools/MeshExtractor: Fixed a crash when parsing liquid data (Thanks @Cyberium). 
Added some support for other liquid types in the liquid chunks (Namely Magma and Slime)
 2013-12-31 14:11:05 -05:00
jackpoz
0c2f5340cc Core/Quests: Fix crash on startup 
Fix a crash on startup when loading Quest POIs if quest_poi table referenced POIs not in quest_poi_points table, caused by 5de48a67c6 .
Fixes 11390.
 2013-12-31 20:08:11 +01:00
Shauren
fd72065645 Merge pull request #11391 from Nawuko/waypoint-fix 
Core/Waypoints: Revert partly f1a82a578b t...
 2013-12-31 10:43:41 -08:00
Nawuko
3209a32fa4 Core/Waypoints: Revert partly f1a82a578b to fix a crash caused by accessing uninitialized splines 2013-12-31 19:22:10 +01:00
Subv
dffa010f8a Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-12-31 12:57:10 -05:00
Malcrom
0e7805bac9 Db/Classlevelstats: Little fix for base warrior damage. 
I won't be working on this anymore until next year
 2013-12-31 13:52:16 -03:30
Malcrom
3018ff4e6c Core/Creature: Obtain Attack power and base damage from creature_classlevelstats table. 2013-12-31 12:45:56 -03:30
jackpoz
7ccf9b948c Tools/MeshExtractor: Fix warnings 2013-12-31 16:06:56 +01:00
jackpoz
a7c77322eb Tools/MeshExtractor: Fix uninitialized values causing crashes 
Fix uninitialized values causing crashes in the destructor.
 2013-12-31 15:39:47 +01:00
jackpoz
bd57e06caf Tools/MeshExtractor: Store WorldModelGroup references in WorldModelRoot 2013-12-31 15:08:37 +01:00
Shauren
1cdc2e8c2a Core/Movement: Fixed creature movement on transports 2013-12-31 14:12:02 +01:00
Shauren
9a1282aac6 Core/Spells: Fixed movement from SPELL_EFFECT_PULL_TOWARDS_DEST 2013-12-31 13:08:45 +01:00
Subv
91f93feff5 Tools/MeshExtractor: Adjusted some config values and added some testing code. 2013-12-30 23:00:20 -05:00
Malcrom
997d2adb21 DB/classlevelstats: Update mage exp0, exp1, exp2 base damage 2013-12-31 00:05:54 -03:30
Malcrom
ba43e38d6f DB/classlevelstats: Exp1 & Exp2 Paladin base damage. 
Exp1 57 to 60 and 71 to 73 estimated.
Exp2 67 to 70 and 81 to 83 estimated.
 2013-12-30 22:12:34 -03:30
Malcrom
27c58c3ed8 DB/Classlevelstats: Fix damage for Exp0 Paladin Class. 
25, 55, 59, and 61 to 83 are estimated all others are accurate.
 2013-12-30 21:28:39 -03:30