araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-14 20:22:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,220 Commits 17 Branches 140 Tags
1ecc55272e210258e9ccbe64d5bff8d6dfbd78fa
Commit Graph

23 Commits

Author SHA1 Message Date
Spp
1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp
b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp
7f061fc57f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2012-11-19 10:09:58 +01:00
Spp
b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Shauren
21b1b72a6b Scripts/Commands: Fixed remaining crashes caused by removal of dbc locales 2012-08-16 13:27:54 +02:00
Vincent-Michael
6f69a3326d Convert misc commands in commandscript 2012-07-29 01:23:51 +02:00
Spp
d38bc3a178 Core: Rename GetCreatureInfo to GetCreatureTemplate and minor cleanup here and there 2012-02-27 14:58:47 +01:00
kiper
8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Fredi
a8d20d5da8 Script/Commands: Codestyle and cleanups 2011-10-24 08:35:33 -02:00
Spp
af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
Spp
e7327e7e94 Core: Fix compile without PCH and fix some warnings 2011-08-03 11:23:08 +02:00
QAston
b0fe236265 Core: Use new SpellInfo class in core. Sadly, this commit is not compatibile with some of the custom code. To make your code work again you may need to change: 
*SpellEntry is now SpellInfo
*GetSpellProto is now GetSpellInfo
*SpellEntry::Effect*[effIndex] is now avalible under SpellInfo.Effects[effIndex].*
*sSpellStore.LookupEntry is no longer valid, use sSpellMgr->GetSpellInfo()
*SpellFunctions from SpellMgr.h like DoSpellStuff(spellId) are now: spellInfo->DoStuff()
*SpellMgr::CalculateEffectValue and similar functions are now avalible in SpellEffectInfo class.
*GET_SPELL macro is removed, code which used it is moved to SpellMgr::LoadDbcDataCorrections
*code which affected dbc data in SpellMgr::LoadSpellCustomAttr is now moved to LoadDbcDataCorrections
 2011-07-26 23:09:28 +02:00
click
2717129d0d Core: Clean up whitespace and tabs 2011-05-09 10:59:54 +02:00
Shocker
0baf01892c Merge pull request #31 from Ramusik/master 
.modify scale on creatures, Combustion bug, Starfall supressing from root effects corrected, Dislodged Foreign Object no proc from heals, .learn all_myspells remove only player spells
 2011-05-05 11:34:25 -07:00
leak
1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
leak
c51c817a45 Core/ObjectMgr: Refactor sCreatureStorage 2011-04-28 22:57:08 +02:00
Ramusik
1c063696ac Learn all my spells command should learn obly player's skills 2011-04-11 13:26:28 +03:00
Shocker
06acfddb86 Core/Commands: Remove .learn all and drop hardcoded part of .learn all gm spells list 2011-04-06 20:17:29 +03:00
Machiavelli
957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
Shauren
0f3b9019a8 Core: Get rid of dirty operator workaround for ACE_Singleton class implementation 
--HG--
branch : trunk
 2010-12-22 21:25:23 +01:00
click
3e27be7501 Core/Scripts: Tidy up commandscripts to adhere to scripting-standards and fix some minor typos (fix by Paradox) 
Closes issue #4859.

--HG--
branch : trunk
 2010-11-19 14:04:21 +01:00
click
c374f3245a Scripts/Commands: Add tele and event commands to commandscripts system and streamlining the command selection process to ensure the correct command is run when using abbreviations 
Patch by Paradox (some cleanups was needed)

--HG--
branch : trunk
 2010-11-13 22:29:46 +01:00
Paradox
de1798e4ac Core/Scripts Part 1 of moving all commands to commandscripts 
closes issue 4669
(first 5 patches rolled into 1)
Patch by Paradox

--HG--
branch : trunk
 2010-11-09 10:15:35 -05:00