Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,134 Commits 4 Branches 146 Tags
33c2bd5ce1f4f8d20981e9f7aea90e37de0abbda
Commit Graph

6542 Commits

Author SHA1 Message Date
DDuarte
33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.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_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte
86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
Malcrom
0e7805bac9 Db/Classlevelstats: Little fix for base warrior damage. 
I won't be working on this anymore until next year
 2013-12-31 13:52:16 -03:30
Malcrom
997d2adb21 DB/classlevelstats: Update mage exp0, exp1, exp2 base damage 2013-12-31 00:05:54 -03:30
Malcrom
ba43e38d6f DB/classlevelstats: Exp1 & Exp2 Paladin base damage. 
Exp1 57 to 60 and 71 to 73 estimated.
Exp2 67 to 70 and 81 to 83 estimated.
 2013-12-30 22:12:34 -03:30
Malcrom
27c58c3ed8 DB/Classlevelstats: Fix damage for Exp0 Paladin Class. 
25, 55, 59, and 61 to 83 are estimated all others are accurate.
 2013-12-30 21:28:39 -03:30
Malcrom
99b0ee19ca DB/ClassLevelStats: All stats for testing. 2013-12-30 11:28:01 -03:30
Malcrom
b1431bdd47 DB/Classlevelstats: Base damage for expansion 1 2013-12-29 23:31:07 -03:30
Malcrom
6c74d660bd DB/Classlevelstats: Add base damage for exp2 2013-12-29 21:17:48 -03:30
Malcrom
765cd83237 DB/Creature_classlevelstats: update attack power. 2013-12-28 13:56:44 -03:30
Malcrom
b854e5b696 DB/SAI: Fix for quest 12449 & 12417 from MitchesD. 
Closes #11373
 2013-12-28 11:17:15 -03:30
Malcrom
6304c8d593 DB/Creature_classlevelstats: Add attack power. Rogue class still lacking data. 2013-12-28 10:39:45 -03:30
Malcrom
e62ad6acfc DB/Creature_classlevelstats: Prepare table for attack power and damage. 2013-12-28 10:32:58 -03:30
joschiwald
8d57e081e2 Merge pull request #11359 from MitchesD/obsidian_sanctum 
Scripts/ObsidianSanctum: added creature_formations for surrounding creatures and some clean up
 2013-12-27 13:58:25 -08:00
MitchesD
3921f20c18 Scripts/ObsidianSanctum: added creature_formations for surrounding creatures and some clean up 2013-12-27 19:56:01 +01:00
Malcrom
51af314875 DB/SAI: Fix AI for Lord Kragaru 2013-12-27 11:25:11 -03:30
Malcrom
fa29ddc529 Db/Misc: Fix more dup aura messages. 2013-12-25 12:39:47 -03:30
Malcrom
06edb4dca2 DB/Misc: Fix some more dup aura errors. 2013-12-25 11:40:40 -03:30
Malcrom
baf04e4674 Db/Misc: Fix a few more dup aura errors. 2013-12-25 10:46:26 -03:30
Malcrom
18f523fff7 DB/Misc: Fix a couple errors I introduced. 2013-12-25 09:05:32 -03:30
Malcrom
b8e626199c Scripting/Multi: Some cleanup. 2013-12-24 17:56:38 -03:30
Kinzcool
00b123bc5a DB/Gameobjects: Added a few missing gameobject templates. 2013-12-24 13:05:35 -05:00
Malcrom
9d2d4ba921 Scripting/Hellfire: Moved some gossip to db and fix some magic numbers. 2013-12-24 12:15:41 -03:30
Malcrom
eacc165a12 Scripting/Ghostlands: Moved some gossip to db and fixed some magic numbers. 2013-12-24 08:39:35 -03:30
joschiwald
fd6167cf66 Scripts: 
- cleanup obsidian sanctum script
- prevent yelling texts if non player died in some scripts
 2013-12-23 23:55:15 +01:00
