Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 07:07:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,215 Commits 4 Branches 146 Tags
b1eb4e58fdf38a045fbb734c4e7f45b660e556fc
Commit Graph

6393 Commits

Author SHA1 Message Date
Shauren
909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Vincent-Michael
9a2d86f6ae Core/Spells: Fix Quest "The Emissary" 2014-07-19 02:43:15 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
leak
aedb824e99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-16 17:53:33 +02:00
Vincent-Michael
13ff07f121 Merge branch 'master' of 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/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
Vincent-Michael
6dba04c0cc Scripts/Commands: Fix warnings vs2014 ctp (no support) 2014-07-14 10:53:49 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Vincent-Michael
0f5c481cd4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
 2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards 2014-07-12 17:28:35 +02:00
Shauren
d91964912e Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines 2014-07-12 17:27:26 +02:00
Vincent-Michael
3f0ce25d5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-12 05:09:46 +02:00
Shauren
de82146df8 Core/Commands: Fixed crashes caused by using .account lock ip and .account lock country commands from console - these commands apply to currently logged account so they cannot be used from console 2014-07-12 01:17:46 +02:00
Vincent-Michael
1bc482d3d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-07-12 00:24:23 +02:00
Vincent-Michael
00a8a9ebb4 Core: Fix warnings with other way 2014-07-11 21:50:49 +02:00
Vincent-Michael
c8e75073bf Scripts/Misc: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:24:55 +02:00
Vincent-Michael
29e0538624 Core: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:08:35 +02:00
Vincent-Michael
b62ee5eea2 Scripts/BlackTemplate: Fix warnings vs2014 ctp (no support) 2014-07-11 19:42:20 +02:00
Vincent-Michael
6797d78c1b Scripts/Misc: Added missing break in 495ca8c2dc (thx to @ccrs) 2014-07-11 17:36:52 +02:00
Vincent-Michael
4f619eb937 Core/LFG: Fix warning with vs2014 ctp (no support) 2014-07-11 17:04:01 +02:00
Vincent-Michael
495ca8c2dc Scripts/Misc: Fix some warnings with vs2014 ctp (no support) 2014-07-11 16:39:44 +02:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00
joschiwald
7a67d816d9 Core/Battleground: 
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
 2014-07-09 16:43:56 +02:00
Aokromes
900fb17229 Merge pull request #12417 from gerripeach/remove_old_boss 
Core/Scripts: Remove script from old boss
 2014-07-09 08:36:58 +02:00
Vincent-Michael
7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
Vincent-Michael
ba2563da5a Core/Spells: Convert "Shaman T10 Elemental 2P Bonus" in spell script 2014-07-07 21:50:18 +02:00
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