Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,713 Commits 4 Branches 146 Tags
8a110f2645efdba4e15ddd13745b1b4110a7c8cb
Commit Graph

22713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jackpoz
93a68a66c3 Core/MMAPs: Improve NPC behavior with fences and high climbs 
Increase the max walkable angle and max walkable climb in MMAPs generator to allow NPCs to jump on fences and climb steps.
This requires MMAPs to be extracted again with mmaps_generator, old extracted MMAPs are still compatible but will not provide the benefits of this commit.
Fixes #9965
 2014-04-19 15:35:13 +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
Vincent-Michael
20c9981578 Core/Misc: Added missing field in npc_text table for loading 2014-04-18 16:56:05 +02:00
Dr-J
220a45b0cf Scripts/Ulduar: Archivum Console 
- Scripts for Archivum Console, Brann Bronzebeard (33235), Prospector Doren/Loren
- Fixing quest chaining for both versions of the archivum data disc chains
- Fixes loot so correct quest starter item drops from assembly when done in hard mode rather than 10m quest item dropping in 25 and nothing dropping in 10 man
- Scripted events for turn in of Archivum Data Disk, The celestial Planetarium and watcher Analysis's and turn in of ancient history (Val'anyr, Hammer of Ancient Kings chain)
- Fix both versions of the Celestial Planetarium

Closes #11547
Closes #11556
 2014-04-17 21:52:08 +02:00
QAston
57e78dac6b Merge pull request #11853 from Unholychick/patch-2 
Done & taken procs & a few trinket fixes
 2014-04-17 18:18:02 +02:00
Aokromes
b0d0bed9ef DB/Creature: Highlord Bolvar Fordragon 
By MitchesD, closes #11893
 2014-04-17 07:56:50 +02:00
Kinzcool
f9381d2e8c DB/Creatures: Added trigger flag to the remaining triggers 2014-04-16 20:15:01 -04:00
joschiwald
119688d964 Rename 2014_02_15_00_world_spelldifficulty_dbc.sql to 2014_04_17_01_world_spelldifficulty_dbc.sql 2014-04-17 02:03:53 +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
Kinzcool
07fd33fa2a DB/BroadcastText: Corrected texts using backslashes and ALL the errored "EmoteDelay"s due to a fail in the parser *cough* *cough* 2014-04-15 20:51:56 -04:00
Kinzcool
d26889744d DB/NPCText: Conversion to BroadcastText system for npc text (part IV) 2014-04-15 20:08:10 -04:00
w1sht0l1v3
f3fa0d0d37 DB/SAI: Runes of Compulsion (Quest: 12093) 
Closes #4898
 2014-04-16 00:42:06 +03:00
Kinzcool
3332ea9df8 DB/Gossips: Conversion to BroadcastText system for gossips (part III) 2014-04-14 19:21:52 -04:00
Unholychick
057169c21c Fix done & taken procs 
Corrects the logic for dot/hot procs and fixes spells such as althor's abacus, egg of mortal essence, black magic, spiritual attunement etc etc.
Reverts the remaining part of 8edf6247c0
 2014-04-15 00:03:01 +02:00
Kinzcool
798b73a1ae DB/CreatureText: Conversion to BroadcastText system part II 2014-04-14 15:29:11 -04: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
Kinzcool
6464cfd033 DB/CreatureText: Started the conversion to the BroadcastText system 2014-04-13 20:36:34 -04: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
Shauren
e51976e17a Core/Spells: Fixed players being able to mount with all transform auras 
Closes #11852
 2014-04-13 01:06:46 +02:00
Aokromes
9568829dbf DB/Item: Fix Essence of the Pure Flame scaling 
By gecko32, closes #1925
 2014-04-12 17:56:09 +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
jackpoz
7b9b0edb5d Core/GameObjects: Fix crash with Summoning Ritual GOs 
Fix a crash happening with GAMEOBJECT_TYPE_SUMMONING_RITUAL GameObjects if a Player clicked on the GO, logged out and let another Player click on it.
Issue added in 464c0c1611
Fixes #11856
 2014-04-10 20:41:34 +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
4e59d0b922 Core/Chat: Fix build 2014-04-09 22:03:28 +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
jackpoz
37e6a3e1d2 Core/CrashHandler: Log GetLastError() id if no description is found 
Log the System Error id returned by GetLastError() in case FormatMessage() doesn't find a proper description for that message.
 2014-04-08 22:01:56 +02:00
joschiwald
92a71b45aa Merge pull request #11840 from Rochet2/AddonMessaging 
Core/Chat: Fix AddonMessaging and logging
 2014-04-08 21:31:01 +02:00
joschiwald
c6a4d5a1de Core/Logging: store loggers in cache correctly 2014-04-08 21:27:02 +02:00
jackpoz
980c175df1 Merge pull request #11860 from msoky/patch-4 
[4.3.4] Revert CMakeLists.txt mistake for mmaps
 2014-04-08 20:01:26 +02:00
jackpoz
a3afd4bb9d Merge pull request #11857 from Unholychick/master 
Core/Spells: Fix SPELL_DAMAGE_CLASS_NONE unable to crit
 2014-04-08 19:34:18 +02:00
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
Unholychick
7a0c2fc4f7 Fix SPELL_DAMAGE_CLASS_NONE unable to crit 
Corrected logic mistake where switch fallthrough was intended (or should have been).
Fixes the following.
// Earth Shield
// Lifebloom Final Bloom
// Divine Hymn
// Item - Bauble of True Blood 10m
// Item - Bauble of True Blood 25m
 2014-04-08 14:32:31 +02:00
Дмитрий
5be05913e6 .cheat god should also affect on falling damage. 2014-04-08 14:40:16 +03:00