Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,250 Commits 4 Branches 146 Tags
741f3dde2e880baf3439fe60f7166cea14b70196
Commit Graph

3925 Commits

Author SHA1 Message Date
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
Duarte Duarte
10dfe19f9c Scripts/BladesEdge: Fix a typo introduced in 430b3ad 
Thanks @Nihilianth
 2014-08-26 15:10:58 +01:00
DDuarte
430b3adfe8 Scripts: Correct despawn time of multiple objects 
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
 2014-08-26 13:37:55 +01:00
joschiwald
bc42c48d97 DB/Spells: added a few spells to spelldifficulty_dbc 2014-08-26 04:35:37 +02:00
jackpoz
4d9f8b926a Scripts/Commands: Change "few" commands to target current Player by default 2014-08-25 22:00:04 +02:00
Vincent-Michael
4bdedcb878 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-08-24 22:42:47 +02:00
jackpoz
7fa49c8d62 Scripts/Ruby Sanctum: Fix Halion event ai not being updated 
Fix Halion event ai not being updated due to private member hiding base class member.
Fixes #12835
 2014-08-24 20:35:44 +02:00
Vincent-Michael
10e00f32fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-24 17:24:20 +02:00
jackpoz
a3b14db015 Merge 'Numielle/master' into master 
This is a workaround required by the current spell system limitations.
Close pull request #11915 .
 2014-08-24 17:11:51 +02:00
Vincent-Michael
98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2014-08-24 16:33:29 +02:00
jackpoz
c20f92c08c Merge branch 'Rochet2/questreward' 
Close pull request #12657
 2014-08-24 14:38:55 +02:00
jackpoz
54d28af46d Merge branch 'PortgasDAce/1' into 4.3.4 
Close pull request #12731
 2014-08-24 14:04:54 +02:00
jackpoz
05d9dcd37f Merge branch 'Xanvia/ShoR' into 4.3.4 
Close pull request #9071
 2014-08-24 13:38:54 +02:00
Rochet2
9beae1dc97 Removed OnQuestComplete hook, use QuestReward instead. Implemented OnQuestStatusChange hook 
Also fixed some comments and added overrides
The OnQuestComplete hook was unused and didnt work properly
 2014-08-24 14:31:38 +03:00
