Gacko
3bfce15019
Core/DB: Corrections for creature text conversion
2012-11-26 23:13:56 +01:00
Gacko
7accb42cc4
Core/DB: Convert 25 more scripts to creature text
2012-11-26 22:55:12 +01:00
Spp
8ae0f2332c
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
src/server/scripts/Kalimdor/azshara.cpp
2012-11-26 08:43:29 +01:00
Vincent-Michael
ea60648c88
Core: Fix typo
2012-11-24 00:25:56 +01:00
Gacko
4065176897
Core/DB: Convert 14 more scripts to creature text
2012-11-23 16:25:59 +01:00
Gacko
27619b2bd7
Core/DB: Chapter 5 in creature text
2012-11-23 15:59:11 +01:00
Gacko
a66adcf6e1
Core/DB: Chapter 2 in creature text
2012-11-23 15:59:10 +01:00
Gacko
14b728255c
Core/DB: Converted 11 scripts to creature text
2012-11-23 15:59:10 +01:00
Spp
3cf7eb23f9
Missing change from merge
2012-11-22 15:08:28 +01:00
Spp
b9b57c2d62
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
2012-11-22 15:04:59 +01:00
Tuxity
f5a54f8cbe
Misc: Whitespace and tabs cleanup
2012-11-21 18:26:28 +01:00
Vincent-Michael
84d88cbcec
Core: Fix warnings
2012-11-21 00:43:24 +01:00
Vincent-Michael
695836cb01
Core: Fix non pch build
2012-11-21 00:15:58 +01:00
ZxBiohazardZx
8bd462b6d1
Core/scritps: change enum to fix compile
2012-11-20 23:20:14 +01:00
ZxBiohazardZx
074b2e3936
Merge pull request #8371 from Gacko/creaturetext
...
Core/DB: Some script to creature text conversions...
2012-11-20 13:53:55 -08:00
Gacko
1e5e7056dc
Core/DB: Converted 7 more scripts to creature text
2012-11-20 22:03:10 +01:00
Spp
08b7439f48
Typo Fix after 81606e5 (Thanks to vlad852 for noticing)
2012-11-20 19:02:58 +01:00
Gacko
9dc06f8bd9
Core/DB: Some script to creature text conversions...
2012-11-20 18:08:18 +01:00
Spp
1ecc55272e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/GameObjectAI.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
2012-11-20 16:01:31 +01:00
Spp
7bef4ce401
Core/Misc: Reduce header dependencies - Step III
2012-11-20 15:03:56 +01:00
Spp
81606e5d1e
Core/Misc: Define some methods const
2012-11-20 09:29:52 +01:00
Spp
bf8b642a47
Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
2012-11-19 12:02:33 +01:00
Spp
7f061fc57f
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Chat/Chat.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2012-11-19 10:09:58 +01:00
Subv
a337abc436
Scripts/Instances: Added missing definition from previous commit.
2012-11-18 20:53:27 -05:00
Subv
bbe146d104
Scripts/Instances: Save Magister's Terrace door (and statue) state.
...
Closes #6889
2012-11-18 20:33:03 -05:00
Spp
b99c347747
Core: Remove Player.h dependency from all the possible headers
2012-11-17 05:18:37 +01:00
Tuxity
516c6d31ec
Merge branch 'master' into 4.3.4
2012-11-11 18:53:01 +01:00
Warpten
51b23af98d
Core/Scripts: Cleanup alterac_valley.cpp.
2012-11-09 18:14:30 +01:00
ille
dd2e02f157
Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget()
2012-11-05 12:44:45 +01:00
Spp
c97fc99e16
Merge branch 'master' into 4.3.4
...
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp
876ad50dcd
Core/Misc: Tweaked ThreatContainer internals
...
(and many cosmetic changes here and there)
2012-10-26 14:31:19 +02:00
Spp
60d4343d8e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Spells/Spell.cpp
src/server/shared/Logging/Appender.h
2012-10-23 14:16:05 +02:00
Spp
663db1cee3
Core/Misc: Add default count param to HasItemCount
2012-10-23 13:11:57 +02:00
Subv
1fc3aad9d7
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCfmt.h
src/server/game/DungeonFinding/LFGMgr.h
src/server/scripts/Kalimdor/feralas.cpp
2012-10-21 17:18:35 -05:00
durotar
998c74ebe0
Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script
2012-10-20 11:44:43 -05:00
durotar
e56ef015ab
Added some suggestions from Subv
2012-10-16 19:51:57 -05:00
durotar
290ddd64fe
Core/Script: Update creature_text for gnomeregan
2012-10-16 19:30:33 -05:00
Subv
a8fa67c53c
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
2012-10-10 10:29:18 -05:00
kaelima
2958f64ffc
Scripts/Misc: Correct two wrong urand's
...
(found by Aokromes)
2012-10-09 14:53:29 +02:00
Nay
44c2edee51
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Spells/SpellMgr.cpp
2012-10-07 14:57:18 +01:00
horn
c3f6c8141a
Core/LFG: Implemented seasonal bosses options and fixed entrance points for dungeons with multiple parts (like Dire Maul, Scarlet Monastery etc.)
...
TODO:
- implement spawning seasonal bosses by Dungeon Finder
- script seasonal bosses - all of them needs to call RewardDungeonDoneFor function in their JustDied to be able to complete dungeon (see boss_headless_horseman.cpp)
- replace lfg_entrances coords by sniffed values
- create missing template for item 54537 (Heart-Shaped Box)
2012-10-05 00:43:58 +02:00
Spp
f570383fba
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp
7831ecdb18
Core: "Initial support for C++11 compilers"
2012-10-02 15:06:19 +02:00
Spp
c4d4beff3b
Warning fixes and some minor changes here and there
...
- Added GetAchievementPoints to AchievementMgr
2012-09-18 11:35:18 +02:00
Nay
d6743c7c95
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
2012-09-10 00:52:35 +01:00
oMadMano
e377550280
Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer
...
Closes #5700
2012-09-09 16:24:06 +02:00
Nay
19b400761d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Unit/Unit.cpp
2012-09-07 03:36:47 +01:00
Aokromes
6970a28f24
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
...
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
2012-09-07 05:01:04 +03:00
Nay
874ddcb0ae
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
2012-09-03 16:11:46 +01:00
Elron103
1e361bc43a
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
2012-09-03 01:57:01 +02:00