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
17,001 Commits 4 Branches 146 Tags
c8eeb1f9e6d804c2b87843436fb132f9ebd75c8d
Commit Graph

64 Commits

Author SHA1 Message Date
Subv
d82266bc0e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level2.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/shared/Logging/Log.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
 2012-08-07 13:44:22 -05:00
Vincent-Michael
634b3645d5 Core/Misc: Use proper headers to optimize compile 2012-07-30 05:38:40 +02:00
Shauren
27ea130b55 Core/Movement 
* Updated movement flags
* Cleaned up MovementStatusElements enum
* Updated and enabled MSG_MOVE_START_FORWARD
 2012-07-14 23:39:12 +02:00
kaelima
3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x 
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.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/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
 2012-05-30 08:01:02 +02:00
Nay
945566e84e Scripts/SM: Fix dead anymation of Fairbanks 
Patch by DennisRassmann (25/10/2010)
Closes #4998
 2012-04-07 22:29:19 +01:00
Gyx
a1c4786ba0 Core/Script: Code style and some rewriting. 
MoveInLineOfSight(Unit* unit) -> MoveInLineOfSight(Unit* who)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-04-01 19:56:41 +08:00
Gyx
d9088c083c Core/Script: Code style and some rewriting. 
JustDied(Unit* Killer) -> JustDied(Unit* killer)
JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* victim) -> JustDied(Unit* killer)
JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* who) -> JustDied(Unit* killer)
JustDied(Unit*) -> JustDied(Unit* /*killer*/)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-31 18:56:37 +08:00
Gyx
391d68be20 Core/Script: Code style. 
WaypointReached(uint32 i) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 /*waypointId*/)
WaypointReached(uint32 uiI) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*i*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiWPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*wp*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 waypointId)

Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-29 15:44:24 +08:00
Gyx
d8b4bc590a Core/Script: Code style and remove unused core. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 21:41:15 +08:00
Gyx
bef1b0c402 Core/Script: Code style. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-16 19:40:57 +08:00
Machiavelli
03a24a84e4 Core/Units: 
- Implement UNIT_FIELD_HOVERHEIGHT (requires DB data). This field, sent in update object packet, will determine the height at which a creature hovers if it has movementflag_hover applied. Note that hovering will now update the server-sided z-coordinate by the value of this field, and that all subsequent positional updates to the client will need to send z coordinate MINUS the hover height offset, or the hoverheight will be visually doubled client side.
- Correct our usage of movementflag_flying, movementflag_can_fly, movementflag_hover and movementflag_disable_gravity (previously levitate), and how they relate to InhabitType in the database. This fixes "flying creatures on steroids" bug (wings flapping too fast), and potentially a lot of visual issues in AI scripts. Note that a lot of scripts still set wrong movementflags, these need to be fixed on a case by case basis.
- Send correct packets for SPELL_AURA_FEATHER_FALL, SPELL_AURA_WATER_WALK and SPELL_AURA_HOVER apply/unapply.
- Send correct packet contents for movement update in Unit::SetSpeed.
- Misc. cleanup in affected scripts.
 2012-03-12 00:53:45 +01:00
Spp
f495e0efe4 Warning fixes and some random cleanup here and there 2012-03-07 14:09:18 +01:00
Bootz
74441b12ec Scripts/EasternKingdoms: ScarletMonastery 
* Removed trailing white spaces
 2012-01-26 02:49:10 -06:00
Bootz
c0cd16e51d Scripts/EasternKingdoms: ScarletMonastery 
* Fixed a few derps i missed on last patch
 2012-01-26 02:40:15 -06:00
Bootz
2db052b109 Scripts/EasternKingdoms: ScareltMonastery 
* Script Standardizations done,
- Removed SD2 Hieroglyphics.
- Removed Hungarian Notations.
- Fixed Enums in Defines.
 2012-01-26 02:21:15 -06:00
kiper
8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Spp
4fb634f9a5 Fix missing changes from previous merge 2011-12-28 09:16:06 +01:00
Aokromes
b24dfc10cb rand to urand #3 2011-12-28 04:26:30 +01:00
Aokromes
611f9ad419 rand #2 2011-12-28 04:25:25 +01:00
Aokromes
2e8de8cd2b rand() to urand #1 2011-12-28 04:24:31 +01:00
Shauren
358b33239a Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit 2011-11-23 19:17:33 +01:00
Shauren
44693cfa99 Core: Fixed a few warnings and silly typos in scripts 2011-11-23 16:57:08 +01:00
megamage
d156e066cf Rename "SetPosition" to "UpdatePosition". 
Replace CreatureRelocation in scripts with new Creature::SetPosition.
 2011-10-10 17:08:01 -04:00
