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

5528 Commits

Author SHA1 Message Date
Shauren
1866c7a038 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-06-01 18:34:58 +02:00
Gacko
9251a60544 DB/SAI: Assign SmartAI and remove needless SmartScript (See core script) 2013-06-01 14:42:58 +02:00
Gacko
e741821dc2 DB: Fishing loot for Pit Of Saron 
http://www.elsanglin.com/forums/topic/pit-of-saron
 2013-06-01 14:42:38 +02:00
Aokromes
6fe923fdd3 DB/SAI: fix mobs spaming some events 
Fix by Kirkhammett and FireEmerald
 2013-05-31 14:09:34 +02:00
Shauren
adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
 2013-05-30 20:57:07 +02:00
Pitcrawler
36894b09b3 DB/Quests: Fix To Catch a Thistlehead, closes #9876 closes #6319 
Thanks @Kirkhammett for all the work
 2013-05-30 11:16:21 +02:00
LeGuybrush
b60311dd6b Remove BOM from 2013_05_21_00_world_trinity_strings.sql 2013-05-28 02:12:04 -04:00
Pitcrawler
379d41735c DB/Quests: Fix some remaining issues from aaa1d9b749 
For example the missing floating visual and prevent the script from being started more than once.
 2013-05-27 14:29:46 +02:00
Aokromes
c0490644d8 DB/SAI: fix typo in previous commit 2013-05-27 11:09:34 +03:00
Malcrom
206a1c0b5b DB/waypoints: Fix a path and remove a double spawn. 2013-05-26 20:09:43 -02:30
Pitcrawler
2e6a225abe DB/Quests: Fix Frostmourne Cavern, closes #9856 closes #4293 
Thanks @Malcrom for the initial script and @Kirkhammett for some additional work
 2013-05-27 00:13:18 +02:00
Malcrom
8b00069367 DB/Waypoints: Add waypoints to Heartrazor 
closes #7444
 2013-05-26 18:58:23 -02:30
Malcrom
7bc30a98e4 DB/SAI: fix typo in previous commit 2013-05-26 17:01:59 -02:30
Malcrom
222db6ed13 DB/SAI: Fix for quest "Not-So-Honorable Combat" by Kirkhammett 
closes #9864
 2013-05-26 16:45:35 -02:30
Malcrom
d22b2cd0d1 DB/SAI: Fix for quest "Shadow Vault Decree" by Kirkhammett 
closes #9866
 2013-05-26 16:41:54 -02:30
Malcrom
aaa1d9b749 DB/SAI: Fix for quest "Second Chances" by Kirkhammett 
closes 9855 6507
 2013-05-26 16:33:45 -02:30
Aokromes
33afdad507 Update 2013_05_24_00_world_misc.sql 2013-05-24 16:25:17 +03:00
Aokromes
bf864e7a16 Update 2013_05_24_00_world_misc.sql 2013-05-24 12:13:12 +03:00
Aokromes
1136d90bac Scripts/Halls of Reflection: Falric/Marwyn 
This is a Work in Progress script by WishToDie based on the work found at http://www.trinitycore.org/f/topic/7192-patch-halls-of-reflections/
 2013-05-24 10:09:00 +02:00
ZxBiohazardZx
364f08fcbc Merge pull request #9848 from Foldor/master 
Remove a duplicate semicolon
Closes #9848
 2013-05-23 15:08:51 -07:00
Pitcrawler
c9723d0a05 DB/Quests: Fix script 2013-05-23 23:33:57 +02:00
Pitcrawler
62ded51557 DB/Quests: Fix text type 2013-05-23 23:23:08 +02:00
Pitcrawler
e44045bcd8 DB/Quests: Fix The Heart of the Storm, closes #9041 2013-05-23 23:20:48 +02:00
Pitcrawler
e2cf1b0186 DB/Quests: Fix Conversing With the Depths, closes #3048 2013-05-23 23:14:20 +02:00
Foldor
80962bc991 Remove a duplicate Semicolon 2013-05-23 16:53:23 +01:00
ZxBiohazardZx
88c41a44ef commit: added newline at eof 2013-05-23 00:03:25 +02:00
kirkhammett
02d25e87c9 DB/SAI: convert EAI of some Redridge Creatures 
Closes #9760
 2013-05-22 22:00:20 +02:00
dr-j
4f7be6a6ea DB/SAI: Add support for Quest 11279: Green Egg Whelps 
Closes #9781
 2013-05-22 21:57:51 +02:00
foldor
2337639a59 DB/Gameobject: update spawnpositions 
Closes #9794
 2013-05-22 21:53:54 +02:00