Malcrom
47ac6d9731 DB/Creature: Fix InhabitType for Val'kyr Battle-maiden. 
Closes #11347
 2013-12-23 18:35:22 -03:30
Malcrom
1038fd8a86 DB/SAI: Fix a couple errors. 2013-12-23 17:15:31 -03:30
Malcrom
a2c3736e76 DB/Condition: Add Conditions for Captured Sunhawk Agent gossip text 2013-12-23 16:39:38 -03:30
Malcrom
7ef49db25d Scripting/Bloodmyst Isle: Moved Captured Sunhawk Agent gossip to db. 2013-12-23 16:20:04 -03:30
Malcrom
59ac2437d8 Scripting/Blasted Lands: Fixed up gossip and teleport spell for quest 3628. 
Can someone please test this. I can't do group testing locally.
Also snuck in a fix for zone_axshara.cpp
 2013-12-23 13:36:36 -03:30
Malcrom
ab3eced989 Scripting/Misc: Some cleanup. 2013-12-23 12:12:31 -03:30
Malcrom
59eca906ef Scripting/Blades Edge: Moved gossip to db for Overseer Nuaar and Sai'kkal the Elder. 2013-12-23 11:19:21 -03:30
Malcrom
6402fa02ac Scripting/Storm Peaks: A little work on Quest 13010 Krolmir, Hammer of Storms 2013-12-23 01:31:30 -03:30
Malcrom
8dd3c764fc DB/SAI: Fix a few linking errors. 2013-12-22 22:05:23 -03:30
Malcrom
d741335a02 DB/Creature_text: Updated more text from sniff. 2013-12-22 20:18:07 -03:30
Malcrom
8aef1748bf DB/Creature text: Added some missing text from sniff. 2013-12-22 18:38:46 -03:30
Malcrom
dde35888f9 DB/Misc: Cleanup some more dup aura errors and fix an SAI. 2013-12-22 15:20:02 -03:30
Malcrom
5055a8fde4 Scripting/Bloodmaul Brute: CombatAI moved to cpp for quest 10512. 2013-12-22 14:41:37 -03:30
Malcrom
bc9961ec5c DB/Misc: Fix Typo 2013-12-22 13:06:59 -03:30
Malcrom
fe2d21b0ae DB/Creature: Remove double spawn of Talonpriest Skizzik 2013-12-22 13:06:04 -03:30
Malcrom
b2c0a3d6d9 DB/quest_template: [FIX] Wrong Previous quest for 12836 Expression of Gratitude from DRJ 
Closes #11334
 2013-12-22 13:01:21 -03:30
Malcrom
f29c50ab36 DB/Misc: Moved npc Axle gossip to db. No npc's left with AIName & Scriptname. 2013-12-22 12:57:31 -03:30
Malcrom
34ce605a2c Scripting/DB: Fixed some npcs so they wouldn't have AIName & scriptname. 2013-12-22 11:43:10 -03:30
Malcrom
ff1773dedf DB/SAI: Converted a few SAI to use CMC and converted all using Caster Template. 2013-12-22 10:46:56 -03:30
Discover-
42a365af8b DB/SAI: Fix a typo for all comments of smart_scripts using SMART_ACTION_INC_EVENT_PHASE (9ac96fd702). It now properly prints with how much the phase was incremented, instead of always saying it incremented by zero. 2013-12-21 21:03:29 +01:00
Vincent_Michael
f31baacb10 SQL: LQS elif emaneR 2013-12-20 23:04:13 +01:00
Vincent_Michael
52a5213e46 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-20 17:26:42 +01:00
Vincent_Michael
736093e91b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
 2013-12-20 17:26:27 +01:00
Discover-
9ac96fd702 DB/SAI: Convert 28.236 smart_scripts (almost all, like 20 left behind) to proper commenting. Used this tool: https://github.com/Discover-/SAI-Comment-Converter 2013-12-20 14:19:41 +01:00
Malcrom
eb57c4fed0 DB/Conditions: Fix a condition in earlier commit 2013-12-20 08:03:47 -03:30