Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,686 Commits 4 Branches 146 Tags
f767aef12eaf2e55deed89590eb9e8a39b0d1653
Commit Graph

24686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
f767aef12e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp
 2014-09-20 22:39:37 +02:00
Malcrom
72d08a146f DB/Misc: Add missing creature spawns to Invasion Point, Shadowmoon Valley with pathing 2014-09-20 17:11:20 -02:30
jackpoz
b5e3535dbf Core/Misc: Refactor scripts to fix static analysis warnings 
Sixth batch of fixes targeting 100 issues reported by Coverity
 2014-09-20 20:21:54 +02:00
Malcrom
53dbab809f DB/Gameobject: Properly spawn Deathforged Infernals in Shadowmoon Vally 2014-09-20 15:25:31 -02:30
Malcrom
0cb1050dbf DB/Creature: Some Shadowmoon missing spawns 2014-09-20 15:11:56 -02:30
joschiwald
54c195bee8 Core/Spells: fixed Intervade 
Closes #13171
 2014-09-20 19:15:37 +02:00
Shauren
d87c23cdaf Core/Achievements: Fixed realm first kill achievement restrictions - now only the first group will be able to complete it 
Closes #2957
 2014-09-20 19:07:39 +02:00
Aokromes
b5cd540758 Update and rename 2014_09_20_0_world_creature.sql to 2014_09_20_00_world_creature.sql 2014-09-20 16:42:34 +02:00
Malcrom
57dd465d9e DB/Creature: Stormpeak Wyrm proper respawntime 2014-09-20 12:03:55 -02:30
Shauren
8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.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/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.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_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
Shauren
16ecf9ec5d Core/Guilds: Fixed guild rank delete framexml event params 2014-09-20 10:47:14 +02:00
Nyeriah
2c2d3a8ffc Scripts/Auchindoun: Darkweaver Syth 
- Despawn minions on death/reset
- Misc clean up
 2014-09-20 02:58:08 -03:00
Malcrom
cabaf3eb5b DB/Misc: Add pathing for Fjorn. Not 100% but scripting is hard when you have to do it in a roundabout way. 2014-09-20 01:49:47 -02:30
Malcrom
79766854e0 DB/Pathing: Pathing for existing Son of Corok. Some spawns missing, will correct in another push. 2014-09-20 01:22:11 -02:30
Vincent-Michael
3b87ab4536 Revert "Core: Fix build for msvc14" 
This reverts commit bd522a3853.

Meh -.-
 2014-09-20 05:51:37 +02:00
Vincent-Michael
bd522a3853 Core: Fix build for msvc14 2014-09-20 05:39:26 +02:00
Malcrom
4e951f9d9b DB/Pathing: Pathing for Creteus 2014-09-19 23:09:16 -02:30
Malcrom
0b3cb10f1d DB/Misc: Redo some fixups for Dun Neffelem 2014-09-19 22:15:36 -02:30
Malcrom
9922efaa6a DB/Misc: Misc fixes 2014-09-19 21:39:53 -02:30
Malcrom
b620797b80 DB/Misc: Cosmetic fixups for Dun Neffelem 2014-09-19 20:19:00 -02:30
joschiwald
ac3623b316 Kill new compile warnings 2014-09-20 00:43:45 +02:00
joschiwald
bbd13945f6 Fixed sql fail 2014-09-20 00:29:12 +02:00
joschiwald
bf37dbfb2a Core/Battlefield/WG: fixed warnings 
Ref #13169
Closes #12714
 2014-09-20 00:26:58 +02:00
ShinDarth
83f82b4a04 Core/ObjectMgr: check creature.orientation and gameobject.orientation range in loading 
Closes #13156
 2014-09-19 22:36:50 +01:00
Malcrom
0f2e63852c DB/Misc: Fix Seething Revenant Entry: 29504 spawns and add two missing paths. 2014-09-19 18:44:09 -02:30
Malcrom
050d56ac21 DB/Misc: Proper spawning and pathing of Stormpeak Wyrm 2014-09-19 16:53:40 -02:30
DDuarte
eeaf7ef6fa Revert "SQL: Update dev/world_database.sql" 
This reverts commit 09f9f3b6b1.

