Nay
d9a136fd58
Scripts/Commands: Revert changes to cs_debug; fixes build
2013-08-25 14:38:48 +01:00
Nay
a7527b3b48
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/tools/map_extractor/mpq_libmpq04.h
2013-08-25 14:12:32 +01:00
Shauren
296da5df12
Core/Commands: Improved debug moveflags to also send associated opcodes
2013-08-20 21:16:54 +02:00
Vincent-Michael
f506ee3077
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
2013-08-11 18:37:31 +02:00
Nay
2abaf6224e
Core/Player: Add debug log when SendCanTakeQuestResponse(INVALIDREASON_*) is used
...
Intent is to find broken quest chains
Requested by Aokromes
2013-08-11 16:36:36 +01:00
Vincent-Michael
820f002135
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Miscellaneous/SharedDefines.h
src/server/scripts/Commands/cs_reload.cpp
2013-08-06 10:03:44 +02:00
Nay
a71fcee27d
DB/Schema: Rename _questrelation tables to _queststarter and _involvedrelation to _questender, for creature and gameobject
2013-08-06 00:04:29 +01:00
Vincent-Michael
2f3388828b
Scripts/Commands: Fix compile (v3)
2013-08-06 00:40:14 +02:00
Nay
2bd4049890
Scripts/Commands: Fix compile (v2)
2013-08-05 22:55:06 +01:00
Nay
df6e66555b
Scripts/Commands: Fix compile
2013-08-05 22:41:37 +01:00
Vincent-Michael
2d3fd62aee
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_npc.cpp
2013-08-05 21:15:35 +02:00
Vincent-Michael
d24bb958da
Core: Random changes
2013-08-05 21:13:20 +02:00
Vincent-Michael
f37d0495e1
Core/Commands: Add .npc info more infos for unit_flags
2013-08-05 20:13:04 +02:00
Vincent-Michael
38cddb42ae
Core/Commands: Add .npc info mechanicImmuneMask infos
2013-08-05 20:13:04 +02:00
Vincent-Michael
341dabb423
Core/Commands: Add .npc info more infos for unit_flags
2013-08-05 14:51:42 +02:00
Vincent-Michael
cfe4154376
Core/Commands: Add .npc info mechanicImmuneMask infos
2013-08-04 19:33:42 +02:00
Vincent-Michael
39cce3344c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-08-02 14:41:33 +02:00
Shauren
ac10589eda
Core/Misc: Fixed some issues found by Coverity Scan
2013-08-01 21:31:11 +02:00
Vincent-Michael
d4d43d7410
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Spells/SpellMgr.h
src/server/game/World/World.cpp
2013-07-25 00:41:37 +02:00
joschiwald
c4a1ad2810
Merge pull request #10342 from joschiwald/spellinfo_corrections
...
Core/Spells: operate spell correction on SpellInfo store instead of dbc ...
2013-07-24 15:18:24 -07:00
Ascathor
5a9810ec08
Core/Commands: Added the rank id to .pinfo for guild data
2013-07-24 19:25:36 +02:00
joschiwald
10390465f2
Core/Spells: add some logs for loading spell_script_names
2013-07-24 15:18:42 +02:00
Vincent-Michael
aca68428c2
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
2013-07-23 02:03:35 +02:00
joschiwald
380cf5d241
Core/Misc: replace (Player*) casts with ToPlayer()
2013-07-21 01:38:21 +02:00
Vincent-Michael
d4ac53083f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Globals/ObjectMgr.cpp
2013-07-19 22:33:35 +02:00
Vlad
0b9a8ccef5
Core/Misc: Change creatures and gameobject phasemask from 16 to 32 bits
...
Signed-off-by: Nay <dnpd.dd@gmail.com >
2013-07-19 04:03:40 +01:00
Vincent-Michael
ef8a08ee2c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-07-18 23:16:22 +02:00
Nay
eca90db56b
Scripts/Commands/Arena: Replace a call of GetPlayerNameByGUID by GetCharacterNameData
2013-07-18 21:07:00 +01:00
Vincent-Michael
56bd42dcf1
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-07-15 18:04:04 +02:00
Shauren
779a59e7e2
Core/Config: Refactored ConfigMgr
...
* Loading initial configuration files is now separate from loading any additional custom configs
2013-07-15 17:31:44 +02:00
Vincent-Michael
08c1a81096
Scripted/Misc: Fix random stuff
2013-07-15 01:01:37 +02:00
Nay
b56b282eee
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/QuestHandler.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/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.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_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.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_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/scripts/World/item_scripts.cpp
2013-07-14 16:10:20 +01:00
Nay
d6f3460796
Script/Commands: Fix a crash in .arena captain command
2013-07-13 23:07:01 +01:00
Nay
3561ab98ba
Misc: Use override and final C++11 keywords in a few places (mostly scripts)
...
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not support C++11)
2013-07-06 20:21:45 +01:00
Vincent-Michael
08e2b03b28
Core: Fix warnings
2013-06-29 01:56:44 +02:00
Vincent-Michael
7cc6dfaebc
Core/Commands: Fix crash with .pinfo (thx to Sar777)
2013-06-28 19:35:44 +02:00
Shauren
f517467817
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-06-18 21:04:31 +02:00
kaelima
aa645683b8
Core/MMAPS: Update recastnavigation!
...
* Complete changelog can be found at http://code.google.com/p/recastnavigation/
* Adjusted a few config values
Important:
* New mmaps extraction is required
* Folder size will be increased
2013-06-17 05:11:56 +02:00
Vincent-Michael
87d9d1d705
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/Spells/spell_pet.cpp
src/server/scripts/Spells/spell_shaman.cpp
2013-06-13 19:35:01 +02:00
Malcrom
ec474a62e5
Core: More Function Renaming.
2013-06-11 21:25:12 -02:30
Malcrom
66978cfc3b
Core: Some function renaming.
2013-06-11 19:54:27 -02:30
Malcrom
047608e7de
Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet().
2013-06-11 18:39:51 -02:30
Vincent-Michael
0bebf40fe7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/NPCHandler.cpp
2013-06-11 22:07:11 +02:00
Shauren
9ec22fffa0
Core/Objects: Object scale will now also affect bounding radius and combat reach fields
2013-06-11 17:28:16 +02:00
Vincent-Michael
efb4fb4959
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-06-03 18:19:18 +02:00
Vincent-Michael
f6c1a9a8c4
Core: Fix warning
2013-06-03 18:04:42 +02:00
Subv
1d1bb84cf9
Merge pull request #9854 from Ascathor/master
...
Core/Command: Optimized .pinfo more
2013-06-02 17:52:27 -07:00
Shauren
a50eec9439
Fixed merge errors
2013-05-30 21:23:11 +02:00
Shauren
adb78862da
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_misc.cpp
2013-05-30 20:57:07 +02:00
Spp
9664c0ab5c
Core/Misc: Another batch of fixes for issues found by static analysis
2013-05-30 13:18:29 +02:00