Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 07:07:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,456 Commits 4 Branches 146 Tags
79eb80dcba9f67c01e62d92d7a95494eec2525a3
Commit Graph

4228 Commits

Author SHA1 Message Date
Carbenium
79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Carbenium
fc13ce42df Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4 
Conflicts:
	sql/updates/world/2014_11_05_00_world.sql
 2015-07-21 18:53:04 +02:00
Carbenium
8d47083319 Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
 2015-07-21 18:51:30 +02:00
Carbenium
68fd138476 Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 2015-07-21 18:30:05 +02:00
Carbenium
9f1d71a53f Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2015-07-21 18:22:27 +02:00
Carbenium
63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_21_00_world.sql
 2015-07-21 18:17:08 +02:00
Carbenium
38027226ff Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
 2015-07-21 18:04:43 +02:00
Carbenium
1350a08ee4 Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4 2015-07-21 17:54:19 +02:00
Aokromes
1c0cf6021b DB/Misc: Other branches fixes 2015-07-19 23:02:24 +02:00
Aokromes
7680c90abd Update (C) date 2015-07-19 13:37:44 +02:00
Nyeriah
c4ad70e7f4 Scripts/Stonecore: Prevent Slabhide from dying during air phase 2015-04-24 14:11:13 -03:00
Rushor
5ebf89ce16 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation 
closes #12165

(cherry picked from commit 6080234e98)
 2015-03-25 16:35:15 +01:00
Rat
e6cc39258d Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into phases 
Conflicts:
	sql/updates/world/2014_10_30_00_world.sql
 2014-12-30 10:22:55 +01:00
Mihapro
9a941ae125 Scripts/Instance: The Stonecore updates 
Stonecore Teleporters scripted. Some corrections, better handlings, fixed Travis warnings ...

Closes #13626
 2014-12-28 17:52:16 +00:00
MitchesD
3d3dafbe38 Scripts/ICC: fixed situations when LK tried to cast Necrotic Plague on pets and then Necrotic Plague was omitted 2014-12-28 12:09:12 +01:00
Nyeriah
5d4f26d820 Scripts/Commands: Fix a conversion loss at the mute history command 2014-12-26 16:18:22 -02:00
Nyeriah
63c1e265aa Scripts/Oculus: Implement a couple of missing texts 2014-12-26 13:03:15 -02:00
Nyeriah
aff5229cd1 Scripts/Naxxramas: Add script support for quarter teleporters and spawn missing ones 
Updates #13255
 2014-12-26 03:58:42 -02:00
Nyeriah
e2f7b91298 Scripts/Nexus: Implement Grand Magus Telestra's seasonal costume 
Closes #13643
 2014-12-25 16:49:39 -02:00
MitchesD
f743fb3e43 Scripts/Nexus: rewritten instance script 2014-12-25 19:41:59 +01:00
Nyeriah
37ccea13cb Scripts/HallsOfLightning: Readd a safe-measure line to remove Loken's aura 2014-12-17 15:02:54 -02:00
Nyeriah
dd942db85f Scripts/Naxxramas: 
* Implement dialogue after Sapphiron dies.
* Spawn missing triggers at Kel'Thuzad's room.
* Implement a couple of missing texts and emotes to Kel'Thuzad's fight.
 2014-12-17 14:49:43 -02:00
mthsena
884953942b Scripts/MountHyjal: Kill warning 2014-12-15 16:52:01 -02:00
Nyeriah
d417e92930 Scripts/HallsOfLightning: Implement Loken's intro speech and rewrite boss script to EventMaps/BossAI 2014-12-15 15:39:53 -02:00
joschiwald
4ecb754da8 Scripts/Archimonde: replaced one yell with proper db content and unhacked drain world tree 
(cherry picked from commit 58aca0da81)
 2014-12-15 00:17:29 +01:00