Bootz
5b4c7783c2 REPO: Code-style clean-ups 
* Fixed pMap->map
* Fixed pInstance->instance
* Fixed pInsta->instance
* Fixed pQuest->quest
* Fixed pWho->who
* Fixed pTarget->target
* Fixed pGo->go

~DEVNOTES: Handlers/QuestHandler.cpp still needs to be cleaned...
 2011-10-07 19:45:43 -05:00
Bootz
f1ccb83dc0 REPO: Code-style change 
* Fixed pUnit-unit
 2011-10-07 10:48:56 -05:00
Spp
b16d2245bb Cosmetic: Multiple cosmetic changes 
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces

Note: Only affects files with extension "cpp" and "h" under /src/server
 2011-09-29 12:43:05 +02:00
QAston
fe25ce4fa3 Core/AI: Replace many Unit::IsHostileTo with Unit::IsValidAttackTarget or Creature::canCreatureAttack. 2011-09-17 00:56:59 +02:00
Spp
af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +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
7fe3f55b5e Core: Fix non-PCH build + clean up some sporadic warnings 2011-07-18 14:49:08 +02:00
QAston
72ea9c9fa8 Core/Spells: Add a base for brand new proc system, this is a WIP and doesn't affect currently working code. 2011-07-10 13:13:02 +02:00
click
f676585cac Core: Cleaning up hungarian notation - Phase5: pWho -> who 2011-07-02 23:53:38 +02:00
click
f997363c08 Core: Cleaning up hungarian notation - Phase3: pVictim -> victim 2011-07-02 23:50:02 +02:00
click
70115f52f7 Core: Cleaning up hungarian notation - Phase3: pTarget -> target 2011-07-02 23:16:45 +02:00
click
169f5da8c3 Core: Cleaning up hungarian notation - Phase2: pPlayer -> player 2011-07-02 22:52:42 +02:00
click
f91ee24184 Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature 2011-07-02 22:18:03 +02:00
Spp-
bb921ae78c Core: Do not use STL container size method to check if container is empty 2011-07-01 14:58:44 +02:00
click
a9c9ab0efa Core: Clean up script variables to make variables consistant/standardized, and some additional warning-removals: 
+ Fix compilewarning in Unit.cpp
+ Remove/comment out unused parameters for some commandscripts/scripts (warnings)
+ Replace "plr" with "player" all over the scriptbase for consistency
 2011-07-01 03:00:39 +02:00
Spp-
6fd41ae50e Scripts: Reorder file names in Commands/CMakeList file and cosmetic changes in all scripts 2011-06-30 14:24:56 +02:00
click
158966dc79 Core: Codestyle cleanup 2011-06-11 22:35:29 +02:00
leak
1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
Shauren
8898db8b27 Core: Corrected NULL usage, it should only be used with pointers, not integers 2011-04-23 15:53:48 +02:00
Shauren
3fcb49c685 Core/Scripts: Removed double calls to InstanceScript's Initialize methods 2011-04-03 21:24:22 +02:00
Shauren
2f79b0f266 Core: Removed all double (and more) empty lines 2011-03-21 10:52:14 +01:00
Shauren
c2c40a4750 Scripts: Removed duplicate target selection function (SelectUnit), there is only SelectTarget now 2011-03-09 21:32:04 +01:00
Machiavelli
957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
leak
6fe19b5a86 Core/Scripts: Split OnCreatureCreate() and OnGameObjectCreate() into two virtual functions each. 
Note to scripters: be aware that you will need to hook into the Remove functions if you want to do stuff at GO/creature removal.
Closes issue 5011.

--HG--
branch : trunk
 2010-12-05 18:04:10 +01:00
azazel
87d723405e Core/Scripts: return const modifier to Player methods back (should restore compilation for those with custom scripts). 
NOTE: The main idea of original change is to allow scripts change content of message so that calling method sends modified message to client.
For example, moderating script which cuts illegal words from message.

--HG--
branch : trunk
 2010-11-18 10:26:34 +06:00
azazel
4fb572015a Core/Scripts: pass message parameter by reference in OnChat methods to make it possible to be modified inside the script. 
--HG--
branch : trunk
 2010-11-17 18:14:35 +06:00
linencloth
8fae0c176d Core/Units: Rename and change Get/SetVisibility to use a bool value instead of an unnecessary enum 
Also replace some SetVisibility hacks to directly call UpdateObjectVisibility

--HG--
branch : trunk
 2010-11-16 01:13:04 +01:00