Nyeriah
c585ce5b3c
Core/Misc: Clear some outdated SD2 notes from recently modified scripts
2014-09-06 22:51:59 -03:00
Nyeriah
8379f0f470
Scripts/Scholomance: Kormok
...
- Updated to EventMaps
- Replaced some hacks to summon adds with proper spells, but there might be still missing stuff
2014-09-06 22:45:36 -03:00
Vincent-Michael
feeb6d4e83
Core: Fix build
2014-09-07 02:35:17 +02:00
Vincent-Michael
1c3715f95a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2014-09-07 02:27:57 +02:00
joschiwald
ef9b4aea5e
Core/InstanceScript: refactored load and save methods
2014-09-07 00:42:14 +02:00
DDuarte
1f6066c6e3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
2014-09-06 22:03:20 +01:00
jackpoz
29b9e5f0d5
Scripts/Commands: Fix issues reported by static analysis
...
Fix possible buffer overflow in ".server shutdown" and NULL-dereference/Triggered Debug Assert.
2014-09-06 20:43:08 +02:00
Nyeriah
25f75501ef
Scripts/Scholomance:
...
- Updated Ras Frostwhisper to EventMaps
- Updated Vectus to EventMaps
2014-09-06 15:37:46 -03:00
Vincent-Michael
76f1d5f221
SQL: Rename SQL after recent PR merge
2014-09-06 03:09:33 +02:00
Nyeriah
3b987c4a89
Scripts/Commands: Move instance command strings to database
2014-09-05 21:59:58 -03:00
Vincent-Michael
fe99efd6fa
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Events/childrens_week.cpp
src/server/scripts/Kalimdor/boss_azuregos.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_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
2014-09-06 02:41:45 +02:00
Duarte Duarte
4e9a976829
Merge pull request #13008 from mik1893/onyxia
...
Scripts/Onyxia Lair: small rework
2014-09-05 21:55:29 +01:00
Duarte Duarte
88045921a4
Merge pull request #13016 from Odyssey/pinfo
...
Scripts/Commands: Move cs_misc.cpp command output hardcoded strings to DB
2014-09-05 21:52:49 +01:00
Duarte Duarte
36f7cfbd04
Merge pull request #13039 from Nyeriah/pr-cmd
...
Core/Tickets: Send global GM system messages on ticket complete
2014-09-05 21:51:52 +01:00
jackpoz
6df2ff5efa
Core/Misc: Refactor scripts to fix static analysis warnings
...
Third batch of fixes targeting 100 issues reported by Coverity
2014-09-05 22:44:24 +02:00
Nyeriah
8b9726514f
Scripts/Auchindoun: Updates Pandemonius to EventMaps/BossAI
2014-09-05 14:41:13 -03:00
Vincent-Michael
bbe58b2862
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-05 18:26:56 +02:00
Odyssey
5efd2579e5
Scripts/Commands: Move cs_misc command output hardcoded strings to DB so they can be localized too
2014-09-05 12:42:08 +02:00
Nyeriah
b7f5080c9b
Scripts/Scholomance: Jandice Barov
...
- Updated to EventMaps
- Removed hack to spawn illusions
- Moved Illusion's script to SAI
- Corrected Illusion's unit_flags
2014-09-04 22:50:26 -03:00
Dr-J
2c24865b7a
Remove CPP script for Oronok Torn-heart
2014-09-04 23:09:56 +01:00
MitchesD
680f90f37e
Scripts/BF: The Maker rewritten to EventMap
2014-09-04 21:04:51 +02:00
Vincent-Michael
267a9a17ba
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-04 20:09:09 +02:00
joschiwald
5ad8dcc5d6
Core/Misc:
...
- fixed an oracle/wolvar reputation change issue
- moved texts of read pronouncement to db
Closes #9105
2014-09-04 19:42:37 +02:00
mik1893
87ed5de7e6
Scripts/Onyxia Lair: small rework
...
- fix crash on boss death
- avoid abusing during phase switch
- added better facing through trigger
- corrected some timers
- corrected inhabit type
- cleanup and inheriting some BossAI functionalities instead of custom stuff
2014-09-04 18:08:09 +02:00
Nyeriah
816c8c1c7a
Scripts/Black Temple: Updates Najentus to BossAI and slight changes
2014-09-04 03:18:34 -03:00
Nyeriah
efccf18632
Scripts/Black Temple: Supremus to BossAI and slight changes
2014-09-04 02:11:52 -03:00
Vincent-Michael
ecb317c300
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.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_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/zone_hinterlands.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
2014-09-04 06:41:51 +02:00
Nyeriah
d4049e62a3
Scripts/Blood Furnace: Update Broggok's script to EventMaps
2014-09-04 00:25:49 -03:00
Nyeriah
014adaa0fd
Core/Tickets: Send global GM system messages on ticket complete
2014-09-03 17:25:36 -03:00
jackpoz
53d3becf3c
Core/Misc: Refactor scripts to fix static analysis warnings
2014-09-03 22:11:41 +02:00
Vincent-Michael
20bbdcbde9
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-03 17:54:45 +02:00
Nyeriah
94ef426968
Core/Misc: Kill a white line from last commit and a small change to last sql
2014-09-03 05:04:02 -03:00
Nyeriah
8e165771f1
Merge pull request #13020 from Nyeriah/wip-muru
...
Scripts/SWP: Update M'uru script to EventMaps/BossAI
2014-09-03 04:42:14 -03:00
Nyeriah
d698d28a31
Scripts/SWP: Update M'uru script to EventMaps/BossAI
2014-09-03 04:22:29 -03:00
Nyeriah
fb63c8e915
Scripts/Black Temple: Update Mother Shahraz to EventMaps
2014-09-03 03:55:53 -03:00
Vincent-Michael
8a97243728
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-01 09:19:57 +02:00
Duarte Duarte
c565d8566f
Merge pull request #13004 from Nyeriah/pr-cmd
...
Scripts/Commands: Fix up logic at group join command, so it doesn't retu...
2014-09-01 03:46:30 +01:00
Nyeriah
a151105a69
Scripts/Commands: Fix up logic at group join command, so it doesn't return full group error when it actually isn't full
2014-08-31 23:43:36 -03:00
Dr-J
0332b7dbe0
Remove CPP Script
...
Remove Greatmother Geyah's CPP Script
2014-09-01 03:22:19 +01:00
DDuarte
d5c0aeaa18
Scripts/Commands: Replace regex usage
...
Sorry for the shitty C code but std::regex is not supported by GCC 4.7 and 4.8
2014-09-01 03:03:26 +01:00
jackpoz
dd4dbdcd16
Core/Misc: Refactor scripts to fix static analysis warnings
...
First batch of fixes targeting 100 issues reported by Coverity
2014-08-31 20:42:02 +02:00
joschiwald
681cf8f27c
Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests
2014-08-31 20:33:46 +02:00
joschiwald
c671b8e04b
Merge pull request #12992 from Nyeriah/patch-uk
...
Scripts/UtgardeKeep: Update Skarvald & Dalronn scripts to EventMaps
2014-08-31 20:09:56 +02:00
joschiwald
251e283008
Merge pull request #12978 from Nyeriah/patch-auchi
...
Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
2014-08-31 19:58:06 +02:00
Nyeriah
50b8ee22c7
Scripts/UtgardeKeep: Update Skarvald & Dalronn scripts to EventMaps
...
* Simplified creature_texts enum that was sort of confusing
* Removed hack to spawn ghosts using the proper spells
2014-08-31 14:56:52 -03:00
Nyeriah
04cfcf523d
Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
...
Codestyle
Missing include
2014-08-30 18:43:50 -03:00
Vincent-Michael
56e0459b07
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-08-30 16:36:24 +02:00
DDuarte
2086ba46cf
Scripts/Commands: Add optional reason to server shutdown/restart commands
...
Display a "reason" ingame in the server shutdown ingame messages
Fix multiple typos in the .server idlerestart/idleshutdown/restart/shutdown commands
Closes #2671
2014-08-30 14:07:52 +01:00
Vincent-Michael
f89739dab5
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-08-30 05:03:47 +02:00
joschiwald
831a6603d4
Core/Battleground/AV: convert trinity_strings to proper creature_text
...
Closes #12861
2014-08-30 03:34:35 +02:00