Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,685 Commits 4 Branches 146 Tags
052e47780ef9852665287fe76edd51a5911674b0
Commit Graph

2675 Commits

Author SHA1 Message Date
Vincent_Michael
052e47780e Core/ZulGurub: Move mondokir hardcoded spawn in db 2013-02-27 18:24:22 +01:00
Spp
03505a3a42 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp
 2013-02-27 04:08:19 +01:00
Spp
480c6cf4dd Core/RBAC: Add .reload rbac command and prevent possible crash if rbac_permissions has wrong data 2013-02-27 03:30:53 +01:00
Shauren
6ccad9adc4 Scripts/Blackwing Lair: Fixed crash happening with Shadows of Ebonroc 2013-02-26 22:20:15 +01:00
Shauren
af4ac778d7 Core/Quests: Implemented quest flag forcing the player to be flagged for PvP as long as the quest is in his log. 2013-02-26 17:14:13 +01:00
Vincent_Michael
cd24526aac Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-26 16:11:15 +01:00
Nay
b00f6a981e Merge pull request #9295 from horn/summons 
Script/Commands: Make creature_summon_groups table reloadable.
 2013-02-25 17:17:53 -08:00
Vincent_Michael
8d64a77bc0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-25 23:10:45 +01:00
Vincent_Michael
447b23c3bb Core: Whitespace cleanup 2013-02-25 19:54:41 +01:00
Vincent_Michael
529c4b7592 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp
 2013-02-25 17:11:36 +01:00
Spp
367d3ccc4f Core/RBAC: Create new permissions 'Use staff badge in chat' and 'Check if should appear in .gm ingame command' 2013-02-25 15:48:18 +01:00
Spp
cb0456fedc Core/RBAC: Create new permissions 'Instant .save', 'Allow params with .unstuck', 'Full HP after resurrect' 2013-02-25 15:48:18 +01:00
Spp
e6087b5563 Core/RBAC: Create new permission 'Be assigned ticket' 2013-02-25 15:48:18 +01:00
Spp
1638092f18 Core/RBAC: Create 'Skip instance required bosses check' permission 2013-02-25 15:48:18 +01:00
Spp
15343d9bb0 Core/RBAC: Remove unnecessary header includes from other header files 2013-02-25 15:48:17 +01:00
horn
c34f1aebe6 Script/Commands: Make creature_summon_groups table reloadable. 2013-02-24 23:50:08 +01:00
Gacko
cb99c1d16a Script/Quest: The Lonesome Watcher (12877) 
Closes: #9185
See: http://www.youtube.com/watch?v=ylZRMu9CIMw
 2013-02-24 19:42:21 +01:00
Vincent_Michael
1fba352a88 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-24 15:55:34 +01:00
Shauren
06257d1034 Core/Movement: Do not attempt to pathfind for stop/turn movement 2013-02-24 14:48:03 +01:00
Vincent_Michael
c0c2e533a9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
 2013-02-21 00:45:02 +01:00
Nay
4540a1d24b Merge pull request #9168 from Kirkhammett/Ebonroc_Bwl 
Npc/Core: Was using Onyxia's Wing Buffet spell which can 1 shot lowbies...
 2013-02-19 15:11:27 -08:00
Vincent_Michael
0c16890774 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	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_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2013-02-19 18:57:36 +01:00
Shauren
5b414bb813 Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value 2013-02-19 17:35:27 +01:00
Nay
03f97f75ec Core/Startup: Write current and expected maps version when there's a version mismatch 2013-02-19 01:16:24 +00:00
Nay
e7dbb4296c Scripts/Spells: Fix Winter Veil PX-238 
Ref #9238
Thanks @joschiwald
 2013-02-18 22:15:58 +00:00
Vincent_Michael
71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Nay
028c72a9f2 Core/NPCs: Refactor equipments 
- creature_template.equipment_id deleted
- creature_equip_template.entry == creature_template.entry
- id field added to creature_equip_template -> PK(entry, id)
- id field in creature_equip_template starts at 1
- creature.equipment_id references id of creature_equip_template
- creature.equipment_id = 0 means no equipment at all (default 1)
- creature.equipment_id = -1 means pick a random equipment from creature_equip_template
- add equipment info to .npc info command

While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments
 2013-02-18 12:24:18 +00:00
Shauren
e49aaab6f6 Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line 2013-02-17 02:10:08 +01:00
Vincent_Michael
166a2092fd Scripts/BWL: Fix build no. 2 2013-02-16 18:15:32 +01:00
Nay
f95ce01b15 Scripts/BWL: Fix build 2013-02-16 17:12:10 +00:00
Nay
a614dd775c Say NO to whitespace 2013-02-16 17:04:44 +00:00
Gigatotem
2e08db9ce9 Scripts/BWL: Fix typo in recent commit. 2013-02-16 16:56:06 +00:00
Gigatotem
920cd0e923 Scripts/Blackwing Lair: Broodlord Lashlayer clean-up. 2013-02-16 16:42:17 +00:00
Machiavelli
8bbcc2f37c Merge pull request #9214 from Aokromes/master 
Scripts/Ulduar: Kologarn's gate should be open while in combat
 2013-02-16 01:08:58 -08:00
Nay
82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
w1sht0l1v3
1ce1ec0775 Scripts/TheStormPeaks: Cosmetic changes. 2013-02-15 16:36:01 +02:00
w1sht0l1v3
7d881a0739 Scripts/TheStormPeaks: Cold Hearted quest update. 
Fix a crash.Thx @DDuarte.
Closes #8865
Move waypoint data from script  to DB table.
 2013-02-15 15:51:18 +02:00
Vincent_Michael
6beda05e3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.h
 2013-02-15 14:23:21 +01:00
WishToDie
45363b8216 Scripts/Gundrak: Drakkari Colossus 
Drakkari Colossus should not move when in freeze phase.
 2013-02-14 22:54:06 +02:00
Aokromes
b38fc89db3 Scripts/Ulduar: Kologarn's gate should be open while in combat 
Source: personal experience and http://youtu.be/JcOiyNaKDlg?t=18s
 2013-02-14 09:48:46 +01:00
Vincent_Michael
3c5bf554ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-13 21:48:09 +01:00
Shauren
d926ad63c0 Core/Spells: Fixed charge effects with non-explicit targets 2013-02-13 20:21:26 +01:00
Vincent_Michael
d292b05ac1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-12 21:21:06 +01:00
Kirkhammett
f7944aaedf Fixup for last commits. 2013-02-12 14:59:44 +01:00
Shauren
20cd6cfc61 Scripts/Icecrown Citadel: Fixed possible crash for Necrotic Plague (if cast outside of ICC) 
Closes #9188
 2013-02-12 12:39:48 +01:00
zwerg
e5e970baec Core/Spells: Fix cooldown problems for Val'anyr, Hammer of Ancient Kings 
Closes #9162
 2013-02-09 23:19:18 +01:00
Nay
984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
 2013-02-09 20:33:30 +00:00
Gacko
a7eef6a598 Script/Quest: Kodo Roundup 
Closes #943
 2013-02-09 16:24:31 +01:00
thomas33
82c31e50bb typo 2013-02-07 16:10:10 +01:00
Vincent_Michael
5b45a87da5 Core: More clean up whitespace 2013-02-07 00:24:00 +01:00