Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,762 Commits 4 Branches 146 Tags
c13e63456cbfa76284d6dc9ed130eb3629ea99c2
Commit Graph

576 Commits

Author SHA1 Message Date
Vincent-Michael
b684cd6079 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-21 23:49:38 +02:00
Shauren
3d6b88f5aa Fixed compile warnings 2013-07-21 14:17:24 +02:00
Vincent-Michael
63675c3b0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-07-17 20:24:29 +02:00
Malcrom
8462a09264 DB/Gossip: Added missing gossip for Royal Historian Archesonus. Removed cpp script. 2013-07-16 21:42:40 -02:30
Vincent-Michael
56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-07-15 18:04:04 +02:00
Vincent-Michael
7104e3c70f Core: Fix build 2013-07-15 17:44:32 +02:00
Vincent-Michael
de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Vincent-Michael
08c1a81096 Scripted/Misc: Fix random stuff 2013-07-15 01:01:37 +02:00
Nay
b56b282eee Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.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/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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_kilnara.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/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.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_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.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_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2013-07-14 16:10:20 +01:00
Vincent-Michael
e464d2bd2c Scripted: Some cleanups + ninja changes 2013-07-08 21:15:23 +02:00
Nay
3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Vincent-Michael
6079f369af Scripted/Misc: Some cleanup 2013-07-06 01:00:05 +02:00
Vincent-Michael
f97cf4a1d8 Scripted/Eversong Woods: Add Missing cleanup 2013-07-05 17:32:38 +02:00
Vincent-Michael
f46f7a3414 Misc: 
- Fix missing newlines
- Fix some startup errors
 2013-07-05 17:21:21 +02:00
Vincent-Michael
644e75487d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.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_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.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/zone_arathi_highlands.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
	src/server/scripts/Spells/spell_item.cpp
 2013-07-04 23:08:02 +02:00
Vincent-Michael
b4d4e04f53 Scripts/Misc: Rename creatures with mob_ / mobs_ in npc_ 
Note: Have fun :P
 2013-07-04 22:11:47 +02:00
Aokromes
258df112a8 Core/Scripting: Allow Headless Horseman to be attacked 
Fix by digz6666.
Note: this script needs rewrite, any pull request doing it is welcome.
Closes #3568
 2013-07-02 17:38:07 +02:00
Malcrom
722f7068f2 Core/Scripting: More updates for BRS instance. Added missing scripts for urok and gizrul. 2013-07-01 10:19:18 -02:30
Malcrom
1eaf3c9c9d Core/Scripting: Gyth event still not finished but completable. 2013-06-30 13:39:07 -02:30
Shauren
112bc49c9a Core/Units: Removed most calls to SendMovementFlagUpdate for creatures 2013-06-30 16:31:24 +02:00
Vincent-Michael
ece52c11d2 Core: Fix build 2013-06-30 13:00:39 +02:00
Malcrom
4ed70c7094 Core/Scripting: A few fixes for Blackrock Spire. Emberseer now setting properly after wipe and Gyth/Rend event is getting closer to complete. 2013-06-30 00:24:01 -02:30
Vincent-Michael
676c7341d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
 2013-06-30 00:36:03 +02:00
Krzysztof Rapacki
75f535c65e Scripts/Blackwing Lair: Fixed out of bounds array access 2013-06-27 09:45:49 +02:00
Aokromes
9ea2b218cb Core/Scripting: Typo fix 2013-06-27 03:23:23 +02:00
Malcrom
651a966e92 Core/Scripting: More BRS updates. Emberseer is still buggy if player resets. Working on it. 2013-06-26 15:38:19 -02:30
Aokromes
563c75c3e9 Core/Scripting: Typo fix 2013-06-26 10:36:10 +02:00
Malcrom
caa214d396 DB/Creature_text: 2013-06-26 01:18:12 -02:30
Vincent-Michael
6c9e810a63 Core: Fix warnings 2013-06-25 20:49:51 +02:00
Vincent-Michael
711c68d3f3 Core: Fix non pch build 2013-06-25 20:16:54 +02:00
Malcrom
1149292fe1 Core/Scripting: More fixes and updates for BRS Instance. 2013-06-25 15:36:16 -02:30
Malcrom
60159297f2 Core/Scripting: Gyth / Rend Event in progress. Pushing before Vincent Micheal makes ninja changes. 2013-06-25 00:15:41 -02:30
Malcrom
2f746d929a Core/Scripting: Emberseer event will now check to see if all players in instance are clicking altar. 2013-06-24 18:06:23 -02:30
Vincent-Michael
72c2a8cfa6 Core: Fix warnings 2013-06-24 18:59:59 +02:00
Vincent-Michael
b43688b684 Core: Fix non pch build 2013-06-24 18:33:40 +02:00
Malcrom
c31791493f Core/Scripting: Forgot a couple line endings. 2013-06-24 13:55:03 -02:30
Malcrom
eb74361470 Core/Scripting: Updated BWL Scripts. Thanks to gerripeach for the base. 
Closes #4952 #9283
 2013-06-24 13:48:02 -02:30
Malcrom
9726a5174e Core/Scripting: Start Scripting Gyth / Rend event for UBRS. Add creature text. 2013-06-24 03:47:44 -02:30
Vincent-Michael
7d429145eb Core: Fix non pch build 2013-06-24 06:37:56 +02:00
Malcrom
fc4652964e Core/Scripting: A few updates. 2013-06-24 01:26:58 -02:30
Malcrom
d791515502 Core/Scripting: Hopefully this calms tcbuid. 2013-06-24 00:34:37 -02:30
Malcrom
dc55188edd Core/Scripting: I hate you tcbuild. 2013-06-23 23:34:36 -02:30
Malcrom
d9c819a65d Core/Scripting: tcbuild is being a bitch and SD2 had nothing to do with this script. 2013-06-23 23:07:08 -02:30
Malcrom
a6711d5232 Core/Scripting: Update to Boss Emberseer Script. 2013-06-23 22:46:44 -02:30
Malcrom
9c0024d067 Core/Scripting: UBRS Boss Pyroguard Emberseer now scripted. 2013-06-23 22:22:40 -02:30
Malcrom
1a576fa7b2 Core/Scripting: UBRS Boss Pyroguard Emberseer closer to being fully scripted. 2013-06-23 16:16:42 -02:30
Malcrom
bb5ef1b462 Core/Scripting: Fix warning 2013-06-23 11:47:08 -02:30
Malcrom
7c19fb8d0e Core/Scripting: Runes in UBRS Dragonspire Hall now activate and open door. 
Closes #4414
 2013-06-23 11:32:57 -02:30
Malcrom
b669a2142e Core/Scripting: Some boss script fixes. 2013-06-23 11:27:33 -02:30
Shauren
6bccfe997c Merge fixups 2013-06-23 15:11:08 +02:00