Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 12:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,173 Commits 4 Branches 146 Tags
83de75e31b9d9bafcd2c81d290ada03d22bcf09e
Commit Graph

4963 Commits

Author SHA1 Message Date
sirikfoll
51671ccec9 Core/Scripts Implemented Boss Ahune 
Implemented Midsummer Fire Festival event Boss, Ahune
 2016-05-12 18:53:34 +02:00
sirikfoll
d5f05fcec4 Implement Quest Riding the Red Rocket 2016-05-12 09:23:21 +02:00
asterc
19bc4f63b2 Core/Battleground Script for Isle of Conquest Bosses 
by @gerripeach
 2016-05-12 09:21:56 +02:00
Vincent-Michael
81bfb0007d Core: Fixed warning 
(cherry picked from commit b29005925e)
 2016-05-12 09:20:02 +02:00
Vincent-Michael
d7e103c543 Core/Commands: Cleanup in 0940f3e077 
(cherry picked from commit a3b4c40073)
 2016-05-12 09:19:45 +02:00
Vincent-Michael
3e42602afc Core/Commands: Allowed .server idlerestart / idleshutdown / restart / shutdown to take another parameter structure: 
e.g.:
* .server idlerestart 12d3h13m13s
* .server idleshutdown 46m13s
* .server restart 45h56m
* .server shutdown 323m42s

(cherry picked from commit 0940f3e077)
 2016-05-12 09:19:21 +02:00
Kito
4ce6bd3014 Scripts/Icecrown Citadel: Sindragosa - Ice Tomb should always deal damage to all other ice tombs too 
Closes #7808
Merges #16863
 2016-05-12 09:16:52 +02:00
Trond B Krokli
737d61e9ab Core/Scripts/DB: remove hardcoded text from npc_beaten_corpse (#16907) 
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921

Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
 2016-05-12 09:14:45 +02:00
Duarte Duarte
28caabfdda Scripts/SWP: Remove unused #defines 
(cherry picked from commit 71a7f96e22)
 2016-05-12 09:14:23 +02:00
Shauren
af17e23204 Core/Misc: Fixed -Wmisleading-indentation warnings 
(cherry picked from commit 3ac33163db)

# Conflicts:
#	src/server/game/Server/Protocol/PacketLog.cpp
 2016-05-12 09:10:53 +02:00
joschiwald
42033fd904 Core/Utils: replaced std::random_shuffle with our own implementation using SFMT random generator 2016-05-12 09:07:29 +02:00
Gustavo
a407fddca5 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968) 2016-05-12 08:47:02 +02:00
chaodhib
8a84d7de3e Scripts/Naxxramas: Rework of Gluth 
1) Gluth should be able to eat zombies close to him, one at the time, during the whole fight.
2) Gluth should be able to eat zombies at an accelerated rate after each Decimate.
3) The zombies should put the "Infected Wound" debuff on their auto-attack targets.
4) Zombies should have a normal threat table before decimate and should loose all kind of aggro behavior and walk toward Gluth after decimate.
5) Gluth shouldn't be affected by the decimate damage.
6) Newly poped zombies should have all players in their aggro list as soon as they spawn. So far, they were not moving and were only aggroed by proximity.
7) and several minor fixes (emotes, useless data in db).
 2016-05-12 08:45:44 +02:00
Aokromes
d1e3be8b00 Misc: typo fix 2016-05-12 08:38:01 +02:00
sirikfoll
5ebbfc63b5 Core/Spells Fix Spell Inferno, used by boss Baron Geddon 
This is based on the cmangos fix 7556165b3e

Also correct the spellId of Armageddon spell
 2016-05-12 08:35:21 +02:00
Shauren
a7f68c489a Properly rename the stand state method... 2016-05-12 08:27:48 +02:00
Shauren
a12493fd84 Core/Misc: Renamed getStandState to minimize differences between branches 2016-05-12 08:27:29 +02:00
Kittnz
5c2d8939f4 Pet/Misc: Implement Baby Blizzard Bear 2016-05-12 08:23:16 +02:00
Kito
5430da8e81 Scripts/Spells: Add generic spell to handle ClearDebuffs spell 2016-05-12 08:19:56 +02:00
treeston
32e4388a8c Scripts/Karazhan: Hackfix the Opera event script to make Wizard of Oz actually completable. 
Doing it in script instead of removing the flags from DB because I'm pretty sure that the DB flags are correct and there's some RP event missing before she becomes attackable.
 2016-05-12 08:16:41 +02:00
