Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,478 Commits 4 Branches 146 Tags
a3e34f562141e272fd64b44272fa58ea729bcffa
Commit Graph

7130 Commits

Author SHA1 Message Date
Vincent-Michael
a3e34f5621 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 23:06:10 +02:00
Aokromes
a36925937a DB/Misc: Add conditions to one mage trainer 
By dr-j.
 2014-06-28 22:04:46 +02:00
Vincent-Michael
3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2014-06-28 21:07:41 +02:00
jackpoz
1bd4ff6cb9 Revert "Scripts/Ulduar: Implement Mimiron" 2014-06-28 13:49:34 +02:00
Trisjdc
0ac6f16896 Merge pull request #12268 from Unholychick/patch_mimironnew 
Scripts/Ulduar: Implement Mimiron
 2014-06-28 12:17:32 +01:00
Aokromes
68958205d4 DB/Conditions: Arcanum of the stalwart protector 
Closes #10163
 2014-06-28 03:57:17 +02:00
Aokromes
c97a994564 DB/Misc: Karen No (and related quests) 
By Wylath, closes #9217
 2014-06-28 03:37:46 +02:00
Aokromes
5ffce750df DB/Misc: Missing Graveyard in Zone 44 
Closes #9724
 2014-06-28 03:34:47 +02:00
Aokromes
16d66e809c DB/SAI: Fix more runtime errors 
By dr-j
 2014-06-28 01:55:21 +02:00
Vincent-Michael
f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
Aokromes
17f91aee76 DB/SAI: Fix more runtime errors 
By dr-j
 2014-06-27 15:57:49 +02:00
Aokromes
b61dd90f1c DB/Misc: Fix startup and runtime errors 
By dr-j
 2014-06-27 14:37:24 +02:00
joschiwald
32d2e25556 Merge pull request #12364 from MitchesD/misc_2 
Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues ...
 2014-06-26 22:28:51 +02:00
MitchesD
6ebb64892f Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues on boss Vexallus 
* removed old hacks and added missing auras
* Vexallus converted to EventMap
 2014-06-26 22:25:24 +02:00
Vincent-Michael
e97b6e6403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-26 19:48:16 +02:00
Aokromes
4368747de6 DB/Spawns: Add multiple Brewfest missing things 
By Discover-, updates #3619
 2014-06-26 11:15:06 +02:00
Aokromes
36414de688 DB/Quest: A Suitable Disguise 
Original Work by Discover-, fixes by Nastrand, zaphod77, foldy and, dr-j.
Closes #3291
 2014-06-26 06:38:28 +02:00
Vincent-Michael
3a63187b47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
 2014-06-26 00:13:34 +02:00
Aokromes
17fd20f50c DB/Quest: Redemption 
Fix missing delete.
 2014-06-25 22:32:04 +02:00
Shauren
2ae5036ad9 SQL: Renamed updates to follow naming convention 2014-06-25 19:54:30 +02:00
Vincent-Michael
50cf908d78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.h
 2014-06-25 19:51:27 +02:00
Dr-J
a7a9f44cf5 DB/Conditions: Fix conditions for spell "Symbol of Life" 2014-06-25 19:07:24 +02:00
Vincent-Michael
f825d6b738 SQL: Sync auth_database 2014-06-25 18:40:03 +02:00
Aokromes
77c4ff2923 DB/Conditions: Healing the Lake/Neutralizing Agent 
By MitchesD, closes #3337
 2014-06-25 14:47:07 +02:00
Aokromes
0d8ba1233e DB/Quest: Redemption 
By dr-j, closes #11233
 2014-06-25 11:38:26 +02:00
Aokromes
bc27b342d6 Create 2014_06_25_04_world_misc.sql 
By dr-j, closes #4399
 2014-06-25 11:23:45 +02:00
Aokromes
d9281bc45b DB/Quest: A Tangled Skein 
By Trista, closes #6584
 2014-06-25 10:59:59 +02:00
Aokromes
689f7c2fc6 DB/Creature: Challe's Home For Little Tykes 
Closes #5921
 2014-06-25 06:38:17 +02:00
Aokromes
04d72fa73f DB/Creature: Midsummer Fire Festival Spawns 
Closes #1515
 2014-06-25 06:23:04 +02:00
Aokromes
db0fe628a2 Update and rename 2014_06_24_05_world_quest.sql to 2014_06_25_00_world_quest.sql 2014-06-25 05:32:30 +02:00
Aokromes
6ff28c39e8 Merge pull request #12354 from Kittnz/powering_our_defenses 
Quest: Powering our Defenses fixed
 2014-06-25 05:29:25 +02:00
Aokromes
c2d1a36966 DB/Quest: Lost Thunderbrew Recipe 
By dr-j, closes #5054
 2014-06-25 00:09:59 +02:00
Aokromes
9892dfa662 DB/Quest: Remove Obsolete Midsummer Fire Festival quests 
By Exodius, closes #10265
 2014-06-24 23:40:02 +02:00
Aokromes
b3ddccb389 DB/Item: Tier 7.5 Mage set bonus 
By bazgrim, closes #10151
 2014-06-24 20:43:34 +02:00
Aokromes
d1bcaf36ee Update 2014_06_23_00_action_ip_logger.sql 2014-06-24 20:15:59 +02:00
Aokromes
6bd0ef737e DB/Quest: Brains! Brains! Brains! 
By dr-j, closes #10244
 2014-06-24 20:06:34 +02:00
Aokromes
028614b95b DB/Quest: Changing the Wind's Course 
By Trista, updated by dr-j, closes #1084
 2014-06-24 20:03:05 +02:00
Vincent-Michael
ec59bf5699 SQL: Rename sql after merge pr 2014-06-24 18:31:28 +02:00
Vincent-Michael
f0c366141b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/World/action_ip_logger.cpp
 2014-06-24 18:26:52 +02:00
Kittnz
80e0c443ff Quest: Powering our Defenses fixed 
Fix by @Discover-, @untaught, @Kittnz
 2014-06-24 18:23:37 +02:00
Aokromes
34b4be5902 DB/Quest: Show Them Gnome Mercy! / There Can Be Only One Response 
By dr-j, closes #8790
 2014-06-24 12:54:34 +02:00
Aokromes
736ac0ce2b DB/Quest: Seared Scourge 
By dr-j, closes #4786
 2014-06-24 11:22:35 +02:00
Aokromes
4b1bf83bcf DB/Quest: The Way to His Heart... 
By dr-j, closes #4237
 2014-06-24 06:17:07 +02:00
Aokromes
98cce05185 DB/Quest: The Truth Shall Set us Free 
By Fearless18, updated by dr-j, closes #1865
 2014-06-24 01:58:23 +02:00
Kinzcool
e26a8efb4b DB/Quest: Added the proper special flags to some quests 2014-06-23 19:50:28 -04:00
Vincent-Michael
d8234bed42 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
 2014-06-23 23:47:48 +02:00
Vincent-Michael
aa93a97546 SQL: Remove bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom 2014-06-23 23:18:36 +02:00
Aokromes
84e6af26e6 Merge pull request #11976 from Ascathor/master 
Core/Misc: New ability to log account IP access history
 2014-06-23 22:48:35 +02:00
Aokromes
3a4ba127d1 DB/Quest: The Booterang: A Cure For The Common Worthless Peon 
By dr-j, closes #11376
 2014-06-23 22:19:24 +02:00
Aokromes
476a032c53 Update 2014_06_23_19_world_misc.sql 
I must go to sleep.
 2014-06-23 22:12:25 +02:00