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
28,952 Commits 4 Branches 146 Tags
d8861342a3a526b94de42fe4f8b7c726d12f509a
Commit Graph

4768 Commits

Author SHA1 Message Date
karn
4e346f3ca5 Scripts/ScarletMonastery: Boss Arcanist Doan - rewrite to events 
Closes #12418
 2014-07-07 16:48:53 +02:00
untaught
f64add02e8 Core/Spells: fixed Fate Rune of Unsurpassed Vigor 2014-07-07 16:27:09 +02:00
Vincent-Michael
9799a88c8d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-07 09:58:43 +02:00
leak
013e3f4c0c Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-06 20:07:52 +02:00
leak
da3f6e923a Completely remove ACE as dependency for TC - kkthxbye 2014-07-06 01:42:35 +02:00
Shauren
408b490851 Scripts/Magister's Terrace: Fixed typo in SetEncounterState 2014-07-06 00:01:24 +02:00
Vincent-Michael
a508ce1976 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2014-07-05 14:28:58 +02:00
Subv
151785b9ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 
Conflicts:
	src/server/game/World/World.cpp
 2014-07-03 15:57:47 -05:00
karn
6c895ad692 Core/Scripts: Remove script from old boss 
http://www.wowwiki.com/Highlord_Kruul
This creature was part of a bc event. he is no longer part of the game
 2014-07-02 00:55:40 +02:00
Shauren
2a3546ca36 Core/Skills: Use SkillLineAbility.dbc to determine player initial spells - skill assignment done in a new table playercreateinfo_skills 
* Removed DK start skill hacks
* Resolved missing skills in character skill tab

Closes #12311
 2014-07-01 17:20:48 +02:00
Vincent-Michael
88a3344c49 Core: Fix more warnings 2014-06-28 23:25:48 +02:00
Vincent-Michael
d15db5f7ea Core: Fix warnings 2014-06-28 22:43:35 +02:00
Vincent-Michael
3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2014-06-28 21:07:41 +02:00
jackpoz
1bd4ff6cb9 Revert "Scripts/Ulduar: Implement Mimiron" 2014-06-28 13:49:34 +02:00
Trisjdc
0ac6f16896 Merge pull request #12268 from Unholychick/patch_mimironnew 
Scripts/Ulduar: Implement Mimiron
 2014-06-28 12:17:32 +01:00
joschiwald
d20a5f3df0 Scripts/Commands: fixed possible client crash with .go command 2014-06-28 00:57:44 +02:00
Vincent-Michael
f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
joschiwald
52023b1e6b Scripts/MagistersTerrace: fix possible crash 2014-06-27 18:45:49 +02:00
Trisjdc
0a641bace9 Core/Spells: Ensure Haunt's healing takes in consideration crit damage 2014-06-27 00:40:59 +01:00
Vincent-Michael
f94fe58f78 Script/MagistersTerrace: Fix fail in 27f2855248 2014-06-26 23:16:56 +02:00
Vincent-Michael
27f2855248 Core: Fix warnings and kill again whitespace ... 2014-06-26 22:50:06 +02:00
joschiwald
32d2e25556 Merge pull request #12364 from MitchesD/misc_2 
Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues ...
 2014-06-26 22:28:51 +02:00
MitchesD
6ebb64892f Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues on boss Vexallus 
* removed old hacks and added missing auras
* Vexallus converted to EventMap
 2014-06-26 22:25:24 +02:00
Vincent-Michael
50cf908d78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.h
 2014-06-25 19:51:27 +02:00
Vincent-Michael
f0c366141b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/World/action_ip_logger.cpp
 2014-06-24 18:26:52 +02:00
Kittnz
80e0c443ff Quest: Powering our Defenses fixed 
Fix by @Discover-, @untaught, @Kittnz
 2014-06-24 18:23:37 +02:00
Subv
393b7eef53 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-06-24 10:32:34 -05:00
Aokromes
5f1b52acf4 Remove github fuckup 2014-06-24 06:35:42 +02:00
Aokromes
41eb262172 Script/Dustwallow mars: Remove no longer needed script 2014-06-24 06:33:44 +02:00
Shauren
05ea2f76b8 Core/Misc: Fixed warnings 2014-06-24 02:01:40 +02:00
Vincent-Michael
42c497d8e0 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-23 23:48:15 +02:00
Vincent-Michael
d8234bed42 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
 2014-06-23 23:47:48 +02:00
Subv
0db743c4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/shared/Packets/ByteBuffer.cpp
	src/server/shared/Utilities/Util.h
 2014-06-23 16:35:54 -05:00
Aokromes
84e6af26e6 Merge pull request #11976 from Ascathor/master 
Core/Misc: New ability to log account IP access history
 2014-06-23 22:48:35 +02:00
Trisjdc
6cd8f8374c Merge pull request #11495 from PortgasDAce/patch-4 
[4.3.4] [Core/Spells]: Fixed Ice Barrier scale calculation
 2014-06-23 10:16:00 +01:00
Unholychick
61f59acf81 Scripts/Ulduar: Implement Mimiron 
TODO:
Make ACU hover properly (not fly, but hover).
Fix laser barrage visual not always being infront of VX-001. Problem is
caused by bad orientation update on spellcast.
 2014-06-23 02:10:29 +02:00
leak
7dd6f0f1d8 Replaced all ACE_OS::localtime_r calls 2014-06-22 15:42:46 +02:00
Vincent-Michael
01094be1d7 Core/Creature: Added missing part in ff9cd652e0 2014-06-21 22:46:51 +02:00
Vincent-Michael
1d210bc490 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
 2014-06-21 00:07:48 +02:00
jackpoz
0892c71a16 Core/Dependencies: Clean up recastnavigation folder 
Remove old files from recastnavigation folder and update the structure to the same of https://github.com/memononen/recastnavigation/ to allow easier updates.
 2014-06-20 23:30:44 +02:00
Subv
556dd6b2db Core/Scripts: Re-add the modify currency command, accidentally removed in fca4a5448a 
Closes #11507

P.D: Steam Summer Sale is currently on Day 2, for those of you who maybe haven't noticed.
 2014-06-20 13:53:44 -05:00
Kinzcool
34572492dd Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-18 23:25:57 -04:00
Vincent-Michael
05d17b700d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-18 17:13:18 +02:00
Shauren
232eaae69c Scripts/Icecrown Citadel: Fixed a possibility to start the encounter again if Tirion evades during outro RP 
Closes #10060
 2014-06-18 00:00:41 +02:00
Vincent-Michael
fe8e904dea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-06-17 21:22:45 +02:00
Shauren
0f0cea104d Scripts/Misc: Fixed training dummies not entering combat 2014-06-17 21:13:40 +02:00
Shauren
d60f959fce Core/Pets: Fixed pet power regeneration 
Closes #12292
 2014-06-17 17:23:30 +02:00
Vincent-Michael
97ccfdb625 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
 2014-06-16 22:17:27 +02:00
Trisjdc
f27821486b DB/SpellGroups: Completely review of WotLK Stack Rules 
Closes https://github.com/TrinityCore/TrinityCore/issues/4313, https://github.com/TrinityCore/TrinityCore/issues/1626, https://github.com/TrinityCore/TrinityCore/issues/5173, https://github.com/TrinityCore/TrinityCore/issues/5822, https://github.com/TrinityCore/TrinityCore/issues/12212, https://github.com/TrinityCore/TrinityCore/issues/3814, and probably others
 2014-06-15 23:22:53 +01:00
Vincent-Michael
26dd770b8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/shared/Utilities/Util.cpp
 2014-06-15 19:36:30 +02:00