Aokromes
077bdf3b89 Misc: remove incorrectly readded code 2016-05-12 08:12:30 +02:00
Aokromes
295b152833 Misc: remove useless row 2016-05-12 08:09:32 +02:00
MitchesD
86ed1a8f7b Scripts/TheEye: updated Void Reaver to EventMap 
(cherry picked from commit 8a7ae9d16c)
 2016-05-12 08:05:28 +02:00
joschiwald
8241b71a78 Scripts: Added combat abilities to trash mobs in Ruby Sanctum 
Thx @sirikfoll

SAI by @Keader

Closes #16703
 2016-05-12 08:01:17 +02:00
Aokromes
34d78137e0 Scripts/Commands: Modify .debug anim command to target any selected unit 2016-05-12 00:25:01 +02:00
Keader
27ed37ee39 Fix Living Constellation not activating during Algalon encounter. 2016-05-12 00:18:19 +02:00
Golrag
f98281909f Scripts/Icecrown Citadel: Fixed Sindragosa ice tomb targets 
* Also changed the way NonTankTargetSelector checks who is the tank.
 2016-05-12 00:02:27 +02:00
Aokromes
a7fe9aecc4 Merge branch 'patch-1' into '4.3.4' 
Now Nalorakk can be attacked after his last waypoint.



See merge request !7
 2016-05-08 12:33:46 +00:00
Vincent-Michael
dd02d8b004 Scripts: Added missing overrides 
(cherry picked from commit 00b4e8b6cc)

Conflicts:
	src/server/scripts/Kalimdor/zone_desolace.cpp
 2016-05-04 03:04:51 +02:00
Vincent-Michael
f42e6647e4 Core/Commands: Added transport position for command .gps 
(cherry picked from commit 9c99a1d0c7)
 2016-05-04 02:59:13 +02:00
Aokromes
41e7c525f6 Build fix 2016-05-01 16:12:56 +02:00
Carbenium
dd917e4214 Merge branch 'patch-3' into '4.3.4' 
Raid/Baradin Hold: Pit Lord Argaloth

Pit Lord Argaloth should cast one time Fel Firestom at 66% Health and 33% Health. The way it was scripted made boss cast continuosly Fel Firestom from 66% to 0%. Now it is ok.

See merge request !9
 2016-04-30 22:48:49 +00:00
Girip Dragos
219d248a00 Type: So adding removeflag on reset makes boss to remove that flag after last waypoint and adding the removeflag on reset makes him attackable after wipe too. 2016-04-23 22:45:54 +00:00
Girip Dragos
93bd30d9e4 Diff 2016-04-23 22:37:08 +00:00
Girip Dragos
6364655d63 Typo 2016-04-23 22:13:45 +00:00
Girip Dragos
88ba2d4ebd Typo 2016-04-19 22:23:03 +00:00
Girip Dragos
e909652eba Everything should be fine now. 2016-04-09 19:21:22 +00:00
Girip Dragos
b6e2285289 My bad. 2016-04-09 19:15:31 +00:00
Girip Dragos
07551d62b0 Raid/Baradin Hold: Pit Lord Argaloth 2016-04-09 19:05:00 +00:00
Girip Dragos
74dfec580c Zul'Aman/Hexlord : Deleted unused code and improoved for 4.3.4 2016-04-08 23:04:48 +00:00
Girip Dragos
411cd3fdb3 Now Nalorakk can be attacked after his last waypoint. 2016-04-08 22:53:51 +00:00
Aokromes
70697c6fce Core: fixed few coverity issues and warnings 2016-04-03 08:04:26 +02:00
Aokromes
30b80d6e82 Core: fixed few coverity issues and warnings 
Partial port of b68b6417f6 by joschiwald
 2016-04-03 07:36:50 +02:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
Dr-J
c9f9e93c22 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 2016-03-09 23:31:36 +00:00
Nyeriah
c1905771f0 Scripts/Command: Solve several format exception crashes introduced in a recent commit 
Ref #16648
Closes #16751
 2016-03-09 00:42:45 -03:00
DDuarte
2ea31027e5 Core: Backport 6.x realm changes 
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6ba and 63def8aa32
 2016-03-06 19:46:59 +00:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
Shauren
7fe5a77f5e Warning fix 2016-03-05 20:17:37 +01:00
Shauren
3d0b065135 Core/Commands: Fixed a crash in .wp mod by @Magnifikator 
Closes #16732
 2016-03-05 20:16:42 +01:00