Kirkhammett
8943ad1640 DB/SAI: Add support for Matthias Lehner Quest Chain 
included Dr-j comment on PR
Closes #9783
 2013-05-22 21:50:45 +02:00
Aokromes
ec7dda85c3 Rename 2013_05_xx_xx_world_misc.sql to 2013_05_21_01_world_misc.sql 2013-05-22 01:22:52 +03:00
Bezo
178cb300d1 Implement .arena commands - add new commands to the core to handle with arena teams. 
*.arena create [player] "arena name" [type]
	*.arena create "arena name" [type]
	*.arena disband [TeamID]
	*.arena rename "oldName" "newName"
	*.arena captain [TeamID] [Player]
	*.arena info [TeamID]
	*.arena lookup [name]
 2013-05-22 00:50:51 +03:00
Vincent-Michael
75c4f28442 Core: Fix warnings 2013-05-21 19:18:55 +02:00
Aokromes
78840516f1 Merge pull request #9827 from Ascathor/master 
Core/Command: Rework .PInfo and give more output and add Gender to trinity_string
 2013-05-21 09:41:18 -07:00
Spp
ec0688ade3 Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict) 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-05-21 11:27:12 +02:00
Spp
1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review) 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-05-21 09:41:13 +02:00
Kinzcool
0dc9353746 DB/Triggers: Added "anti-exploration" teleport for Scholomance. 2013-05-19 22:06:09 -04:00
Ascathor
051d6ef925 Core/Command: Rework PInfo and give more output and add Gender to trinity_string 
* Prints out in several strings instead of few
* Leaves unnecessary ones out (e.g. phase for GMs)
* Some code documentation included (including doxygen)
* Cleaner code (partly)
* Prints more content, e.g.:
** Localized Class- and Race names
** Localizable Gender names
** Current experience, required experience
** And more

Shoutouts to @Nay, @Subv, @Shauren and several others from the irc

Core/Command: Rework PInfo and give more output and add Gender to trinity_string
 2013-05-20 03:09:34 +02:00
Gacko
b88133b366 DB: Several runtime error fixes 2013-05-20 01:35:02 +02:00
Vincent-Michael
1eac9c2944 DB/Creature: Fix startup error (thx Runico) 2013-05-19 23:57:03 +02:00
Nay
9b84c8fb98 DB/Characters: Remove guildId from characters table (characters_database.sql only) 
This field was dropped long ago in 1a290f17f5

Thanks to Aokromes for spotting the issue
 2013-05-16 23:28:57 +02:00
Vlad
e823f8d1f7 Fix startup errors. 2013-05-16 23:44:01 +03:00
Shauren
823924c061 Merge pull request #9799 from xjose93/DamageGO 
Core/Commands: Improve .damage command, now can damage destructible gameobjects => ".damage go <guid> <damage>"
 2013-05-14 09:09:07 -07:00
xjose93
e858057eff Core/Commands: Improve .damage command, now can damage destructible gameobjects => ".damage go <guid> <damage>" 2013-05-14 18:07:13 +02:00
horn
0a0698b1d4 Scripts/Ulduar: Yogg-Saron 
Known issues:
- encounter doesn't start immediately after you enter the room, you need to go closer
- players standing outside of the room are not turned Insane after 15 seconds
- encounter resets if the last living player is gripped by Constrictor Tentacle or encased in Hodir's Flash Freeze
- Hodir won't freeze multiple players when they die at the same moment
- Flash Freeze missile (64176) won't hit anybody, probably cast too soon (cosmetic issue)
- there are some unused spells, don't know when or why they should be cast
- some spell animations hit multiple players, but they shouldn't do that
 2013-05-14 17:52:37 +02:00
Vlad
78195b3c54 Allow use effectIndex in spell_target_position. 2013-05-13 11:30:48 +03:00
Shauren
64f0e99958 Core/StatSystem: Implemented mastery. 2013-05-12 17:56:37 +02:00
Pitcrawler
16074667c0 DB/Quests: Fix: The Focus on the Beach, Atop the Woodlands, The End of the Line 
Closes #367 #1848
 2013-05-12 14:08:42 +02:00
Warpten
1c91680f9c DB/Spells: Fixed server startup after 492c695021. 2013-05-11 23:09:37 +02:00
Shauren
e2f8abd48d Core/Spells 
* Removed area MiscValue check for spells with SPELL_EFFECT_BIND, it's purpose is only to be sent in packets, not determine real area player will be bound to.
* Corrected guid sent in SMSG_PLAYERBOUND, it should be caster's guid, not player's
* Also updated position for Teach: Death Gate

Closes #9661
 2013-05-11 12:16:36 +02:00