Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,460 Commits 4 Branches 146 Tags
6885eb4f2c7cf8941d4018b36a0b522e77092504
Commit Graph

807 Commits

Author SHA1 Message Date
DDuarte
6885eb4f2c Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-07 19:36:33 +01:00
jackpoz
df7f188cfe Core/Misc: Refactor scripts to fix static analysis warnings 
Fourth batch of fixes targeting 100 issues reported by Coverity
 2014-09-07 20:12:54 +02:00
Nyeriah
62cfca23ce Core/Misc: Meh some white lines, an addition to last sql's comment and a spotted typo 2014-09-07 14:29:04 -03:00
Nyeriah
93a01b6d50 Scripts/AV: Balinda Stonehearth 
- Updated to EventMaps
- Removed manual spawning of Water Elemental by using proper spell
* The Water Elemental has a duration, it'll despawn once it's over. She'll resummon it during the encounter if it dies or disappears.
* Fixes it's level scalling with owner.
- Moved Water Elemental AI to database.
- Script update
** Patch 3.1.0 (14-Apr-2009): Now casts Ice Block.
 2014-09-07 14:20:26 -03:00
MitchesD
17be840d4d Scripts/ScarletMonastery: fix typo caused by copy-paste 2014-09-07 18:47:25 +02:00
MitchesD
46930876e2 Scripts/ScarletMonastery: Interrogator Vishas updated to BossAI and EventMap 2014-09-07 18:43:58 +02:00
Nyeriah
2dc45fafe6 Scripts/Stratholme: Move Freed Soul AI to database and a small addition 
- They should follow players until they despawn
 2014-09-07 01:08:42 -03:00
Vincent-Michael
c7e1eae2ce Core: Remove again whitespace (meh :/) 2014-09-07 04:06:50 +02:00
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
Nyeriah
25f75501ef Scripts/Scholomance: 
- Updated Ras Frostwhisper to EventMaps
- Updated Vectus to EventMaps
 2014-09-06 15:37:46 -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
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
Vincent-Michael
bbe58b2862 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-05 18:26:56 +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
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
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
d698d28a31 Scripts/SWP: Update M'uru script to EventMaps/BossAI 2014-09-03 04:22:29 -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
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
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
Vincent-Michael
06daf22e1e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/scripts/Commands/cs_guild.cpp
 2014-08-29 21:18:23 +02:00
joschiwald
01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Vincent-Michael
3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
 2014-08-28 21:00:53 +02:00
Vincent-Michael
eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
DDuarte
430b3adfe8 Scripts: Correct despawn time of multiple objects 
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
 2014-08-26 13:37:55 +01:00
Vincent-Michael
98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2014-08-24 16:33:29 +02:00
Vincent-Michael
79b954a349 Core: meh, remove again whitespace :( 2014-08-24 02:46:14 +02:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.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/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren
42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
 2014-08-21 23:59:00 +02:00
Shauren
4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.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/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.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.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.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/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
MitchesD
e80a19a0f1 Scripts/ScarletMonastery: rewritten InstanceScript and some bosses converted to BossAI and eventmap 2014-08-10 23:14:39 +02:00
jackpoz
8402570bb8 Scripts/Misc: Fix static analysis issues 
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
 2014-08-09 00:12:20 +02:00
Vincent-Michael
fad2bd4f92 Core: Kill AGAIN whitespace :( 2014-08-07 07:19:06 +02:00
Vincent-Michael
eb8e140f7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-31 18:01:28 +02:00
Dr-J
9253ff7cb7 Update CMakeLists.txt 2014-07-31 00:29:54 +01:00
Dr-J
5418844f15 Delete zone_eversong_woods.cpp 2014-07-31 00:24:08 +01:00
Dr-J
5b311690d1 Remove Script from zone_eversong_woods.cpp 
This cpp is now currently redundant
 2014-07-31 00:12:33 +01:00
Vincent-Michael
a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-07-30 22:26:59 +02:00
Dr-J
3199f2ba90 Remove Script from zone_eversong_woods.cpp 
Remove Apprentice Mirvedas script from eversong woods cpp scripts as is not longer required.
 2014-07-30 13:45:42 +01:00
DDuarte
cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
Ergar
40c5737200 Scripts/Karazhan: Boss Maiden of Virtue - rewrite to events and timer adjustments 
Closes #12513 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:58:39 +01:00