Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,709 Commits 4 Branches 146 Tags
cfdf0b2a860249e4a90ee4673a8bd2fba4bc9bda
Commit Graph

5023 Commits

Author SHA1 Message Date
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
Duarte Duarte
abc0380e7f Merge pull request #12953 from Golrag/master 
Scripts/ICC: Fix Mutated Plague.

Closes #12492
 2014-08-29 23:23:53 +01:00
Golrag
96ba36b9ce Scripts/ICC: Fix Mutated Plague. 2014-08-29 22:26:41 +02:00
Vincent-Michael
1dc8a219a3 scripts/Commands: Sync with 4.3.4 branch (meh nayd) 2014-08-29 21:40:07 +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
Shauren
f5115328c5 Merge pull request #12970 from Golrag/marrowgar 
Scripts/ICC: Fixed Impale (Lord Marrowgar)
 2014-08-29 21:12:17 +02:00
Vincent-Michael
e8d0de6778 Scripts/Commands: Added for guild info guild level output 2014-08-29 21:09:06 +02:00
Golrag
6658d41575 Scripts/ICC: Fixed Impale (Lord Marrowgar) 2014-08-29 19:00:11 +02:00
joschiwald
01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Vincent-Michael
9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
 2014-08-29 06:24:08 +02:00
Odyssey
8adde791d8 Scripts/Commands: Implement .guild info command 
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 23:04:52 +01:00
DDuarte
c14283d484 Scripts/Hodir: Initialize variables 
==9458== 1 errors in context 1 of 1:
==9458== Conditional jump or move depends on uninitialised value(s)
==9458==    at 0x1D2857B: boss_hodir::boss_hodirAI::DamageTaken(Unit*, unsigned int&) (boss_hodir.cpp:367)
==9458==    by 0x14A41E9: Unit::DealDamage(Unit*, unsigned int, CleanDamage const*, DamageEffectType, SpellSchoolMask, SpellInfo const*, bool) (Unit.cpp:562)
==9458==    by 0x1ABCEB3: misc_commandscript::HandleDamageCommand(ChatHandler*, char const*) (cs_misc.cpp:2138)
 2014-08-28 22:28:41 +01:00
Unholychick
7c13b383cd Scripts/Ulduar: Implement Mimiron 
Closes #12894
Fixes #7652
Fixes #4736

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 22:04:01 +01:00
Vincent-Michael
80d4647e78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-28 22:13:00 +02:00
jackpoz
9cceb458d9 Merge branch 'Rochet2/ahbot' into master 
Close pull request #12917
 2014-08-28 22:01:58 +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
a52135f276 Core: Remove whitespace 2014-08-27 23:22:16 +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
Duarte Duarte
10dfe19f9c Scripts/BladesEdge: Fix a typo introduced in 430b3ad 
Thanks @Nihilianth
 2014-08-26 15:10:58 +01: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