Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,661 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
Gacko
153e88a16b Core: Blood Furnace - Broggok event 
Move prisoners back in cages after respawn. They didn't reset correctly
for players which were still in the instance after wipe
 2012-09-03 20:09:45 +02:00
Nay
874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
 2012-09-03 16:11:46 +01:00
Nay
c7fed98b9d Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	dep/PackageList.txt
 2012-09-03 15:51:34 +01:00
w1sht0l1v3
f46982ee7a Scripts: Fix non pch build 2012-09-03 16:15:18 +03:00
w1sht0l1v3
128d99b29b Core/Scripts: Rewrite Cold Hearted quest. 
Closes #1758 .
 2012-09-03 15:50:08 +03:00
Nay
77c8e0a2a4 Merge pull request #7625 from Elron103/pull-requests 
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
 2012-09-02 17:05:34 -07:00
Elron103
1e361bc43a Scripts/MoltenCore: Fix boss Golemagg enrage behaviour 2012-09-03 01:57:01 +02:00
Shauren
10c9f0d0ed Scripts/Commands: Fixed compile 2012-09-02 18:40:08 +02:00
Nay
40c22de0b7 Merge pull request #7587 from acrathos/master 
DB/SAI: Thorim and Lok'lira the Crone
 2012-09-02 07:47:57 -07:00
Gacko
9060294ab0 Core: Quest 'The art of persuasion' - Typo 2012-09-02 11:54:02 +02:00
Nay
ffe8c75f17 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-01 22:20:33 +01:00
Nay
2e1de60593 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
 2012-09-01 22:19:13 +01:00
Nay
107bd5f5a3 Scripts: Fix non pch build 2012-09-01 00:11:44 +01:00
Gacko
74d4aec49b Core/Spell: Unlocking zuluhed chains 
Core/Spell: Unlocking zuluheds chains

Core/Spell: Unlocking zuluheds chains

Core/Spell: Unlocking zuluheds chains
 2012-09-01 00:35:52 +02:00
Trista
a8d514914b Core/Scripts: Improve Wyrmrest Defender gossip 
* Added conditions to only show default gossip, if not on quest 12372
* Else show other gossip text
* Add second gossip text on gossip select
* Remove close gossip - after a lot of videos turns out character close it by moving or clicking "goodbye"

Ref #1861
Closes #7594
 2012-08-31 14:48:10 -05:00
w1sht0l1v3
6fbe3a11ec DB/SAI: Taking on All Challengers & Defending Your Title 2012-08-31 14:48:07 -05:00
Myran2
db7b750e0c Scripts/Commands: Create a new group of commands, .cheat, and add new and move old commands to it: 
Changes:
- .explorecheat is now .cheat explore
- .waterwalk is now .cheat waterwalk
- .taxicheat is now .cheat taxi

New commands:
- .cheat god
- .cheat casttime
- .cheat cooldown
- .cheat power

(Descriptions available in the SQL file / in-game)

Inspiration on ArcEmu commands
Closes #7569
 2012-08-31 14:48:02 -05:00
Nay
8bfdfd18cd Scripts: Fix a merge issue, thanks cyberbrest 2012-08-31 19:48:26 +01:00
Trista
305b8d2d69 Core/Scripts: Improve Wyrmrest Defender gossip 
* Added conditions to only show default gossip, if not on quest 12372
* Else show other gossip text
* Add second gossip text on gossip select
* Remove close gossip - after a lot of videos turns out character close it by moving or clicking "goodbye"

Ref #1861
Closes #7594
 2012-08-31 14:20:55 +01:00
Santiago
0af00a8283 DB/SAI: Remove Lol'kira the Krone and Thorim cpp scripts, handled by SAI 2012-08-30 23:32:03 -03:00
w1sht0l1v3
20e629d038 DB/SAI: Taking on All Challengers & Defending Your Title 2012-08-31 04:15:04 +03:00
Myran2
908ae08a0a Scripts/Commands: Create a new group of commands, .cheat, and add new and move old commands to it: 
Changes:
- .explorecheat is now .cheat explore
- .waterwalk is now .cheat waterwalk
- .taxicheat is now .cheat taxi

