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

9502 Commits

Author SHA1 Message Date
Aokromes
9f4bab55ed Merge pull request #12046 from phoenixfight/fishmaster 
Core/Fishing: Repair fishing spell result fish escape
 2014-06-11 17:32:49 +02:00
phoenixfight
ae46affe4e [core/database]Repair fishing spell result fish escape 
edit fish junk sql formart

Optimized code, remove some useless brackets

fix default fish result ,just like Off the coast of Storm Peaks.

cleaned the sql part  thx Kinzcool

fix todo now
 2014-06-10 11:07:15 +08:00
Aokromes
d66d1af271 DB/Quest: Fix some missing quest texts 
By crysicle, closes #12167
 2014-06-09 23:11:08 +02:00
Kinzcool
9d481fd64d DB/GameObjects: Deleted no longer needed gameobjects spawns since their phaseMask correction 2014-06-09 23:11:02 +02:00
Kinzcool
ae18b84c73 DB/GameObjects: Fixed the phasing of the remaining flags in WinterGrasp 2014-06-09 23:11:01 +02:00
Kinzcool
0cc94300d9 DB/GameObjects: Fixed some phasing of certain gameobjects in Northrend and DK's area 2014-06-09 23:11:00 +02:00
Vincent-Michael
ae1fbba3cc DB/Conditions: Fix conditions for Xink gossip 2014-06-09 23:11:00 +02:00
Aokromes
ba0b4dc06d DB/Creature: Fix Eva Sarkhoff 
By dr-j, closes #12224
 2014-06-09 23:10:51 +02:00
Trisjdc
78f1cbfba5 Scripts/Items: Imp in a Ball 2014-06-09 23:10:47 +02:00
Aokromes
90c60a5a6f DB/Quest: Fix some missing quest texts 
By Crysicle, closes #12214 closes #12209
 2014-06-09 23:10:45 +02:00
Aokromes
e5bd194bf8 DB/Quest: Fix some missing quest texts 
By crysicle, closes #12167
 2014-06-09 10:11:56 +02:00
Vincent-Michael
18b6a6450b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_warlock.cpp
 2014-06-09 03:27:53 +02:00
Shauren
434b3a80e1 Core/Commands: Added a set of commands to manage battle.net accounts 
TODO: Ban commands, linking game accounts to battle.net accounts
 2014-06-08 17:58:28 +02:00
Shauren
7dd552c826 Merge branch 'battle.net' into 4.3.4 2014-06-08 16:14:24 +02:00
Shauren
9f69eda67f Core/Battle.net: Additional checks 
* Force grunt login for versions < 15595
* Force bn login if supported and game account is linked to bn account
 2014-06-08 15:34:24 +02:00
Shauren
05c0524bf3 Core/Battle.net: Refactored handling multiple game accounts 2014-06-08 14:54:37 +02:00
Shauren
372f043a68 SQL: Sorted out temporary names and added missing statements 2014-06-08 13:02:16 +02:00
Kinzcool
1ed339547b DB/GameObjects: Deleted no longer needed gameobjects spawns since their phaseMask correction 2014-06-08 03:13:18 -04:00
Kinzcool
d9cdac643e DB/GameObjects: Fixed the phasing of the remaining flags in WinterGrasp 2014-06-08 03:11:36 -04:00
Kinzcool
cde18e19c8 DB/GameObjects: Fixed some phasing of certain gameobjects in Northrend and DK's area 2014-06-08 00:02:20 -04:00
Subv
f71abd173e Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 2014-06-07 20:27:23 -05:00
Vincent-Michael
73e90f6241 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-08 01:21:17 +02:00
Vincent-Michael
27b5e0d9ac DB/Conditions: Fix conditions for Xink gossip 2014-06-08 01:20:47 +02:00
Vincent-Michael
1f62d9c387 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/Handlers/ItemHandler.cpp
	src/server/scripts/Spells/spell_dk.cpp
 2014-06-07 23:40:37 +02:00
Sebastian Valle Herrera
fd7589617d Merge pull request #12057 from Trisjdc/imp_in_a_ball 
Scripts/Items: Imp in a Ball
 2014-06-07 11:44:22 -05:00
Aokromes
91d9833916 DB/Creature: Fix Eva Sarkhoff 
By dr-j, closes #12224
 2014-06-07 11:17:50 +02:00
Vincent-Michael
1e4ec81ccb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
 2014-06-06 22:56:30 +02:00
Trisjdc
b4b3e6f3a2 Scripts/Items: Imp in a Ball 2014-06-06 11:01:36 +01:00
Subv
5023000c56 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 
Conflicts:
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
 2014-06-05 19:49:03 -05:00
Aokromes
455690438f DB/Quest: Fix some missing quest texts 
By Crysicle, closes #12214 closes #12209
 2014-06-06 02:39:56 +02:00
Michael
83c2e79d52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-06-05 19:42:48 +02:00
Subv
74be070d1c Core/Phases: Update transport visibility when changing phases 2014-06-03 13:08:54 -05:00
Gacko
79f01de094 DB/Creature: Remove phaseMask hack of Shadowmoon Tuber Nodes 
Related to 26370223a0
 2014-06-03 10:04:03 +02:00
Subv
3df25bb64c Core/Phases: Added missing sql and changed how phase_definitions will work, implementation still missing 2014-06-02 15:53:54 -05:00
Kinzcool
289a5c4318 DB/Phases: Added PhaseId & PhaseGroup fields for coming phasing changes 2014-06-01 22:13:08 -04:00
Kinzcool
edced30576 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-01 13:42:07 -04:00
Shauren
bdd6e9aa8a Core/Battle.net: Implemented reconnects 2014-06-01 13:56:36 +02:00
Filip
3ceabf962d Martek the Exiled's prerequisite quests 
Fix by @untaught
 2014-05-30 22:11:03 +02:00
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