Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,665 Commits 4 Branches 146 Tags
fa046ac9bcf61de604b841bcf721828eaec72c19
Commit Graph

22665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
msoky
fa046ac9bc [4.3.4] Revert CMakeLists.txt mistake for mmaps 
this revert 401527c
because when I select "tools" in cmake, mmaps_generator isn't in project and can't compile

i didnt select meshextractor, only tools in cmake
meshextractor have problem during compile with library
 2014-04-08 19:32:41 +02:00
Vincent-Michael
5fd0e9783b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-08 17:27:41 +02:00
Discover-
8d97a0e906 Merge pull request #11858 from Dimitro/master 
.cheat god command should also affect on falling damage.
 2014-04-08 16:52:56 +02:00
Дмитрий
5be05913e6 .cheat god should also affect on falling damage. 2014-04-08 14:40:16 +03:00
jackpoz
8927a04253 Core/Movement: Fix LoS issue of NPCs chasing targets 
Add Line of Sight checks to WorldObject::GetNearPoint(), fixing to TargetedMovementGenerator not reaching a point with valid LoS to the target and MotionMaster::MoveKnockbackFrom() knocking creatures inside walls.
Remove unused code.
 2014-04-07 22:16:31 +02:00
Vincent-Michael
1f7260ca4b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-04-07 20:42:44 +02:00
Shauren
b717ce0eda Merge pull request #11849 from Unholychick/master 
Fix SPELL_AURA_MOD_AOE_AVOIDANCE
 2014-04-07 09:56:06 +02:00
Unholychick
7b55dcf0f8 Fix SPELL_AURA_MOD_AOE_AVOIDANCE 
There is not a single spell using this aura, but now it works :)
 2014-04-07 09:50: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
98a9a088bf Merge pull request #11836 from Unholychick/patch-1 
Partially revert 8edf6247c0
 2014-04-06 00:17:18 +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
jackpoz
af78f2b7c5 Core/CrashHandler: Add more informations about locals 
Handle BasicType btChar and custom type std::basic_string<char,std::char_traits<char>,std::allocator<char> > (std::string).
This allows WheatyExceptionReport to log the text stored in char*, char[] and std::string.
 2014-04-05 22:24:59 +02:00
Vincent-Michael
4043680a5e Fix merge fail 2014-04-05 21:44:38 +02:00
Unholychick
28ba3d04b3 Partly revert 8edf6247c0 
This wasnt the correct way to fix trinkets and talents that should proc on periodic heals, as it also made talents that procs off spells with casttime proc...
Mentioned are affected, but there is a potential fix in:
https://github.com/TrinityCore/TrinityCore/issues/1896

NOTE to self: learn to use the proc_flag table
 2014-04-05 21:06:14 +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
c4f4a023ea Core/Chat: Fix valid chat links being handled as invalid 
Fix a case where valid chat links would have been handled as invalid.
This happened if these conditions were true:
- the link was a profession and the link name started with the same name of the profession, like spell id 61120 in esES locale "Inscripción de la tormenta de maestro" with profession name "Inscripción"
- the profession name was the same for more than 1 locale available, like esES and esMX, or enUS and enGB

Restore memmove() instead of memcpy() wrongly replaced in 791130f6fa , it's unsafe to use memcpy() with overlapping memory regions.
 2014-04-04 22:16:14 +02:00
Kinzcool
65e9691b23 DB/Creatures: Added some data for dataless NPCs 2014-04-04 13:34:26 -04:00
blub
62dd05fc8a Merge pull request #11823 from MitchesD/core_sai 
Core/SmartScripts: SMART_ACTION_EQUIP prevent to false errors
 2014-04-03 21:53:04 +02:00
MitchesD
718b0e6bdd Core/SmartScripts: SMART_ACTION_EQUIP prevent to false errors 2014-04-03 19:47:27 +02:00
Aokromes
818278a71e DB/SAI: Fix few startup errors after 96b3df2 2014-04-03 10:13:37 +02:00
Kinzcool
13acbd12d5 DB/Gameobjects: Updated the WDBVerified of the gameobject templates of a4487f8f58 -.- 2014-04-02 22:45:38 -04:00
Kinzcool
a4487f8f58 DB/Gameobjects: Added spawns on Development Land 2014-04-02 22:34:06 -04:00
Aokromes
2ae903d27d DB/SAI: Fix Arcane Disturbances after quest_?_scripts removal 
By untaught, closes #5412
 2014-04-02 21:55:52 +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
