Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,046 Commits 4 Branches 146 Tags
48ec2df81fa8f88cd32d7a79b587603aedbd89e0
Commit Graph

6961 Commits

Author SHA1 Message Date
Michael
15efe08a60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Weather/Weather.cpp
	src/server/game/Weather/WeatherMgr.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2014-05-25 21:52:27 +02:00
Discover-
8f42dd3fab Merge pull request #12111 from MitchesD/commands 
Scripts/Commands: added option to show InhabitType in .npc info command
 2014-05-24 00:45:06 +02:00
MitchesD
007e903753 Scripts/Commands: added option to show InhabitType in .npc info command 2014-05-23 20:51:22 +02:00
joschiwald
3c97735056 Scripts/PoS: fixed rimefang icy blast 
Closes #632
 2014-05-23 16:16:31 +02:00
Vincent-Michael
49a17c6282 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-05-22 20:53:13 +02:00
Aokromes
a5f84e83cc DB/Creature: Fix Crazed Mana Surge 
By dr-j, closes #11998
 2014-05-19 18:31:57 +02:00
Aokromes
ced47da812 DB/Quest: Fix Gambling Debt 
By dr-j, closes #12092
 2014-05-19 18:28:57 +02:00
Vincent-Michael
ef5bc9c70a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
 2014-05-18 19:40:30 +02:00
Aokromes
fce80ffa6e Update 2014_05_18_04_world_misc.sql 2014-05-18 03:30:44 +02:00
Aokromes
23691bd4d1 Update 2014_05_18_04_world_misc.sql 2014-05-18 03:30:02 +02:00
Aokromes
83c3abce61 DB/Spawns: Myralion Sunblaze Frozen Halls spawns 
By Foldy, closes #11899
 2014-05-18 03:12:53 +02:00
Aokromes
f3676f3675 Rename 2014_05_18_02_world_gameobject.sql to 2014_05_18_02_world_gameobject.sql 2014-05-18 01:59:07 +02:00
Aokromes
71e38c7b51 DB/Misc: Nesingwary Lackey Ear 
By nelegalno, closes #8624
 2014-05-18 01:58:24 +02:00
Aokromes
820095230d DB/Gameobject: Thunderbrew Lager Keg 
By Foldy, closes #12078
 2014-05-18 01:47:52 +02:00
Aokromes
f8f8819bef DB/Creature: Ethereal Soul-Trader 
By Foldy, closes #12080 updates #4152
 2014-05-18 01:43:40 +02:00
Aokromes
2d1272da5f DB/Creature: Highlord Darion Mograine - Restore Shadow's Edge gossip 
By Foldy, closes #12079
 2014-05-18 01:39:03 +02:00
Aokromes
dcc64f4c69 DB/Conditions: Fix startup error added on 018da66 2014-05-13 11:36:19 +02:00
Vincent-Michael
4136f3c974 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ArenaTeamHandler.cpp
 2014-05-13 06:41:25 +02:00
Aokromes
0334c21394 DB/Creature: Fix Antipersonnel Cannon (1) immune mask 
Closes #11944, by gecko32
 2014-05-12 11:06:36 +02:00
Aokromes
d6d5bc7918 Move file 2014_05_12_00_world_misc.sql 2014-05-12 10:30:51 +02:00
Aokromes
018da6689d DB/Creature: Fix Argent Tournament Vendors 
By dr-j, closes #10351
 2014-05-12 10:29:36 +02:00
Vincent-Michael
cfe644b457 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Quests/QuestDef.cpp
 2014-05-11 23:08:54 +02:00
Kinzcool
668ed58847 DB/Gameobjects: Updated the VerifiedBuild of some gameobjects 2014-05-11 13:05:42 -04:00
Kinzcool
4453cdc5bd DB/Gameobjects: Fixed Gymer's cage phasemask to make it appear while doing "The Storm King's Vengeance" quest 2014-05-11 04:09:08 -04:00
Kinzcool
392e045bda DB: Changed WDBVerified startdard to VerifiedBuild 2014-05-11 03:15:31 -04:00
Kinzcool
ac4fb9db24 DB/Gameobjects: Added some missing gameobjects spawns 2014-05-11 01:52:35 -04:00
joschiwald
066e55729f Merge pull request #11960 from MitchesD/hor 
Scripts/HallsOfReflection: Major changes
 2014-05-10 21:38:58 +02:00
MitchesD
8e7cf15dd1 Scripts/HallsOfReflection: Major changes 
* corrections to Intro Event (Falric, Marwyn etc.)
* fixed issues with Frostsworn General
* improved the whole Wrath of the Lich King event
* implemented outro gunship
* optimalization code and cleanup and fixed some typos
* Big thanks to @joschiwald, he is author too ;-)
 2014-05-10 21:37:33 +02:00
Aokromes
c861e64a56 DB/Misc: Delete some incorrect player_factionchange_items 
Closes #12005
 2014-05-10 20:36:38 +02:00
Vincent-Michael
37d2777f27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-09 17:20:39 +02:00
joschiwald
7aef44630e Merge pull request #12035 from MitchesD/duskwood 
Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fi...
 2014-05-09 17:19:29 +02:00
MitchesD
eabec73d98 Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fixed some issues there 2014-05-09 16:59:55 +02:00
Vincent-Michael
b6a9e56193 DB/Gossip: Fix some gossip in dalaran 2014-05-09 03:19:37 +02:00
Vincent-Michael
33978774ff SQL: Rename in correct name 2014-05-08 23:36:28 +02:00
Vincent-Michael
2c48938c6d DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:36:21 +02:00
Vincent-Michael
45ead7fb87 SQL: Rename in correct name 2014-05-08 23:35:36 +02:00
Vincent-Michael
53edb30f06 DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:33:53 +02:00
Aokromes
70dd848785 DB/Quest: The Bones of Nozronn 
By phoenixfight, closes #11985
 2014-05-08 18:40:39 +02:00
Vincent-Michael
09ff96914a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-08 02:47:29 +02:00
ccrs
5e4083bc45 DB/Gossip: Remove "Jarin Dawnglow <Innkeeper>" double gossip 
Closes #12019
 2014-05-07 16:23:13 +02:00
Aokromes
3751d547c0 DB/Creature: Fix incorrect flags_extra for 30413 
By untaught, closes #12010
 2014-05-07 12:23:10 +02:00
Vincent-Michael
5ca548602c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-05 16:13:40 +02:00
Gacko
5dd3fbcb19 Fix import 2014-05-04 16:24:33 +02:00
w1sht0l1v3
fdbb96d396 DB/Creature: Add some missing spawns in HoL. 2014-05-04 16:56:53 +03:00
Aokromes
fd7a40ca97 DB/Creature: Remove more incorrect trigger flags 
By dr-j, closes #11995 
Closes #7744
 2014-05-04 14:55:06 +02:00
Vincent-Michael
49018c4bdb DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:12:01 +02:00
Vincent-Michael
3b9da8498f DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:10:52 +02:00
Aokromes
f16caf49ac DB/Quest: Prepping the Speech 
By untaught, closes #11348
 2014-05-04 04:26:35 +02:00
Vincent-Michael
5e3e431b06 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-04 04:24:59 +02:00
Aokromes
2cd0388adf DB/Creature: Remove Trigger Flags on Chaotic Rift 
By dr-j, closes #11988
 2014-05-04 04:22:05 +02:00