Commit Graph
492 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
Shauren 6ccad9adc4 Scripts/Blackwing Lair: Fixed crash happening with Shadows of Ebonroc 2013-02-26 22:20:15 +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
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
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
Kirkhammett f7944aaedf Fixup for last commits. 2013-02-12 14:59:44 +01:00
click 75994b3dd3 Core: Clean up whitespace, and remove a silly warning in boss_lurker_below.cpp 2013-02-07 00:19:19 +01:00
Vincent_Michael 943c866da9 Core: Whitespace cleanup 2013-02-07 00:02:22 +01:00
Spp f7c7f0f0f6 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/scripts/Kalimdor/zone_durotar.cpp
2013-02-05 09:57:14 +01:00
m7nu3l f9654d52e0 Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality. 2013-02-04 19:18:48 -03:00
Vincent_Michael 06041bc423 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
2013-02-03 01:50:51 +01:00
Vincent_Michael 847cafc121 Scripts/Misc: Some code optimisations 2013-02-03 00:38:34 +01:00
Vincent_Michael f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
2013-01-31 00:10:17 +01:00
Gacko dbecf05e39 Core: Logical fixes and improvements in EventMap 2013-01-30 18:39:34 +01:00
Vincent_Michael 8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Spp 709129f222 Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
Conflicts:
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/Formulas.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Waypoints/WaypointManager.cpp
	src/server/game/Skills/SkillDiscovery.cpp
	src/server/game/Skills/SkillExtraItems.cpp
	src/server/game/Warden/WardenCheckMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
2013-01-30 11:57:02 +01:00
Spp 8cd408ae6c Core/Misc: Some changes to minimize differences with 4.3.4 branch 2013-01-30 10:34:18 +01:00
Nay 4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
Gacko 29cd1dbec1 Core/Quest: Bloody Breakout
Closes #641
2013-01-28 19:50:01 +01:00
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-28 01:04:37 +00:00
Northstrider da060b1948 Scripts: apply more TC codestyle 2013-01-22 00:07:36 +01:00
Northstrider 3bf7fcef55 Scripts: apply some TC codestyle to instance script 2013-01-22 00:02:08 +01:00
Northstrider 8c64ceda79 Scripts: removed a unneeded header 2013-01-21 23:49:23 +01:00
Northstrider 93c7f975b1 Scripts: implement Alizabal the misstress of hate
Todo: use the rest of the texts and add the missing ones
2013-01-21 23:47:17 +01:00
Vincent_Michael 367e1f7b2b Core: Fix warnings 2013-01-21 10:11:46 +01:00
Aokromes 321b425f36 Update COPYING
Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-01-21 02:47:51 +00:00
Nay 3523d84a91 Shooting myself in 3... 2... 2013-01-21 02:34:43 +00:00
Nay 2363552655 Scripts/ZG: Fix a warning and a compile error introduced in previous commit
Personal opinion: BossAI should not have a public field named "instance"
2013-01-21 02:24:25 +00:00
Nay c6c23d67b8 Scripts/ZG: Fix some code style issues and logic errors 2013-01-21 02:10:01 +00:00
Malcrom 33b7685696 Scripting/ZulGrub: Fix last commit 2013-01-20 18:20:46 -03:30
Malcrom b7dbc8d746 Scripting/Zulgrub: Updated Boss Arlokk Script. 2013-01-20 18:04:06 -03:30
Vincent_Michael ed44eea699 Core: Fix warnings 2013-01-19 20:28:29 +01:00
Vincent_Michael 0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Malcrom b115abde31 Script/Scholomance: Update Kirtonos the Herald script. 2013-01-17 19:50:11 -03:30
Spp 7d6634e363 Fix merge problem 2013-01-17 08:48:04 +01:00
Spp 0e8011657d Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Warpten faccbef869 Scripts/ZulGurub: I can do this!
Commiting stuff one hour after waking up is no good.
2013-01-16 07:18:47 +01:00
Warpten 3df4075a04 Scripts/ZulGurub: Fixed Hakkar's aspects. 2013-01-16 07:16:22 +01:00
Warpten 797be8d9ff Scripts/ZulGurub: Missing mass replace changes and typo/codestyle fixes. 2013-01-16 07:07:48 +01:00
Warpten 26bf10365e Scripts/ZulGurub: Forgotten change to previous commit. Damned Ctrl+S. 2013-01-16 06:55:46 +01:00
Warpten 803bf2f9cc Scripts/ZulGurub:
* Fixed non-PCH compile.
* Changed some codestyle on Mandokir.
* Fixed compile warnings and a few typos.
* Remove instance checks and use a wrapper to get AIs.
2013-01-16 06:51:59 +01:00