Nyeriah
ee1fa93360 Scripts/Naxxramas: Implement Kel'Thuzad's taunts after defeating each wing and the one after killing Mr. Bigglesworth 2014-12-13 21:43:10 -02:00
Nyeriah
f7a5a19f00 Scripts/Naxxramas: Implement the Four Horsemen's dialogue that happens after Gothik's death 2014-12-12 15:13:19 -02:00
Dr-J
f5c2fa899e Remove Alexstrasza the Life-Binder CPP 2014-12-09 14:20:05 +00:00
Dr-J
2e757f8198 Remove Blackhoof Cage CPP 2014-12-06 00:08:58 +00:00
Nyeriah
548cc1cd2f Scripts/Misc: Initialize a couple of fields 2014-12-05 19:13:38 -02:00
Dr-J
f80a9f9f72 Tidying up cpp - zone_icecrown.cpp 
* Remove script for The Flesh Giant Champion
* Remove script from for Vereth the Cunning as even though I scripted new recruit using the correct npc (Geist Return Bunny) today discovered this npc had script for it even though never worked as before I scripted the lithe stalkers did not move when subdued.
 2014-12-05 19:30:05 +00:00
Nyeriah
09b71ef8bd Scripts/MountHyjal: Update Archimonde's script 
@todo: instance scripts needs a major clean up
Closes #6471
 2014-12-04 17:50:11 -02:00
Dr-J
19967a6646 Removing CPP for "Stinky" Ignatz 2014-12-04 02:38:52 +00:00
Dr-J
0b3b5d66e6 Some Cleanup of CPP I forgot to remove 2014-12-03 01:36:21 +00:00
Nayd
f9513c8b2e Core/Scripts: Fix build 
Closes #13636
 2014-11-27 12:59:03 +00:00
Nyeriah
3d2d2a97e0 Scripts/MoltenCore: Fix logic at Ragnaros' Magma Blast casts 
(should only be cast while the main target is not in melee range)
 2014-11-27 03:19:59 -02:00
Nayd
24c173f387 Core: Use the correct function to convert strings to unsigned longs and unsigned long longs 
Fixes wrong data being inserted into the database (i.e explored zones).
More info in #13493

Fixes #13493

Thanks to @jackpoz for finding the code issue and @Vavehl for an expectional bug report.

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
 2014-11-26 02:21:50 +00:00
Nyeriah
0a0e9b196f Scripts/CoS: Added SetDespawnAtFar, fixes Arthas despawning if no players are in range 
(specially during waves)
 2014-11-23 03:26:24 -02:00
Nyeriah
e778ee1416 Scripts/SteamVault: Remove non-selectable flag from access panels once their respective bosses are done 2014-11-21 15:46:26 -02:00
joschiwald
716d1404de Scripts/SethekkHalls: fixed Talon King Coffer 2014-11-20 17:56:21 +01:00
Dr-J
e209a738d7 Remove uneeded script 
Removing core script for go_gjalerbron_cage and go_large_gjalerbron_cage
 2014-11-19 22:31:23 +00:00
joschiwald
41ac4d5822 Script/Spells: fixed crash in spell_hun_aspect_of_the_beast 
Closes #13560
 2014-11-14 23:53:22 +01:00
Heihachi
3e03e546d3 Scripts/Commands: mod xp command 
Closes #13476
 2014-11-11 00:45:30 +00:00
ShinDarth
fd0b961781 Core/Commands: implement .pvpstats command 
Shows number of battleground victories in the last 7 days

Closes #13460
 2014-11-10 22:30:20 +00:00
Rat
323f80c801 Core/Phases: Mmaps now use the swapped terrain's mmtiles for all units if available 
- Needs more testing!
 2014-11-08 23:00:12 +01:00
Nyeriah
a7c781a02d Scripts/ToC: Simplify the code for "A Tribute to Immortality" achievement 
* also fixes the achievement being still awarded if players die indirectly during boss fights (Anub'arak adds, for example)

(cherry picked from commit 9838cbda1a)
 2014-11-06 22:18:02 -02:00
Nyeriah
9838cbda1a Scripts/ToC: Simplify the code for "A Tribute to Immortality" achievement 
* also fixes the achievement being still awarded if players die indirectly during boss fights (Anub'arak adds, for example)
 2014-11-06 22:13:13 -02:00
Aokromes
dfa99455ab Merge pull request #13368 from Mihapro/4.3.4-TheStonecore 
Scripts/Instance: The Stonecore
 2014-11-05 00:28:08 +01:00
Mihapro
50bf6cad6a Scripts/Instance: The Stonecore 2014-11-05 00:09:16 +01:00