Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
35,653 Commits 2 Branches 1 Tag
a30baa9acd760fe1be3ce9155cf0debd791316a9
Commit Graph
6539 Commits
Author SHA1 Message Date
Shauren f5115328c5 Merge pull request #12970 from Golrag/marrowgar 
Scripts/ICC: Fixed Impale (Lord Marrowgar)
 2014-08-29 21:12:17 +02:00
Vincent-Michael e8d0de6778 Scripts/Commands: Added for guild info guild level output 2014-08-29 21:09:06 +02:00
Golrag 6658d41575 Scripts/ICC: Fixed Impale (Lord Marrowgar) 2014-08-29 19:00:11 +02:00
joschiwald 01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Vincent-Michael 9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
 2014-08-29 06:24:08 +02:00
Odyssey 8adde791d8 Scripts/Commands: Implement .guild info command 
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 23:04:52 +01:00
DDuarte c14283d484 Scripts/Hodir: Initialize variables 
==9458== 1 errors in context 1 of 1:
==9458== Conditional jump or move depends on uninitialised value(s)
==9458==    at 0x1D2857B: boss_hodir::boss_hodirAI::DamageTaken(Unit*, unsigned int&) (boss_hodir.cpp:367)
==9458==    by 0x14A41E9: Unit::DealDamage(Unit*, unsigned int, CleanDamage const*, DamageEffectType, SpellSchoolMask, SpellInfo const*, bool) (Unit.cpp:562)
==9458==    by 0x1ABCEB3: misc_commandscript::HandleDamageCommand(ChatHandler*, char const*) (cs_misc.cpp:2138)
 2014-08-28 22:28:41 +01:00
Unholychick 7c13b383cd Scripts/Ulduar: Implement Mimiron 
Closes #12894
Fixes #7652
Fixes #4736

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 22:04:01 +01:00
Vincent-Michael 80d4647e78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-28 22:13:00 +02:00
jackpoz 9cceb458d9 Merge branch 'Rochet2/ahbot' into master 
Close pull request #12917
 2014-08-28 22:01:58 +02:00
Vincent-Michael 3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
 2014-08-28 21:00:53 +02:00
Vincent-Michael eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
Vincent-Michael a52135f276 Core: Remove whitespace 2014-08-27 23:22:16 +02:00
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
Blipi a7d1394c2e Core/AHBot: Implemented AHBot based on MaNGOS code 
Warning: CMake must be rerun

Apply if you have crashes

Rewrite Seller prices, add random properties and implement some suggestions on price calculations

Core/AHBot: Update to latest suggestions

Fix SQLs after merge, split the AH bot to spearate headers and cpps, fix the config default values

Remove case 8 from GetBuyModifier. It was not correct

Fix Gray Grey GRAY typos

Change message config name

Fix non pch build

Fix switch ident, also earlier removed whitespace. Add missing include for non pch build

Fix possible crash: if (forplayer || GetOwnerGUID()) changed to if (forplayer)

Apply Nayd.diff - Code style fixes

Fix leftovers from nayd

Correct SQL transaction and change one SQL query to C++ instead

Make loot items distinct
 2014-08-25 22:15:59 +03: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