New commands:
- .cheat god
- .cheat casttime
- .cheat cooldown
- .cheat power

(Descriptions available in the SQL file / in-game)

Inspiration on ArcEmu commands
Closes #7569
 2012-08-31 01:26:21 +01:00
Subv
554e88dd63 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-30 19:16:09 -05:00
Nay
d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
 2012-08-30 23:06:19 +01:00
Nay
abbb896cfb Core: Fix many "errors"/warnings and coding style (2) 
Scripts; also reverted a change to AuthSocket

Errors were found using Cppcheck, open-source static analysis tool
 2012-08-30 22:44:03 +01:00
Gacko
a303bda320 Core: Quest - The art of persuasion 2012-08-30 20:27:21 +02:00
Kaelima
dd98331999 Merge pull request #7566 from Souler/fix_copy_weapon_auras 
Scripts/Spells: Fix Weapon Copy related auras.
 2012-08-30 03:36:40 -07:00
Souler
5ee99a9412 Scripts/Spells: Fix Weapon Copy related auras. 
Closes #3731
 2012-08-30 11:50:07 +02:00
Subv
532ddfcd40 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-29 17:36:09 -05:00
Nay
e909e5515b Scripts/Hellfire: Add missing include 2012-08-29 22:36:04 +01:00
Nay
872c239dbe Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 22:29:06 +01:00
Gacko
e07a8db6da Scripts/Hellfire: Rework Blood Furnace 2012-08-29 22:23:15 +01:00
Nay
aa9f2e9f18 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 14:01:38 +01:00
Nay
d6221fc4f7 Scripts: Fix code style after PR 2012-08-28 20:10:04 -05:00
thesensei
8f9dad3d76 Core/Spells: Destabilize Azure Dragonshrine 
*Spell script support for spell 49370
 2012-08-28 20:10:01 -05:00
Nay
d533c950cb Scripts: Fix code style after PR 2012-08-28 19:31:15 +01:00
thesensei
66917624bb Core/Spells: Destabilize Azure Dragonshrine 
*Spell script support for spell 49370
 2012-08-28 20:58:03 +03:00
Nay
e4aacd3f86 Merge pull request #7543 from gigatotem/4.3.4 
Spells/Shaman: Heroism and Bloodlust
 2012-08-27 15:17:54 -07:00
Gigatotem
b7fa5cb566 Spells/Shaman: Heroism and Bloodlust 
Heroism and Bloodlust will now check for Temporal Displacement from Time Warp and Insanity from Ancient Hysteria.
 2012-08-28 00:03:37 +02:00
Nay
e09591b8a7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
 2012-08-27 22:43:07 +01:00
Subv
9fe45d6870 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-27 15:30:27 -05:00
Vincent-Michael
7e2d007e0d Core/Spells: Fix 'Foam Sword Rack' mechanic 2012-08-27 19:57:26 +02:00
gecko32
1a0a80bb77 Scripts/ZulGurub: Fix attacking Bloodlord Mandokir 
Closes #1007
Closes #7499
 2012-08-27 16:50:47 +01:00
neuro_999
b0256c30a4 Scripts/Uldaman: Archaedas now Awaken his minnions & spawn of npc lore keeper of norgannon 
Closes #765
 2012-08-27 16:26:45 +01:00
Vincent-Michael
695e64556f Core: Fix warnings and code style 2012-08-27 17:02:38 +02:00
Kandera
59aeef8278 Scripts/Wintergrasp: fix grab passenger spell. 2012-08-27 11:00:30 -04:00
Nay
fc16106823 Scripts/Spells: Fix a typo in spell_q12372_cast_from_gossip_trigger and cleanup whitespace 2012-08-27 14:40:12 +01:00
Nay
f8c01739df Scripts/Spells: Remove a not needed cast in spell_q12372_cast_from_gossip_trigger 2012-08-27 14:29:00 +01:00
Nay
c157e2643a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-27 14:11:57 +01:00
Nay
b8bca936e8 Merge pull request #7524 from Trista/master 
[Core/Scripts] Defending Wyrmrest Temple
 2012-08-27 05:49:47 -07:00