Duarte Duarte
e4c57d839d
TDB 335.53 - 2014/03/29
2014-03-29 04:58:38 +00:00
Duarte Duarte
27d69cfcc8
Core/Chat: Fix BuildChatPacket calls so scripts that use OnPlayerChat can actually change the text
...
Closes #11625
2014-02-18 17:34:41 +00:00
Duarte Duarte
83e0cc3b0c
SQL: Update 2014_01_31_01_world_item_template.sql
2014-01-31 16:35:22 +00:00
Duarte Duarte
5666c7cc35
Core/Achievs: Rename a few unknown achievement criteria flags
...
Source tomrus88, Mangos
2014-01-31 15:43:24 +00:00
Duarte Duarte
ad26d2efc3
SQL: Fixed two issues with 2014_01_31_00_world_spell_custom_attr.sql
...
Engine should be MyISAM and not MRG_MyISAM
MySQL doesn't play nice with hex values so converted them to decimal
Closes #11537
2014-01-31 15:16:02 +00:00
Duarte Duarte
efeb54139e
SQL: Update old .sql files to keep consistency with auth_database.sql
...
Also update characters_database.sql (generated by mysqldump)
2014-01-31 04:34:32 +00:00
Duarte Duarte
d749b72193
Core&DB/Spells: Move custom spell attributes from code to DB, spell_custom_attr table
...
`spell_custom_attr`
- `entry` uint PK
- `attributes` uint (enum SpellCustomAttributes of SpellInfo.h)
2014-01-31 04:32:03 +00:00
Duarte Duarte
d39b36b50f
Tools/VMAP: Fix a logic error in processArgv of vmapexport
2014-01-26 14:29:51 +00:00
Duarte Duarte
d5dbd95197
Merge pull request #11130 from Dekadencee/4.3.4
...
[4.3.4] Fix SMSG_REQUEST_PVP_REWARDS_RESPONSE structure
2014-01-15 07:01:18 -08:00
Duarte Duarte
80a398372d
Core/Player: Fix compile error introduced in ##11377 merge
2014-01-13 16:50:07 +00:00
Duarte Duarte
949dc9bf16
Merge pull request #11377 from Yelvann/master
...
Core/Instances: Fix exploit too much players in instances/raids
2014-01-13 08:33:29 -08:00
Duarte Duarte
0eadb41ed1
Merge pull request #11310 from Ric101/can_quest_reward
...
Core/Players: On CanRewardQuest, use the same item dest vector for all potential rewards
Solves issues where the player has enough bag space for each item individually, but not all of them together.
Example to reproduce previous issue:
Obtain Battle of the Crimson Watch (10781)
Make sure you only have 1 slot available in your inventory
Turn in the quest, watch as you don't receive one of the rewards
2014-01-11 16:21:41 -08:00
Duarte Duarte
65c941b88d
Merge pull request #11342 from Carbenium/Svala
...
Scripting/Utgarde Pinnaccle: Fix visual during Svala's transformation
2014-01-11 16:20:16 -08:00
DDuarte
b204d71cb4
Core: Fix build due to merge resolution errors
2014-01-11 23:29:27 +00:00
Duarte Duarte
e42cc9d5dd
Merge pull request #11426 from Dehravor/invalidate-player
...
Core/Entities: Implement SMSG_INVALIDATE_PLAYER
2014-01-11 12:47:12 -08:00
Duarte Duarte
c9d81bd0c2
Merge pull request #11427 from Dehravor/force-rename
...
Core/Entities: Don't allow to login while character is forced to rename
2014-01-11 12:33:04 -08:00
DDuarte
ced89d7c68
Merge branch 'master' into 4.3.4
2014-01-11 17:27:41 +00:00
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
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
Nay
0177d1c4d4
Merge pull request #10822 from jackpoz/collisions_nullterm_string
...
Tools/VMAP: Fix not null terminated string
2013-09-15 07:01:58 -07:00
Nay
478ec28e6d
Merge pull request #10823 from jackpoz/icewall_overflow
...
Scripts/HoR: Fix possible array overflow
2013-09-15 06:58:24 -07:00
Nay
99f5a6c3d6
Core/BGs: Fix a TC_LOG_ERROR call
2013-09-15 14:57:12 +01:00
Nay
b72fd4c209
Merge pull request #10819 from Ascathor/master
...
Core/Misc: Fixed some more issues found by static code analysis tools.
2013-09-15 04:31:29 -07:00
Nay
4df862dd4c
Merge pull request #10792 from Ascathor/master
...
Core/Command: Fixing .account password to no longer crash
2013-09-12 07:50:07 -07:00
Nay
38f5c916cf
Core: Fix non PCH build
2013-09-11 20:58:49 +01:00
Nay
e4ed64a6b7
Merge pull request #10782 from Ascathor/master
...
Core/Commands: Fixing some problems with .account email
2013-09-11 11:55:31 -07:00
Nay
72d15086b2
Merge pull request #10776 from xjose93/ArenaTeamLogs
...
Core/ArenaTeam: Add teamnames to logs.
2013-09-11 11:52:51 -07:00
Nay
deb2fb7939
Merge pull request #10781 from jackpoz/create_pet_creaturetemplate
...
Scripts/Commands: Retrieve Creature template in HandlePetCreateCommand f...
2013-09-11 11:52:03 -07:00
Nay
9ca34c2e02
Merge pull request #10779 from jackpoz/murmur_unused_field
...
Scripts/Murmur: Remove unused field
2013-09-11 11:51:29 -07:00
Nay
38391cd774
Merge pull request #10737 from jackpoz/clock_fix
...
Core/Timer: Better handle system clock changes
2013-09-11 11:50:50 -07:00
Nay
baa159dbd4
Merge pull request #10736 from jackpoz/localtime_race_condition
...
Core/Thread: Fix race condition converting time values to local time
2013-09-11 11:50:18 -07:00
Nay
6d3ebe925f
SQL: Update sql/base/auth_database.sql
2013-09-10 23:21:27 +01:00
Nay
d5d0802262
Merge pull request #10718 from jackpoz/console_fix
...
Core/Command Line: Fix memory leak
2013-09-04 13:56:33 -07:00
Nay
9b92bc9409
Core: Fix compile with PCH enabled and warnings
...
Few corrections to worldserver.conf
2013-09-02 16:18:55 +01:00
Nay
28f9317698
Core/RBAC: Move cast and characters commands to RBAC (using individual permissions)
2013-09-02 13:25:07 +01:00
Nay
69a0800cb7
Merge pull request #10696 from jackpoz/socket_race_condition
...
Core/Socket: Fix race condition in WorldSocket
2013-09-01 15:52:57 -07:00
Nay
68b447b24c
Merge pull request #10563 from Ascathor/master
...
Core/Account: Make account password change security variable and various changes
2013-09-01 15:52:13 -07:00
Nay
cd11366690
Merge pull request #10694 from jackpoz/loopcounter_race_condition
...
Core/Thread: Fix race condition in FreezeDetectorRunnable
2013-09-01 10:05:39 -07:00
Nay
582686090d
Merge pull request #10685 from Discover-/SmartAI-Target-Casting
...
Core/SmartAI: Add a spellid to SMART_EVENT_TARGET_CASTING. If left on 0,...
2013-09-01 10:03:45 -07:00
Nay
c4bd91ceb9
Merge pull request #10690 from Discover-/SmartAI-Set-Home-Pos
...
Core/SAI: Allow using SMART_ACTION_SET_HOME_POS with multiple target typ...
2013-09-01 10:03:09 -07:00
Nay
b324646005
Merge pull request #10689 from Discover-/SmartAI-Killed-Monster-Credit
...
Core/SAI: Also use loot recipient for SMART_ACTION_CALL_KILLEDMONSTER wh...
2013-09-01 10:02:43 -07:00
Nay
a762df0aba
Core/SAI: Fix processing linked events when return is used in ProcessAction
...
Thanks Discover-
Closes #10688
2013-09-01 18:01:59 +01:00
Nay
271a1011ca
Dep/G3D: Fix encoding of G3D-v8.0_hotfix8.diff
2013-09-01 17:50:48 +01:00
Nay
6f9099c0fb
Merge pull request #10693 from Chaplain/g3d-typos
...
Dep/G3D: Fix a typo in Vector3int32 += operator
2013-09-01 09:41:45 -07:00
Nay
cdc71659e7
DB/TrinityString: Fix an issue with non-ascii characters encoding
...
Thanks Warpten for the fix (always import files with mysql --default-char-set=utf8 < file)
Thanks eragon for reporting the issue and testing the fix
2013-09-01 14:19:45 +01:00
Nay
8dfb977cc6
Dep/G3D: Update Readme.txt
2013-09-01 13:37:57 +01:00
Nay
1bbd726e88
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2013-08-31 22:48:01 +01:00
Nay
0394238a29
Dep/G3D: Fix a typo in Matrix4 == operator
2013-08-31 22:44:10 +01:00
Nay
16fcac1991
Core/RBAC: Move bf commands to RBAC (using individual permissions)
2013-08-31 21:02:14 +01:00
Nay
2d93059114
SQL: Fix a typo in e375c6075b
2013-08-31 12:45:44 +01:00
Nay
7ecf4fdec1
Core/Quests: Split Flags and SpecialFlags
2013-08-30 23:08:40 +02:00
Nay
7776016106
Core/Quests: Remove CastedCreatureOrGO method
...
- Remove EAI's ACTION_T_CAST_EVENT and ACTION_T_CAST_EVENT_ALL
- Remove SAI's SMART_ACTION_CALL_CASTEDCREATUREORGO
- Split QUEST_TRINITY_FLAGS_KILL_OR_CAST into QUEST_TRINITY_FLAGS_KILL and QUEST_TRINITY_FLAGS_CAST
- Assign QUEST_TRINITY_FLAGS_CAST to all the quests that were using RequiredSpellCastX
- (unrelated) Fix a warning in Player.cpp
- Replace CastedCreatureOrGO usage in scripts by KilledMonsterCredit
TODO: Convert the two EAI scripts commented out in the .sql to proper SAI
Closes #10667
2013-08-30 19:32:08 +01:00
Nay
aa5bc37e9c
Core: Yet more warning fixes
2013-08-30 16:03:37 +01:00
Nay
1903d4ca7d
Core/Server: Fix a spammy warning in WorldSession and move code to .cpp
2013-08-30 15:44:17 +01:00
Nay
d805a2dc0e
SQLS: Rename wrong named sql file
2013-08-30 14:09:21 +01:00
Nay
ec837b1d7d
Merge pull request #10666 from xjose93/SmartScripts-StartEvent
...
Implement SMART_ACTION_GAME_EVENT_STOP (111) and SMART_ACTION_GAME_EVENT_START (112).
2013-08-29 16:36:42 -07:00
Nay
3b71172e8a
Core/Quests: Fix a typo in a previous commit
...
Closes #10664
2013-08-29 16:01:48 +01:00
Nay
62d1ee680b
Core/Quests: Drop world.quest_template.RequiredSpellCastX
...
These were non-wdb fields that didn't have much use.
Most quests that were using these fields (not many) should still work,
however, if you find any quest that worked before and is now broken
please report it in the issue tracker and it will be promptly fixed.
2013-08-29 15:36:38 +01:00
Nay
577e320809
DB/Schema: Fix typo in reputation_reward_rate.quest_repeatable_rate name
2013-08-28 16:31:43 +01:00
Nay
83e5168a5b
DB/Reputation: Reward 3x reputation for Sporegar on repeteable quests
...
Closes #5789
2013-08-28 15:15:14 +01:00
Nay
7135abf3a0
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2013-08-27 23:56:34 +01:00
Nay
78786c7b54
Core&Scripts: Fix clang compiler warnings
2013-08-27 23:47:03 +01:00
Nay
e5dc70118a
Server/Collision: Fix build on clang
2013-08-27 19:34:03 +01:00
Nay
14d80d269d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Globals/ObjectMgr.cpp
2013-08-27 16:10:11 +01:00
Nay
cc14e18664
Core/Misc: Fix compiler warnings
2013-08-27 16:06:18 +01:00
Nay
2050a36b58
SAI & Scripts: Fix unitialized values found by Valgrind
...
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3031: boss_skarvald_the_constructor::boss_skarvald_the_constructorAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:217)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3948: boss_dalronn_the_controller::boss_dalronn_the_controllerAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:388)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x15E2FCC: SmartScript::ProcessAction(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:144)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D242: npc_shadron::npc_shadronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1122)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19AE913: boss_ymiron::boss_ymironAI::UpdateAI(unsigned int) (boss_ymiron.cpp:215)
==3064== Use of uninitialised value of size 8
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191CE88: npc_tenebron::npc_tenebronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1027)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D5B8: npc_vesperon::npc_vesperonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1220)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x1868F59: boss_lady_vashj::boss_lady_vashjAI::Reset() (boss_lady_vashj.cpp:206)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191C14C: dummy_dragonAI::MovementInform(unsigned int, unsigned int) (boss_sartharion.cpp:802)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x1046986: Position::NormalizeOrientation(float) (Object.h:388)
...
==3064== by 0x17D9463: boss_malchezaar::boss_malchezaarAI::SummonInfernal(unsigned int) (boss_prince_malchezaar.cpp:373)
2013-08-26 16:13:26 +01:00
Nay
9327832896
Merge pull request #10633 from jackpoz/createguild_fix
...
Core/Guild: Fix uninitialized value on guild creation
2013-08-26 05:27:31 -07:00
Nay
b2134dbbe3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
2013-08-26 12:40:41 +01:00
Nay
8eaf763235
Core&Tools: Fix multiple issues found by a static code coverage tool
2013-08-26 02:00:18 +01:00
Nay
d9a136fd58
Scripts/Commands: Revert changes to cs_debug; fixes build
2013-08-25 14:38:48 +01:00
Nay
2c35479847
Merge remote-tracking branch 'origin/master' into 4.3.4
2013-08-25 14:36:56 +01:00
Nay
3e2f037b20
Core&Tools: Fix warnings and non-pch build
2013-08-25 14:27:40 +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
Nay
12973de799
Core&Tools: Fix multiple issues found by a static code coverage tool
2013-08-24 22:57:22 +01:00
Nay
573c919c5b
Merge pull request #10617 from jackpoz/updatemask_fix
...
Fix uninitialized UpdateMask field
2013-08-24 09:12:49 -07:00
Nay
58e6503eef
Core/Settings: Fix build in non cpp11 compilers
...
std::string back() was only introduced in C++11, a pity..
2013-08-24 15:45:19 +01:00
Nay
cc3055f344
Core/Settings: Fix a crash if worldserver.conf DataDir setting is empty
2013-08-24 14:30:17 +01:00
Nay
0d5181af4d
Merge pull request #10559 from Discover-/Taxi-Benchmarking
...
Core/Misc: Implement CMSG_SET_TAXI_BENCHMARK_MODE to toggle PLAYER_FLAGS...
2013-08-23 17:57:21 -07:00
Nay
a0a377a0ce
Scripts: Fix two issues found by Valgrind
...
==3400== Invalid write of size 8
==3400== at 0x1241C32: instance_ahnkahet::GetInstanceScript(InstanceMap*) const (instance_ahnkahet.cpp:54)
...
==3400== Conditional jump or move depends on uninitialised value(s)
==3400== at 0xB5DEAE: std::tr1::_Hashtable<unsigned long, std::pair<unsigned long const, Creature*>, std::allocator<std::pair<unsigned long const, Creature*> >, std::_Select1st<std::pair<unsigned long const, Creature*> >, std::equal_to<unsigned long>, std::tr1::hash<unsigned long>, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::_M_find_node(std::tr1::__detail::_Hash_node<std::pair<unsigned long const, Creature*>, false>*, unsigned long const&, unsigned long) const (hashtable.h:830)
==3400== by 0xBDA4CA: std::tr1::_Hashtable<unsigned long, std::pair<unsigned long const, Creature*>, std::allocator<std::pair<unsigned long const, Creature*> >, std::_Select1st<std::pair<unsigned long const, Creature*> >, std::equal_to<unsigned long>, std::tr1::hash<unsigned long>, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::find(unsigned long const&) (hashtable.h:698)
==3400== by 0xBDA5BF: HashMapHolder<Creature>::Find(unsigned long) (ObjectAccessor.h:67)
==3400== by 0xCB5C03: Map::GetCreature(unsigned long) (ObjectAccessor.h:114)
==3400== by 0xB6E6EF: Unit::GetCreature(WorldObject&, unsigned long) (Unit.cpp:13023)
==3400== by 0x10F0790: boss_hydross_the_unstable::boss_hydross_the_unstableAI::Reset() (boss_hydross_the_unstable.cpp:164)
2013-08-24 01:54:37 +01:00
Nay
556c478e68
Tools: Fix compiler warnings
2013-08-23 20:42:22 +01:00
Nay
0d44191a83
Scripts/BH: Fix non pch build - trial 2
2013-08-23 19:39:11 +01:00
Nay
9490fa5f4c
Scripts/BH: Fix non pch build
2013-08-23 19:32:25 +01:00
Nay
5ebe71712f
Dependencies/bzip: Remove bzip2.c and bzip2recover.c, they are not required
...
Fixes "warning LNK4006: _main already defined in bzip2recover.obj; second definition ignored"
2013-08-11 20:08:33 +01: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
Nay
d0bde02b21
Core/CreatureAI: Do not remove clone_caster auras on evade (in addition to control_vehicle auras)
2013-08-11 15:52:23 +01:00
Nay
54d2b73f3c
Merge pull request #10513 from Discover-/SmartAI-Casted-CreatureOrGo
...
Core/SmartAI: Drop support for SMART_ACTION_SEND_CASTCREATUREORGO. It is...
2013-08-11 06:26:52 -07:00
Nay
8b08fba98d
Merge pull request #10501 from Discover-/SmartAI-Action-Set-Power
...
Core/SmartAI: Implement MART_ACTION_SET_POWER, SMART_ACTION_ADD_POWER and SMART_ACTION_REMOVE_POWER (param1 = powertype, para...
2013-08-10 12:39:32 -07:00
Nay
181a3cad00
Merge pull request #10511 from MitchesD/Mobs
...
DB/SAI: Draktharon Keep mobs
2013-08-10 11:05:48 -07:00
Nay
1c35bad513
Core/Chat: Fix a compile warning, locale is no longer used
2013-08-10 17:59:47 +01:00
Nay
482720da50
Core/BattlegroundAV: Fix team variable type, "if (team == ALLIANCE)" would always return false
...
Ref 33f8c3ead4da07ff024a94b5e8cf0d05c2ebc23a#L4R1626
2013-08-10 17:35:23 +01:00
Nay
b33f80aa18
Scripts/Pet: Fix non pch compile
2013-08-10 16:00:58 +01:00
Nay
b7d88a3c46
Merge pull request #9817 from drskull/master
...
Core/Spell add another condition in AnyGroupedUnitInObjectRangeCheck
2013-08-09 08:46:19 -07:00
Nay
eba8c2d345
Merge pull request #10464 from Discover-/SmartAI-Set-Active
...
Core/SmartAI: Allow SMART_ACTION_SET_ACTIVE to take a parameter for on/o...
2013-08-09 08:44:56 -07:00
Nay
edf77a4cf6
Merge pull request #10493 from Discover-/SmartAI-Action-Sound-Update
...
Core/SmartAI: Rename SMART_ACTION_SOUND's parameters and get rid of an e...
2013-08-09 08:38:09 -07:00
Nay
32c8555e1e
DB/NPCs: Remove AIName from npcs that do not have EAI or SAI scripts
...
Closes #10483
2013-08-09 14:21:34 +01:00