Malcrom
|
a8374bd001
|
Core/Scripting: Some cleanup
|
2013-01-07 18:39:30 -03:30 |
|
Malcrom
|
55d3e8adaa
|
Core/Scripting: Move Text for Zul'jin to creature text
|
2013-01-07 18:14:30 -03:30 |
|
Malcrom
|
61fa397117
|
Core/Scripting: Move Text for Baron Rivendare to creature text.
|
2013-01-07 17:22:14 -03:30 |
|
Malcrom
|
74b4dbec3f
|
Core: Scripting: Convert Text for boss Archaedas to creature text
|
2013-01-07 15:54:11 -03:30 |
|
Malcrom
|
9d1ad8ab3a
|
Core/Scripts: Move text for Boss Akil'zon to db.
|
2013-01-07 15:31:38 -03:30 |
|
Malcrom
|
601f118f29
|
Core/Scripting: Move some text to creature text.
|
2013-01-07 14:20:52 -03:30 |
|
Malcrom
|
1bb8b9325a
|
Core/Scripting: Script Updates
|
2013-01-07 12:48:28 -03:30 |
|
Malcrom
|
0533d63a77
|
Core/Scripting: Gong Event updates
|
2013-01-07 12:34:58 -03:30 |
|
Vincent_Michael
|
ecedb798aa
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Conditions/ConditionMgr.h
|
2013-01-07 16:39:01 +01:00 |
|
Malcrom
|
c3166b8608
|
Core/scripting: Fix zulaman.cpp
|
2013-01-06 23:16:06 -03:30 |
|
Malcrom
|
14feb316e1
|
Core/scripting: Update zulaman script
|
2013-01-06 22:58:58 -03:30 |
|
Malcrom
|
832cd198ca
|
Core/scripting: More updates for gong event. Almost complete.
|
2013-01-06 22:39:41 -03:30 |
|
Malcrom
|
3710ca5faf
|
Core/Scripting: Small fix to Zul'Aman script Thanks joschiwald.
|
2013-01-06 12:38:26 -03:30 |
|
Malcrom
|
8361931b37
|
Core/Scripting: Move Kirtonos pathing to db looks smoother.
|
2013-01-06 12:04:02 -03:30 |
|
Malcrom
|
90c182dce4
|
Core/Scripting: Fix silly error
|
2013-01-06 01:08:25 -03:30 |
|
Malcrom
|
82d4559507
|
Core/Script: Update Gong Event
|
2013-01-06 01:05:25 -03:30 |
|
Malcrom
|
ed83397a67
|
Core/Scripts: Some cleanup of Zul'aman Instance script. Gong event in progress and will allow doors to open.
|
2013-01-05 20:15:46 -03:30 |
|
Malcrom
|
385940aeea
|
Core/Scripting: Fix typo
|
2013-01-05 18:10:14 -03:30 |
|
Vincent_Michael
|
ff3928ca6d
|
Core: Fix warnings
|
2013-01-05 20:30:57 +01:00 |
|
Vincent_Michael
|
d5163d846f
|
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/game/Achievements/AchievementMgr.cpp
|
2013-01-05 17:01:46 +01:00 |
|
Malcrom
|
3661353e12
|
Core/Scripting: Fix Typo.
|
2013-01-04 19:58:16 -03:30 |
|
Malcrom
|
e0a5aabaf7
|
Core/Scripting: Update Kirtonos script.
|
2013-01-04 19:41:57 -03:30 |
|
Malcrom
|
bf19adec0f
|
Core/Scripts: Some cleanup for boss_kirtonos_the_herald script
|
2013-01-04 12:34:35 -03:30 |
|
Malcrom
|
306d59cb51
|
Core/Scripting: Add a few includes to boss_kirtonos_the_herald.
|
2013-01-04 07:25:32 -03:30 |
|
Malcrom
|
e8ca1d5cd1
|
Core/Scripting: Add Kirtonos The Herald to c++ scripting. Combat still not finished.
|
2013-01-04 01:00:51 -03:30 |
|
Vincent_Michael
|
a28d2d22f3
|
Core: Fix non pch build
|
2013-01-03 23:40:12 +01:00 |
|
Spp
|
d35d33aa86
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Object/ObjectDefines.h
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/CMakeLists.txt
|
2013-01-03 09:17:53 +01:00 |
|
Malcrom
|
dbfc4b83aa
|
Core/Scripting: Some file name updates.
|
2013-01-02 15:08:13 -03:30 |
|
Malcrom
|
38c55a15ad
|
Core/Scripting: Rename zone scripts.
|
2013-01-02 14:52:13 -03:30 |
|
Vincent_Michael
|
cc99c739c6
|
Core/MT: Fix model for "Pure Energy"
Closes #8838
|
2013-01-02 16:58:23 +01:00 |
|
Spp
|
6b668c8337
|
Core/Misc: Update headers to 2013
|
2013-01-02 13:31:19 +01:00 |
|
Spp
|
aed36a8375
|
Merge branch 'master' into 4.3.4
Conflicts:
dep/libmpq/CMakeLists.txt
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
|
2013-01-02 13:30:51 +01:00 |
|
Shauren
|
312e8509dd
|
Core/Spells: Implemented SPELL_EFFECT_RESURRECT_WITH_AURA (effect number 172)
|
2013-01-01 21:57:31 +01:00 |
|
Vincent_Michael
|
cc65aba789
|
Update copyright note for 2013.
Happy new year.
|
2013-01-01 00:41:01 +01:00 |
|
Vincent_Michael
|
8431be6bc6
|
SQL: rename sql for 4.3.4
Core/ZulGurub: revert my logic fail in 4232658c62
|
2012-12-31 14:15:24 +01:00 |
|
Vincent_Michael
|
4232658c62
|
Core:/ZulGurub: Fix mandokir decapitate targets
|
2012-12-31 12:58:16 +01:00 |
|
Vincent_Michael
|
834f98f6bb
|
Core/ZulGurub: Added script for Bloodlord Mandokir
ToDo: Remove hack :P
|
2012-12-30 03:02:39 +01:00 |
|
Vincent_Michael
|
d3d9dfd734
|
Core/Script: Add some talks for Zul'Gurub
|
2012-12-24 21:38:28 +01:00 |
|
Vincent_Michael
|
accc83a76d
|
Core/Scripts: Fix typo
|
2012-12-24 17:22:33 +01:00 |
|
Vincent_Michael
|
ec6f7541b7
|
Core: Fix merge fail
|
2012-12-24 14:38:31 +01:00 |
|
Spp
|
80b1b6c494
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/moonglade.cpp
|
2012-12-19 08:23:34 +01:00 |
|
Gacko
|
40292d9a19
|
Core/DB: Assign texts to correct creatures
Also convert some never used script texts to creature text for future use.
Some scripts or Talk() calls need to be implemented first.
Solves #8659
|
2012-12-18 15:19:13 +01:00 |
|
Spp
|
a227a34947
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/PetAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
|
2012-12-17 12:13:51 +01:00 |
|
Gacko
|
d34a9df70a
|
Core/DB: Last fixes for creaturetext conversion
|
2012-12-09 20:03:17 +01:00 |
|
Spp
|
fb2e5c3c58
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/azshara.cpp
src/server/scripts/Kalimdor/azuremyst_isle.cpp
src/server/scripts/Kalimdor/darkshore.cpp
src/server/scripts/Kalimdor/durotar.cpp
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
src/server/scripts/Kalimdor/feralas.cpp
src/server/scripts/Kalimdor/moonglade.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
src/server/scripts/Kalimdor/tanaris.cpp
src/server/scripts/Kalimdor/the_barrens.cpp
src/server/scripts/Kalimdor/thousand_needles.cpp
src/server/scripts/Spells/spell_generic.cpp
|
2012-12-07 09:22:43 +01:00 |
|
Gacko
|
a73a7dc43f
|
Core/DB: Creature text for 37 script files
|
2012-12-02 19:13:57 +01:00 |
|
Spp
|
404129963c
|
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ArenaTeamHandler.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSpline.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Spells/Auras/SpellAuraDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_disable.cpp
src/server/scripts/EasternKingdoms/Karazhan/karazhan.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_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/ungoro_crater.cpp
src/server/shared/Packets/ByteBuffer.h
src/tools/map_extractor/dbcfile.h
|
2012-11-27 14:15:12 +01:00 |
|
Spp
|
e954498560
|
Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch
|
2012-11-27 13:03:12 +01:00 |
|
Vincent-Michael
|
8a7ec89883
|
Core: Fix warnings
|
2012-11-27 12:36:38 +01:00 |
|
Spp
|
99e050fb27
|
Core/Misc: Tab2spaces, remove trailing whitespaces and remove dupe code after merge
|
2012-11-27 11:56:23 +01:00 |
|