Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
24,137 Commits 2 Branches 1 Tag
d0176f985d20604a23396c326af303327ef989be
Commit Graph
22 Commits
Author SHA1 Message Date
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 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
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
leak 7dd6f0f1d8 Replaced all ACE_OS::localtime_r calls 2014-06-22 15:42:46 +02:00
Shauren d9f1d6466d Core/Battle.net: Implemented authserver 2014-05-06 23:43:29 +02:00
Dehravor 24ae6a6802 Core/Misc: Remove obsolete C++11 backward compatibility macros 
OVERRIDE, FINAL, DELETE_MEMBER
 2014-04-29 16:35:11 +02:00
Vincent_Michael 101ac7f511 Misc: Minor cosmetic changes here and there 2014-01-21 20:20:38 +01:00
Zabustak 101cad1f28 Show Kick, Mute and Ban in world 2014-01-17 12:23:36 +01:00
Vincent_Michael 20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Spp cfaea769bc Core/RBAC: Move RBAC code to namespace rbac 2013-09-27 13:35:45 +02:00
jackpoz 9578b5f87a Core/Thread: Fix race condition converting time values to local time 
Replace thread-unsafe localtime() http://www.cplusplus.com/reference/ctime/localtime/ with thread-safe portable ACE_OS::localtime_r() .

Helgrind log:
 Possible data race during read of size 4 at 0x6F183C0 by thread #1
 Locks held: none
  at 0x14E72E3: World::InitDailyQuestResetTime() (World.cpp:2772)
  by 0x14E3A01: World::SetInitialWorldSettings() (World.cpp:1790)
  by 0x101122A: Master::Run() (Master.cpp:164)
  by 0x101740C: main (Main.cpp:142)

 This conflicts with a previous write of size 4 by thread #2
 Locks held: none
  at 0x6C2D3BA: __tzfile_compute (tzfile.c:797)
  by 0x6C2D036: __tz_convert (tzset.c:627)
  by 0x164146C: LogMessage::getTimeStr(long) (Appender.cpp:23)
  by 0x1641550: LogMessage::getTimeStr() (Appender.cpp:31)
  by 0x1641722: Appender::write(LogMessage&) (Appender.cpp:80)
  by 0x1633FCE: Logger::write(LogMessage&) (Logger.cpp:83)
  by 0x16433D8: LogOperation::call() (LogOperation.cpp:29)
  by 0x16428A4: LogWorker::svc() (LogWorker.cpp:45)
 2013-09-07 14:37:54 +02:00
Spp 9bea4fc451 Core/RBAC: Move ban commands to RBAC (using individual permissions) 2013-08-30 16:26:52 +02:00
Spp 3232b69ff3 Core/RBAC: Move commands security to RBAC (using generic RBAC Permissions) 
- Warning: This will break commands for any custom security level
 2013-08-30 13:57:09 +02:00
Nay 3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Vincent_Michael cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Spp b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Spp 984493108b Core/Logging: Fix incorrect error level for some warden messages 
Core/Logging: Fix incorrect filter type for many network messages
Core/Logging: Use OPCODE filter type for network messages related to wrong packets
 2012-08-21 22:12:55 +02:00
Vincent-Michael 9e84942917 Core/Commands: Convert ban / unban / baninfo / banlist commands in commandscript 2012-07-14 13:37:57 +02:00