I forgot that world_database.sql should only get updated in TDB releases.
 2014-09-19 18:42:09 +01:00
DDuarte
09f9f3b6b1 SQL: Update dev/world_database.sql 2014-09-19 18:18:18 +01:00
Duarte Duarte
bbd38753f8 Merge pull request #13170 from xjose93/BaninfoCharacter 
Core/Commands: Fix displaying in .baninfo character command.
 2014-09-19 18:16:51 +01:00
xjose93
0d50833d20 Core/Commands: Fix displaying in .baninfo character command. 2014-09-19 18:58:12 +02:00
Dr-J
72dcd95015 DB/Misc: Medical Supplies / Sunhawk Reclaimer 
* Spawn Missing Medical Supplies http://www.wowhead.com/object=181898/medical-supplies
* Script Sunhawk Reclaimer
 2014-09-19 17:20:31 +01:00
Shocker
80f77977f1 Core/Grids: Replace some magic numbers with constants 
(P.S.: That's why! @cs_misc.cpp)
 2014-09-19 18:03:49 +03:00
DDuarte
c678eaa71e Core/MapScripts: Use proper enum value for boss whisper in SCRIPT_COMMAND_TALK 2014-09-19 15:19:53 +01:00
DDuarte
878b7d3811 Core/MapScripts: Use proper source unit in SCRIPT_COMMAND_TALK 
Closes #13161
 2014-09-19 15:04:24 +01:00
Dr-J
d672e78a5b DB/Misc: Various Fixes 
* Noggenfogger Elixir  - Fix by @Rushor Closes #13041
* Sprinkle's Secret Ingredient  - Fix by @Rushor Closes #13040
* Xavian Satyrs - Fix by @Rushor Closes #12965
* Icepaw Bear / Tails up - Closes #13030
 2014-09-19 13:47:25 +01:00
Malcrom
a32d15c4ef Scripting/Tanaris: added a few enums 2014-09-19 01:40:15 -02:30
DDuarte
256ad379dd Oops. 2014-09-19 03:39:57 +01:00
DDuarte
cefcde9ba9 Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code) 2014-09-19 03:30:02 +01:00
joschiwald
e6b7de8c97 Fixed build 2014-09-19 04:20:01 +02:00
Malcrom
bb5becaffc DB/Misc: Some misc fixes for Northrend. Mostly fix flight speed of some npcs. 2014-09-18 23:42:41 -02:30
joschiwald
0f1f7ef401 Core/Misc: multiple changes 
* fixed build
* apply tc codestyle to ObjectGuid class
* fixed warning
 2014-09-19 03:16:59 +02:00
Dr-J
5b363992ff DB/Gossip: Proenitus 
Closes #13165
 2014-09-19 01:48:48 +01:00
Dr-J
3a7fed7346 DB/Misc: More texts 
Howling Fjord again,

also fixes the error from 55ecd1c913
 2014-09-19 01:12:52 +01:00
joschiwald
9d9919f6e0 Core/AreaTriggers: enable areatrigger teleports in battleground 
Closes #11999
 2014-09-19 01:48:35 +02:00
joschiwald
e567ab9597 Core/Texts: added TextRange parameter to creature_text 
Ranges:
0 - Normal (Default)
1 - Area
2 - Zone
3 - Map
4 - World

Ref #13116
 2014-09-18 23:33:59 +02:00
Aokromes
46193d6a14 DB/Creature: Remove disable combat movement from some SAI 
By Malcrom
 2014-09-18 22:50:55 +02:00
jackpoz
08069dfba7 Shared/Logging: Use standard format specifier for size_t 
Use standard format specified PRIuPTR for printing/logging size_t type that can be either uint32_t or uint64_t depending on platform/build configuration
 2014-09-18 21:24:40 +02:00
Shauren
31656c0213 Core/Trade: Fixed enchanting soulbound items in trade 
Closes #12850
 2014-09-18 21:15:39 +02:00
Vincent-Michael
ad49bd5194 SQL: Fix sql import 2014-09-18 06:05:38 +02:00
joschiwald
72ed5bfc93 Core/Misc: changed trinity string id to unsigned and removed obsolete code 2014-09-18 02:36:28 +02:00