Vincent-Michael
79b954a349 Core: meh, remove again whitespace :( 2014-08-24 02:46:14 +02:00
Vincent-Michael
560048cf33 Core: meh, fix build and warnings 2014-08-24 02:22:14 +02:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Vincent-Michael
4a29c73403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-23 16:41:54 +02:00
MitchesD
d109fc0d7c Scripts/SteamVault: Hydromancer Thespia rewritten to BossAI 2014-08-22 16:34:18 +02:00
Shauren
42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
 2014-08-21 23:59:00 +02:00
Dr-J
0c1587cc91 Remove Injured rainspeaker oracle cpp script 
Unneeded script
 2014-08-21 21:19:36 +01:00
Duarte Duarte
33da371812 Merge pull request #12813 from MitchesD/misc_2 
Scripts/ScarletMonastery: rewritten InstanceScript and some bosses conve...
 2014-08-21 14:45:32 +01:00
Unholychick
377f385c81 Scripts/Ulduar: Spellscripts for Mimiron 
Closes #12579

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-18 22:01:47 +01:00
Shauren
d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-08-15 20:13:34 +02:00
joschiwald
ccfa82e7d5 Core/Creature: update creature_template and some other small things 
http://www.trinitycore.org/f/topic/9572-creature-damage/
 2014-08-14 16:09:14 +02:00
Jared P. Jones
1b65cda948 Scripts/Icecrown Citadel: The Teleporters in ICC are now Blizzlike *Upon entering the raid, the Lights Hammer teleporter is no longer immediately active. Both the Light's Hammer and the Oratory Portal will pop up after the completion of Lord Marrowgar as it does on official during 3.3.5a. *A teleporter in ICC can no longer teleport you to itself. *There is no longer a reason to allow GMs to use portals without available GOSSIP text and teleport locations. Therefore the teleports now use GO_FLAG_NOT_SELECTABLE when they are unavailable. In the future we can enable GMs to use portals without bosses defeated, however for now all it does is break the instance if some bosses are done out of order. *Currently the Upper Spire teleporter cannot be visited unless the event ColdFlameTraps is completed. This isn't blizz-like. During WotLK retail, the teleporter in the upper spire can be visited once any member has walked over an AreaTrigger which is located the moment you enter the UpperSpire Facade. The cold flame event has nothing to do with the teleporter, the cold flame event instead should be triggered to "DONE" when a rogue instead disarms it. *A bug has been addressed that causes the ColdFlameTraps event to not start back up after a server restart. The event will now restart as long as the player goes through the Saurfang->Upper Spire doorway; I'm not sure who required the doorway to be an area trigger, but it's hacky and not blizzlike. I have not yet addressed the area trigger problem with the doorway in this commit, mainly because the point of this commit is to make the ICC teleporters extremely Blizz-Like. *The "Conspicuous Lever" will now spawn inside of ICC. (From Sniff on Retail) While the lever currently doesn't do anything, in the future it will turn off the ColdFlame Traps. *The teleporter near Saurfang is not supposed to disable during the Intro. It disables whenever Saurfang enters combat with the players. The teleporter then enablers again when combat stops. 
Closes #12834
 2014-08-14 14:35:47 +02:00
Dr-J
9f7075215d Remove Manaforges CPP Script 
Remove script
 2014-08-12 13:36:21 +01:00
Shauren
4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
MitchesD
e80a19a0f1 Scripts/ScarletMonastery: rewritten InstanceScript and some bosses converted to BossAI and eventmap 2014-08-10 23:14:39 +02:00
DDuarte
df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
Vincent-Michael
893d58fa87 Scripts/Commands: Fix static analysis issues 2014-08-09 19:18:05 +02:00
jackpoz
8402570bb8 Scripts/Misc: Fix static analysis issues 
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
 2014-08-09 00:12:20 +02:00
Vincent-Michael
fad2bd4f92 Core: Kill AGAIN whitespace :( 2014-08-07 07:19:06 +02:00
Portgas
a91851074e Core/Spells: Fixed Rogue - Serrated Blades Talent 2014-08-02 22:29:16 +02:00
Vincent-Michael
479afc0ed0 Core/Spells: Fix Bloodworms summon count 2014-08-02 05:17:42 +02:00
Vincent-Michael
eb8e140f7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-31 18:01:28 +02:00
Dr-J
9253ff7cb7 Update CMakeLists.txt 2014-07-31 00:29:54 +01:00
Dr-J
5418844f15 Delete zone_eversong_woods.cpp 2014-07-31 00:24:08 +01:00
Dr-J
5b311690d1 Remove Script from zone_eversong_woods.cpp 
This cpp is now currently redundant
 2014-07-31 00:12:33 +01:00
Vincent-Michael
a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-07-30 22:26:59 +02:00
Dr-J
3199f2ba90 Remove Script from zone_eversong_woods.cpp 
Remove Apprentice Mirvedas script from eversong woods cpp scripts as is not longer required.
 2014-07-30 13:45:42 +01:00
joschiwald
5f9e6db27c Scripts/OutdoorPvP: dropped redundand code 2014-07-30 03:15:15 +02:00
joschiwald
04bb78f6c3 Scripts/OutdoorPvP: replaced some chat texts with proper defense messages 2014-07-29 23:45:34 +02:00
Vincent-Michael
24a14979fe Scripts/BloodmystIsle: Fix StartUp Errors 2014-07-29 20:16:37 +02:00
Shauren
903fbb6be7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-29 02:02:38 +02:00
Dr-J
6a6351d98c Update razorfen_downs.cpp 2014-07-28 23:41:17 +01:00
Shauren
2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Vincent-Michael
55eafa247d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
 2014-07-27 12:09:32 +02:00
Subv
a03c879565 Core/PreparedStatements: Fixed a change I missed in the World prepared statements for waypoints. 2014-07-25 20:18:43 -05:00