Kinzcool
b7ab8a1332 DB/Gameobjects: Added "a few" missing gameobjects 2014-04-01 21:01:23 -04:00
Aokromes
f57907e214 DB/Gameobject: Delete another TEMP gameobject 2014-04-01 14:35:53 +02:00
Aokromes
470d3f2651 DB/Gameobject: Fix 2 Gameobjects names after 8ff8f30 and 33be04d 2014-04-01 11:56:56 +02:00
Shauren
c2174a8f7b Merge pull request #11815 from Unholychick/master 
Fix trinket/talent procs on hots done/taken
 2014-04-01 11:24:31 +02:00
Unholychick
8edf6247c0 Fix trinkets/talents procs on hots taken/done 2014-04-01 10:09:26 +02:00
Unholychick
8f607ed8a3 Revert f79a8813a0 2014-04-01 10:06:37 +02:00
Aokromes
6815e2bc35 DB/Misc: Fix startup errors after 8ff8f30 and 33be04d 2014-04-01 08:58:27 +02:00
Kinzcool
33be04ddcd DB/Gameobjects: Bye bye old "TEMP" Gameobjects... 2014-03-31 20:58:17 -04:00
Kinzcool
8ff8f3034e DB/Gameobjects: Spring clean up for "TEMP" spell focus gameobjects. 
* Added missing spell focus gameobjects.
* Old "TEMP" gameobjects now have sniffs values for their radius and the proper entries.
 2014-03-31 20:48:22 -04: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
bacfbdc4ee Core/Sai: Added new db errors :P (hihi) 2014-03-31 17:32:39 +02:00
Kinzcool
9c5e14b41e DB/Creatures: Corrected creature addon values for mounts 2014-03-31 01:29:22 -04:00
Kinzcool
d2f6495083 DB/Creatures: Added all NPC mounts with sniff values 2014-03-30 23:47:40 -04:00
Kinzcool
60e87db489 DB/BroadcastText: Created BroadcastText table -- contains every gossip, creature text & npc text. Note that it has NO use for you for now except if you want to pick some texts from it to add them to your scripts/Pull Requests. This file will be used as a globalized table which other ones will link to in the future. 2014-03-30 21:26:11 -04:00
Kinzcool
96b3df24cd DB/Equipment: Killed the errors added in b7a915c396 2014-03-30 18:28:52 -04:00
Kinzcool
b7a915c396 DB/Equipment: Added blizzlike values for the equipement of every NPC. 2014-03-30 17:16:43 -04:00
Gacko
e8df0643a3 DB/SAI: Fix warning about missing creature_text (wrong target_type) 2014-03-30 22:29:20 +02:00
Gacko
a01fd35dc9 Core/CreatureText: Unify log messages and add GUID 2014-03-30 22:17:03 +02:00
Aokromes
b61e497516 Update 2014_03_30_02_world_game_event_335.sql 2014-03-30 16:54:55 +02:00
Aokromes
b84903a250 DB/Gameevent: Fix typo 2014-03-30 16:45:59 +02:00
Shauren
b949d0b982 Core/Misc: Defined a few fields in Map.dbc and rewritten InstanceMap::GetMaxPlayers to match what the client does to determine max players 2014-03-30 15:42:05 +02:00
Gacko
7630b3c627 SmartAI: Use same method for removing auras in EnterEvadeMode as in CreatureAI 
Also fixes warnings about duplicate auras. Self-casted auras were not removed on entering evade mode in SAI as they are in CreatureAI.
 2014-03-30 15:05:04 +02:00
Aokromes
338a0047c5 Rename 2014_03_29_01_world_creature.sql to 2014_03_30_01_world_creature.sql 2014-03-30 14:44:41 +02:00
Aokromes
909041257c DB/Creature: Remove 2 no longer existing mobs 2014-03-30 14:44:11 +02:00