nelegalno
7524e2dfda
Scripts/WesternPlaguelands: Fix conditions to show gossip of Myranda the Hag (In Dreams quest)
...
Ref #7519
Signed-off-by: DDuarte <dnpd.dd@gmail.com >
2014-07-24 03:25:33 +01:00
Vincent-Michael
8bc519a308
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-23 06:32:44 +02:00
jackpoz
3388587b7a
Core/Misc: Replace rand() calls with SFMT
2014-07-22 21:43:19 +02:00
DDuarte
01d9681a4d
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
2014-07-22 13:15:36 +01:00
Vincent-Michael
4e29cf74b3
Scripts/EasternKingdoms: Burn with fire (hihi)
2014-07-20 19:44:26 +02:00
Vincent-Michael
e68d3b0937
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
2014-07-20 03:06:03 +02:00
MitchesD
6fdcefee31
Scripts/MagistersTerrace: reworked Selin Fireheart
...
* removed ancient code
* converted to EventMap
* removed illogical method in instance script
2014-07-19 22:18:41 +02:00
Shauren
909acdbac3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSocket.h
src/server/authserver/Server/RealmAcceptor.h
src/server/game/Accounts/AccountMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Cryptography/BigNumber.h
src/server/worldserver/RemoteAccess/RASocket.cpp
src/server/worldserver/worldserver.conf.dist
2014-07-19 03:51:11 +02:00
Shauren
7532864264
Buildsystem/MSVC: Warning fixes
...
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Subv
dfdc19f3bc
Merge branch master into boost
...
Conflicts:
BattlegroundMgr.h
2014-07-13 16:52:38 -05:00
Vincent-Michael
1bc482d3d6
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Spells/spell_paladin.cpp
2014-07-12 00:24:23 +02:00
Vincent-Michael
c8e75073bf
Scripts/Misc: Fix some warnings vs2014 ctp (no support)
2014-07-11 20:24:55 +02:00
Vincent-Michael
4f619eb937
Core/LFG: Fix warning with vs2014 ctp (no support)
2014-07-11 17:04:01 +02:00
Vincent-Michael
495ca8c2dc
Scripts/Misc: Fix some warnings with vs2014 ctp (no support)
2014-07-11 16:39:44 +02:00
Aokromes
900fb17229
Merge pull request #12417 from gerripeach/remove_old_boss
...
Core/Scripts: Remove script from old boss
2014-07-09 08:36:58 +02:00
Vincent-Michael
7462fa63fd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-07-08 00:14:53 +02:00
karn
4e346f3ca5
Scripts/ScarletMonastery: Boss Arcanist Doan - rewrite to events
...
Closes #12418
2014-07-07 16:48:53 +02:00
Vincent-Michael
9799a88c8d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-07-07 09:58:43 +02:00
Shauren
408b490851
Scripts/Magister's Terrace: Fixed typo in SetEncounterState
2014-07-06 00:01:24 +02:00
karn
6c895ad692
Core/Scripts: Remove script from old boss
...
http://www.wowwiki.com/Highlord_Kruul
This creature was part of a bc event. he is no longer part of the game
2014-07-02 00:55:40 +02:00
Vincent-Michael
f3de6f0284
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-27 19:39:23 +02:00
joschiwald
52023b1e6b
Scripts/MagistersTerrace: fix possible crash
2014-06-27 18:45:49 +02:00
Vincent-Michael
f94fe58f78
Script/MagistersTerrace: Fix fail in 27f2855248
2014-06-26 23:16:56 +02:00
Vincent-Michael
27f2855248
Core: Fix warnings and kill again whitespace ...
2014-06-26 22:50:06 +02:00
joschiwald
32d2e25556
Merge pull request #12364 from MitchesD/misc_2
...
Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues ...
2014-06-26 22:28:51 +02:00
MitchesD
6ebb64892f
Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues on boss Vexallus
...
* removed old hacks and added missing auras
* Vexallus converted to EventMap
2014-06-26 22:25:24 +02:00
Vincent-Michael
50cf908d78
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/World/World.h
2014-06-25 19:51:27 +02:00
Kittnz
80e0c443ff
Quest: Powering our Defenses fixed
...
Fix by @Discover-, @untaught, @Kittnz
2014-06-24 18:23:37 +02:00
Kinzcool
34572492dd
Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-06-18 23:25:57 -04:00
Vincent-Michael
26dd770b8e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/shared/Utilities/Util.cpp
2014-06-15 19:36:30 +02:00
MitchesD
86b3298a47
Scripts/Misc: random fixes
2014-06-14 17:48:47 +02:00
Subv
f71abd173e
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases
2014-06-07 20:27:23 -05:00
Vincent-Michael
73e90f6241
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-08 01:21:17 +02:00
Vincent-Michael
1d39db16b9
Core/Misc: Kill Whitespace ...
2014-06-07 23:58:08 +02:00
Vincent-Michael
1f62d9c387
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/ItemHandler.cpp
src/server/scripts/Spells/spell_dk.cpp
2014-06-07 23:40:37 +02:00
aletuna
1b3149b07f
Scripts/Blackrock Depths: Converted to eventmap+minor coding style changes
...
Closes #11730
2014-06-07 19:02:39 +02:00
Subv
2086f18f7b
Core/Phases: Removed more SetPhaseMask uses
2014-06-05 13:05:29 -05:00
Subv
558642b26e
Core/Phases: Removed some phasemask handling, more to come
2014-06-02 17:43:59 -05:00
Kinzcool
edced30576
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-06-01 13:42:07 -04:00
Gacko
8ef34535a4
Scripts: Remove unused variables (kept as comment)
2014-06-01 19:34:34 +02:00
Michael
15efe08a60
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
2014-05-25 21:52:27 +02:00
jackpoz
f091713086
Core/Misc: Fix typo
...
Fix typos about the word "Resurrect"
2014-05-24 18:25:53 +02:00
Vincent-Michael
49a17c6282
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.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/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
2014-05-22 20:53:13 +02:00
jackpoz
1083dbb993
Core/Misc: Remove Unit::Get* wrappers for ObjectAccessor::Get*
2014-05-20 21:21:33 +02:00
Vincent-Michael
ef5bc9c70a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
2014-05-18 19:40:30 +02:00
Shauren
f9c7bb4171
Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."
...
Visual studio does not support constexpr
Made semicolon after "Prepare*Script" mandatory - workaround for dumb IDEs inserting extra indentation level after newline
2014-05-18 12:50:10 +02:00
Praetonus
f296095191
Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.
...
-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.
Two minor changes in addition :
-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
2014-05-15 21:32:47 +02:00
Trisjdc
593fb9b68a
Scripts/SWP: Sathrovarr will no longer cause player teleports on grid load
2014-05-13 11:32:56 +01:00
Vincent-Michael
37d2777f27
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-09 17:20:39 +02:00
MitchesD
eabec73d98
Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fixed some issues there
2014-05-09 16:59:55 +02:00