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,662 Commits 4 Branches 146 Tags
8e288dd6731ed608d8285f9f966783ee9b46eebf
Commit Graph

24662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dr-J
55ecd1c913 DB/Misc: Queen Angerboda 
Fixes script for the Slumbering King.

Closes #10247
 2014-09-18 01:06:27 +01:00
joschiwald
0e877e784d forgotten to click save :( 2014-09-18 00:44:48 +02:00
joschiwald
60176157a7 Scripts/Gundrak: cleanup InstanceScript 
* converted Gal'Darah and Moorabi to BossAI
* add and correct some texts
* fixed altar activation spell visual
 2014-09-18 00:38:28 +02:00
joschiwald
b08dcb1d99 Core/Scripts: implemented a guid map in InstanceScript, this way you can easier store guids and access its objects 2014-09-18 00:25:05 +02:00
joschiwald
053beae172 Core/Spells: consider spell speed in SPELL_EFFECT_CHARGE 
Misc: removed some duplicate guid words in logs
 2014-09-17 23:24:31 +02:00
Shauren
e57a63939e Core/NetworkIO: Fixed queued packets not being properly sent causing players to be stuck during loading 
Closes #13120
 2014-09-17 23:06:34 +02:00
Dr-J
86f9b1d3e2 DB/Quest: Matis the Cruel 
Script this quest,

* One line is not proper text and thus no broadcast text id, the proper text is same line but with $n instead of npc name but on tc this gets filled by player name which for this text is not the right behaviour
* Know Matis gets up again after been captured, same happens on retail did not mean to replicate that bug but managed too.
 2014-09-17 21:31:42 +01:00
MitchesD
763a21d376 Merge pull request #13159 from ShinDarth/335_fix2 
Corrected grammar of some strings
 2014-09-17 19:29:21 +02:00
ShinDarth
1a068659b6 Core/Grammar: corrected grammar of some strings 2014-09-17 19:03:15 +02:00
Duarte Duarte
048e043d0d Merge pull request #13154 from Unholychick/casts 
Core/Spells: Fix some -Wconversion warnings
 2014-09-17 16:09:18 +01:00
Vincent-Michael
7db99ca007 Core: Fix warnings 2014-09-17 16:58:08 +02:00
DDuarte
af7daba02d Core/SAI: Remove SMART_ACTION_STORE_VARIABLE_DECIMAL 
It's not used.
 2014-09-17 01:07:29 +01:00
Unholychick
6477e96cca Core/Spells: Fix some -Wconversion warnings 
Attempt to fix #13152 by properly casting between data types during damage calculations.
 2014-09-16 23:56:05 +02:00
Nyeriah
2a262aad21 Scripts/Quest: Script spell for quest "Fumping" 
Updates https://github.com/TrinityCore/TrinityCore/issues/11418
 2014-09-16 17:49:16 -03:00
Shauren
7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
 2014-09-16 21:50:01 +02:00
Vincent-Michael
7cbaa028cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-16 21:09:19 +02:00
Shauren
9b933b4a29 Core/Misc: Removed explicit qualifier from ObjectGuid uint64 conversion operator 2014-09-16 20:57:11 +02:00
Shauren
878073d516 Core/Logging: Fixed incorrect usage of guid in logs 2014-09-16 20:47:08 +02:00
Shauren
bee9a3069b Core/Scripts: Fixed incorrect guid usage in logs 2014-09-16 19:56:33 +02:00
Shauren
6c1a33d62d Core/Scripts: Fixed incorrect guid usage in logs 2014-09-16 19:47:10 +02:00
Dr-J
6810a4469e DB/Misc: DB Stuff for some quests. 
DB Changes for Fumping and A Really Big Worm

Neither of these quests will work until they get cpp support (spell scripts), @Nyeriah is on this believe, she already has spellscript for first now just 2nd is taking a while longer.
 2014-09-16 17:58:30 +01:00
Nyeriah
4e521c1253 SQL: Fix typo at e23814c85b 2014-09-16 11:49:53 -03:00
Nyeriah
e23814c85b DB/Achievement: Set proper map difficulty for achievement "Oh Novos!" 
Closes https://github.com/TrinityCore/TrinityCore/issues/13150
 2014-09-16 11:39:35 -03:00
Shauren
9b316fe689 Core/Scripts: Fixed PCH build 2014-09-16 00:44:56 +02:00