Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,086 Commits 4 Branches 146 Tags
deca201f7787f31187e2b9fab9cba7760313e786
Commit Graph

5409 Commits

Author SHA1 Message Date
joschiwald
6c0ff5717f Scripts/Gnomeregan: moved Blastmaster Emi gossip to db 2014-04-21 21:39:51 +02:00
Vincent-Michael
3a26a570f7 Core: Fix whitespace / tabs 2014-04-21 16:57:32 +02:00
Vincent-Michael
0ab9f938ad Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:35:36 +02:00
warmech
12b895e5ba Fixed spelling typo in gnomeregan.cpp script. 
Fixed a typo on line 32 where [GOSSIP_START_EVENT "I am ready to being"] should read [GOSSIP_START_EVENT "I am ready to begin."]
 2014-04-20 23:00:32 -05:00
Numielle
91827e87d1 Core/Spells: Fixed double heal reduction on Eart Shield (issue #4032). 2014-04-20 23:48:57 +02:00
Vincent-Michael
40a29a3c99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
 2014-04-20 11:33:40 +02:00
jackpoz
fb6365ac68 Core/Misc: Check GetVictim() for NULL before dereferencing it 
Add additional NULL checks all around the code before dereferencing GetVictim() result.
Keep in mind UpdateVictim() result has nothing to do with GetVictim() result and the caller shouldn't assume anything about GetVictim() based on UpdateVictim().
 2014-04-20 00:38:25 +02:00
Vincent-Michael
aa6ae2773f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
 2014-04-19 22:49:25 +02:00
jackpoz
8ca6371793 Core/Misc: Ensure GetVictim() returns a valid reference when expected 
Add a new method EnsureVictim() which asserts a valid not NULL reference will be returned to the caller. Use this whenever the GetVictim() would be dereferenced .
 2014-04-19 21:48:22 +02:00
Vincent-Michael
8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.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/Spells/spell_paladin.cpp
 2014-04-19 19:57:46 +02:00
Warpten
d9493d9cc9 Scripts/Ruby Sanctum: Fixed corporeality scaling changes. 
Thanks to Unholychick.

P.S.: #9231 if still valid will be fixed soon (tm)
 2014-04-19 19:18:51 +02:00
Unholychick
574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00
Vincent-Michael
89cc056a50 Fix 2014-04-18 17:02:04 +02:00
joschiwald
8877a87c99 Merge pull request #11614 from MitchesD/kelthuzad 
Scripts/Kelthuzad: move spells into spelldifficulty_dbc and cleanup
 2014-04-17 02:02:51 +02:00
joschiwald
fa472c6142 Merge pull request #11787 from MitchesD/misc 
Scripts/ZulGurub: clean up the old code
 2014-04-17 02:01:05 +02:00
joschiwald
0a014e1431 Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer 
Closes #10859
 2014-04-17 00:09:43 +02:00
joschiwald
533cbf20bb Core/Spells: addition to b9a62115b1 2014-04-14 21:12:05 +02:00
untaught
b9a62115b1 Core/Spells: fixed Relic of the Earthen Ring 
Closes #11282
 2014-04-14 19:48:13 +02:00
jackpoz
ba61ec085d Scripts/Commands: Add comment about 9d58410739 changes 2014-04-13 16:02:41 +02:00
jackpoz
9d58410739 Scripts/Commands: Fix memory leak in ".gobject add" command 
Valgrind log:
 158 (104 direct, 54 indirect) bytes in 1 blocks are definitely lost in loss record 24 of 73
 at operator new(unsigned long) (vg_replace_malloc.c:319)
 by GameObjectModel::Create(GameObject const&) (GameObjectModel.cpp:152)
 by GameObject::Create(unsigned int, unsigned int, Map*, unsigned int, float, float, float, float, float, float, float, float, unsigned int, GOState, unsigned int) (GameObject.cpp:237)
 by gobject_commandscript::HandleGameObjectAddCommand(ChatHandler*, char const*) (cs_gobject.cpp:155)
 2014-04-13 15:01:20 +02:00
jackpoz
dc58ec0d6c Scripts/Commands: ".modify speed" targets current Player by default 
Allow ".modify speed" command to target current Player if there is no target or if the selected Unit is a Creature.
This behavior could be extended to other commands that require target Players.
 2014-04-13 14:06:21 +02:00
jackpoz
a07e82530f Scripts/Commands: Fix .mmap loc wrong coordinates 
Fix .mmap loc command printing swapped x and y tile coordinates
 2014-04-13 13:40:42 +02:00
Warpten
17923c3c44 Scripts/Commands: Ensure gameobject template is valid from .gob add temp [...] 
As per Aokrome's spamming. "Avoids false positive logs"
 2014-04-12 14:45:51 +02:00
Vincent-Michael
5454e10b52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
 2014-04-11 23:12:12 +02:00
Nyeriah
870d5d9c45 [TW278] - Core/Scripts: Prevent multiple spawns of Ulag 
http://www.wowhead.com/quest=1819/ulag-the-cleaver
 2014-04-11 22:36:38 +02:00
MitchesD
ab602837b1 Scripts/ZulGurub: clean up the code and remove old hacks 2014-04-11 18:43:38 +02:00
Warpten
335fe8e1b0 Scripts/Ruby Sanctum: Fixed Halion engaging combat outside of his Flame Ring. 2014-04-10 14:28:58 +02:00
Vincent-Michael
6131e4d722 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2014-04-09 21:03:08 +02:00
Warpten
b36e7c0211 Scripts/Ruby Sanctum: Fixed Onyx Flamecallers not aggroing players once pathing ended. 2014-04-09 17:55:54 +02:00
Shauren
ade9c92080 Merge pull request #11847 from trickerer/SS 
Core/Spells: Fixed Sweeping Strikes damage
 2014-04-09 17:26:19 +02:00
trickerer
d123780b2b Fix Sweeping Strikes damage 2014-04-09 20:13:17 +07:00
joschiwald
8b8aaa06fc Core/ChatLog: handle chatlog options with extended logging system 2014-04-08 22:52:05 +02:00
Vincent-Michael
19751f36f6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-06 01:25:59 +02:00
jackpoz
5b1a28076e Scripts/Ulduar: Fix uninitialized values 
Fix uninitialized values in Ulduar script reported by Valgrind.
 2014-04-05 23:41:01 +02:00
Vincent-Michael
e4b14b943d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Object/Object.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/Entities/Unit/Unit.h
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_character.cpp
	src/server/scripts/Commands/cs_lookup.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-04-05 20:43:05 +02:00
joschiwald
29610b250d Core/Spells: fixed Throw Shield Visual and Clone Weapon 2014-04-05 00:37:07 +02:00
jackpoz
0930482fa4 Core/Misc: Fix uninitialized values 
Fix Position members not being always initialized.
Valgrind log:
 at : Position::NormalizeOrientation(float) (Object.h:388)
 by : Position::SetOrientation(float) (Object.h:315)
 by : Position::Relocate(Position const&) (Object.h:310)
 by : spell_ulduar_stone_grip::spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle(AuraEffect const*, AuraEffectHandleModes) (boss_kologarn.cpp:592)
 2014-04-02 20:42:46 +02:00
jackpoz
10ba63cf3d Core/Misc: Fix typo in f47962f670 2014-03-31 21:10:29 +02:00
jackpoz
f47962f670 Core/Misc: Fix some static analysis issues 
Add some asserts and additional NULL checks as sanity checks.
 2014-03-31 20:59:33 +02:00
Vincent-Michael
0b615ec159 Scripts/Misc: Small code optimizations 2014-03-29 20:58:49 +01:00
jackpoz
8c44259fae Core/Misc: Fix some static analysis issues 
Fix uninitialized values, most of which are false positives, always initialized before being accessed.
Add some asserts and additional NULL checks as sanity checks. Use SpellMgr::EnsureSpellInfo() if the spell id is valid and always supposed to return a valid not-NULL SpellInfo* .
 2014-03-27 21:43:59 +01:00
Gacko
46b8bc8882 Fix non-pch build and remove blank line 2014-03-26 18:51:09 +01:00
Gacko
808a1998c6 Quest: The Power of the Elements 
Remove hack SAI, use aura script
 2014-03-26 18:36:39 +01:00
Shauren
84365f43b4 Scripts/Icecrown Citadel: Fixed Muradin/Saurfang attacking each other during Gunship Battle 
Closes #11786
 2014-03-25 22:20:45 +01:00
Shauren
cd20be2cc9 Scripts/Icecrown Citadel 
* Deathbringer Saurfang will now evade if any player stands on the gunship
* Fixed players being stuck in combat after defeating gunship
* Fixed players not sticking to gunships
 2014-03-24 00:58:37 +01:00
Shauren
e469ff5e88 Fixed build without PCH 2014-03-23 12:54:09 +01:00
Shauren
a4d8a26dc7 Scripts/Icecrown Citadel: Icecrown Gunship Battle 2014-03-23 02:01:13 +01:00
MitchesD
d9d088421d Scripts/ZulAman/Halazzi: convert text to create_text and fixed despawn of cat 2014-03-22 22:30:20 +01:00
Shauren
529cabea68 Core/Map: Save weather, light and music overrides in map to send them to players logging in 2014-03-22 19:40:36 +01:00
jackpoz
6dcd8c8545 Core/Misc: Fix some static analysis issues 
Fix some static analysis issues about:
- uninitialized values, most of which are false positives, always initialized before being accessed
- unchecked return values
- dead code never executed
- bad formatting leading to wrong behavior

Please ensure EventMap is never used with event id set to 0 or those events will never execute.
 2014-03-22 14:54:32 +01:00