jackpoz
7fe7f30521
Core/Misc: Fix some -Wconversion warnings
2014-08-23 19:56:41 +02:00
Shauren
d0176f985d
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-08-15 20:13:34 +02:00
joschiwald
ccfa82e7d5
Core/Creature: update creature_template and some other small things
...
http://www.trinitycore.org/f/topic/9572-creature-damage/
2014-08-14 16:09:14 +02:00
Shauren
4a741258f1
Merge branch 'master' of https://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/Zones/BattlegroundAB.h
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
src/server/game/Battlegrounds/Zones/BattlegroundEY.h
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
src/server/game/Battlegrounds/Zones/BattlegroundWS.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Item/Item.h
src/server/game/Entities/Object/Updates/UpdateData.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Guilds/Guild.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/WorldPacket.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/shared/Packets/ByteBuffer.h
2014-08-12 00:45:24 +02:00
DDuarte
df3b08d140
Core/Server: Use nullptr instead of 0 where pointers are expected
2014-08-09 21:32:26 +01:00
Vincent-Michael
893d58fa87
Scripts/Commands: Fix static analysis issues
2014-08-09 19:18:05 +02:00
Vincent-Michael
55eafa247d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/authserver/Server/AuthSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
2014-07-27 12:09:32 +02:00
Subv
a03c879565
Core/PreparedStatements: Fixed a change I missed in the World prepared statements for waypoints.
2014-07-25 20:18:43 -05:00
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
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
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
leak
da3f6e923a
Completely remove ACE as dependency for TC - kkthxbye
2014-07-06 01:42:35 +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
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
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
joschiwald
d20a5f3df0
Scripts/Commands: fixed possible client crash with .go command
2014-06-28 00:57:44 +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
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
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
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
MitchesD
3a8b5179fa
Scripts/Commands: added option to show flags_extra (.npc info)
2014-06-14 22:11:50 +02:00
Ascathor
6949735098
Core/Misc:
...
* Fix some codestyle, fix some typos
* Change CMakeLists for: Custom (can be uncommented), Events, World
** Custom is theoretically unchanged. You can, however, uncomment the glob_recurse that initializes every file within. This might be easier for beginners.
* Introducing the IP Based Action Log System:
** On several different actions, e.g. Login, Character Login, etc., a new entry is added
** Can be logged on and off in worldserver config
*** Disabled by default to prevent increased log db size for unknowing users.
* Add a new row to account table called 'last_attempt_ip'
** Lists the last ip trying to connect to the account
* Add a new type of HookScripts: AccountScript
** Includes: OnAccountLogin, OnFailedAccountLogin, OnEmailChange, OnFailedChange, OnPasswordChange, OnFailedPasswordChange
* Added new Hook to PlayerScripts: OnFailedPlayerDelete
* Added new variables to PlayerScripts: OnPlayerDelete
2014-06-13 16:25:11 +02:00
Shauren
3b940a2766
Core/Misc: Warning fixes
2014-06-12 17:51:57 +02:00
Shauren
434b3a80e1
Core/Commands: Added a set of commands to manage battle.net accounts
...
TODO: Ban commands, linking game accounts to battle.net accounts
2014-06-08 17:58:28 +02:00
Shauren
7dd552c826
Merge branch 'battle.net' into 4.3.4
2014-06-08 16:14:24 +02:00
leak
ee4a3b9d59
Replaced mutex related code in Common.h
2014-06-08 15:30:57 +02:00
Subv
bbe51bbd13
Core/Phases: Removed more of the old phasemasks
2014-06-07 20:26:25 -05:00
Subv
2086f18f7b
Core/Phases: Removed more SetPhaseMask uses
2014-06-05 13:05:29 -05:00
Subv
558642b26e
Core/Phases: Removed some phasemask handling, more to come
2014-06-02 17:43:59 -05:00
Subv
48ec2df81f
Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
...
Put here for peer review.
2014-06-01 22:27:29 -05:00
leak
68e22ad311
Replaced ACE based typedefs for fixed width ints with C++11 versions
2014-06-01 20:55:31 +02:00
Michael
15efe08a60
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
2014-05-25 21:52:27 +02:00
MitchesD
007e903753
Scripts/Commands: added option to show InhabitType in .npc info command
2014-05-23 20:51:22 +02:00
Vincent-Michael
ef5bc9c70a
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/Guilds/Guild.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
2014-05-18 19:40:30 +02:00