Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,570 Commits 4 Branches 146 Tags
4fb6101c6e15daf6fc3df5c8fbffd2bfcaa3439e
Commit Graph

2036 Commits

Author SHA1 Message Date
Nay
1458a006b8 Siigh 2012-09-10 02:11:21 +01:00
Nay
0a81824772 DB/Guilds: Add missing reward table 2012-09-10 02:10:28 +01:00
Nay
d97d125618 Move a SQL file 2012-09-10 02:04:21 +01:00
Nay
d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Subv
6fc3d3a77c Core/Scripts: Some cleanup in warlock spellscripts 2012-09-09 12:28:31 -05:00
Subv
da5f8f58e2 Core/Scripts: Cleanup the warrior spell scripts 2012-09-09 11:48:29 -05:00
Vincent-Michael
8541167ff2 DB/Quests: Fix OfferRewardText for quest "Warsong Supplies" 
Closes #7279
 2012-09-09 04:27:06 +02:00
Vincent-Michael
3d360e116c SQL: Fix sql fails :-/ 2012-09-09 04:12:08 +02:00
Vincent-Michael
2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script 
Closes #6545
 2012-09-09 04:02:47 +02:00
Nay
7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-09 02:18:58 +01:00
Nay
d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2
5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Subv
158a86cf11 SQL/Achievements: Fixed achievement "Wrecking Ball" 
It should only count player deaths.
closes #1734
 2012-09-08 13:13:32 -05:00
Vincent-Michael
f2136eaeef DB/Creatures: Fix Kologarn InhabitType 2012-09-08 02:44:44 +02:00
Nay
242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
 2012-09-08 01:34:24 +01:00
Vincent-Michael
4cf1e7309f DB/Achievement: Fix achievement "Who Needs Bloodlust"? 
Closes: #4812
 2012-09-08 02:16:35 +02:00
Subv
673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect. 
Author: Josh
closes #7275
 2012-09-07 18:26:14 -05:00
Shauren
6ca7a7b78d Core/Guilds: Implemented basic guild leveling (no player statistics/reputation) 2012-09-07 14:39:19 +02:00
Nay
faf9f481ef DB/NPCs: Set UNIT_FLAG2_REGENERATE_POWER for all creatures 
(exceptions to this rule will have to be fixed)
 2012-09-07 04:12:45 +01:00
Nay
19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-07 03:36:47 +01:00
Vincent-Michael
ce42faafd9 DB/Spells: Fix Flamecap Fire damage 2012-09-07 02:02:35 +02:00
Nay
fa29f1bb27 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-04 01:04:31 +01:00
nelegalno
511beb8c19 DB/Quests: Fix required races for quest 9719 
Closes #7604
 2012-09-03 17:18:38 +01:00
Nay
6acb7f85f4 DB/GOs: Correct flags of GO 186371 
Thanks Joshh
Closes #6846
 2012-09-03 17:15:32 +01: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
w1sht0l1v3
128d99b29b Core/Scripts: Rewrite Cold Hearted quest. 
Closes #1758 .
 2012-09-03 15:50:08 +03:00
Nay
1a49554af8 Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap) 2012-09-02 22:52:22 +01:00
Vincent-Michael
28a5e1e148 SQL: Fix sql error (thx ChazyTheBest) 2012-09-02 21:02:35 +02:00
Nay
1731ff5ca1 SQL: Rename SQL file after PR 2012-09-02 15:50:29 +01: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
nelegalno
f4fdb0c64c DB/Quests: Fix required races for multiple quests 
Closes #7620
 2012-09-02 15:44:00 +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
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
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
Nay
1a5df2b72e SQL: Rename SQL 2012-08-31 01:29:18 +01: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
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
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
kaelima
bdfae83898 Core/Creature: Added DB support for UNIT_FIELD_FLAGS_2. Thanks cyberbrest 
- Added more flags to UnitFlags2 enum (Thanks wpp)
 2012-08-30 04:52:56 +02: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
Vincent-Michael
856a5b62fb DB/Achievements: Fix achievements 'Koralon the Flame Watcher' / 'Toravon the Ice Watcher' 2012-08-28 21:13:37 +02: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
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
Vincent-Michael
7e2d007e0d Core/Spells: Fix 'Foam Sword Rack' mechanic 2012-08-27 19:57:26 +02:00
joschiwald
fe970b1c1e DB/Conditions: Fix 'Foam Sword Attack' / 'Foam Sword Attack' targets 2012-08-27 19:56:07 +02:00