Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 03:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,237 Commits 4 Branches 147 Tags
a6a556ce09facff3918a33be6b976e5ccb7e1469
Commit Graph

36 Commits

Author SHA1 Message Date
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
kiper
8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Spp
57490ead83 Core/Commands: Allow to search for other account/characters from a selected player without having to write the ip as argument (By Bizzy) 2011-12-30 08:27:05 +01:00
Wilds
711a5793bc Core/Battleground: fix invite accept wait timer (m_events must be always updated, not only when schedule) 2011-12-25 09:32:09 +01:00
Shauren
638693e78f Core: Fixed more warnings (C6246: Local declaration of 'x' hides declaration of the same name in outer scope.) 2011-11-23 17:55:16 +01:00
Jorge
4749c853cc Merge pull request #3901 from Yelvann/master 
Core/Arenas: Members of same arena team were able to fight each othe...
 2011-11-09 11:59:13 -08:00
Yelvann
74dad924fc Core/Arenas: Members of same arena team were able to fight each other 
and minor refactoring
Closes #3753
 2011-11-09 20:33:01 +01:00
Bootz
f75ec5ba2b Core: Codestyle clean-up 
"plr"->player

Note: codestyle methods needs maintained, Player* player.
 2011-11-07 11:06:39 -06: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
megamage
e81b3c6fde Move thread-unsafe events from Player to BattlegroundQueue. Fix crash #2960. 2011-09-19 17:22:27 -04:00
Spp
af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
Spp
4ecda557e4 Core/Battleground: Some (minor) code optimizations 
- All access to Battleground vars are done using funtions (Remove friendship from Battleground and BattlegroundMgr)
- Move specific 47 mins arena check to battleground code as its generic to all arenas
- Create PreUpdateImpl and PostUpdateImpl functions. Specific battlegrounds will implement those if needed (No more need of call Battleground::Update inside specific BGs)
- Modify Create function to use only one parameter
- Remove EventPlayerCapturedFlag from Battleground class, only one BG implements it and it's not used outside that BG.
 2011-08-05 11:57:09 +02:00
Spp-
acd0fc79f6 Core: Pass by const reference for simple objects replaced with pass by value 2011-08-01 14:23:27 +02:00
Spp-
b2a84d9f1e Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons) 2011-07-27 12:14:27 +02:00
click
158966dc79 Core: Codestyle cleanup 2011-06-11 22:35:29 +02:00
leak
ce01a37c2c Core/ObjectMgr: Refactor arena team related functions into dedicated class 2011-05-03 15:01:37 +02:00
leak
1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
Shocker
d1e01f8f12 Core/Battlegrounds: Typo fix from an older rev regarding memory leak 2011-04-02 17:07:34 +03:00
leak
a874fe0764 Core/Battlegrounds: Fixed memory and CPU cycle leak that was caused by BG objects not being removed properly in "All Arenas" case 2011-03-13 21:52:37 +01:00
Machiavelli
e07e20ffca Core/Log: Implement log masks for debug log level, to allow selective debug output. Update your worldserver.conf. 2011-02-20 20:16:34 +01:00
Machiavelli
957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
Shauren
928443d899 Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming) 
--HG--
branch : trunk
 2010-12-23 23:25:44 +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
Spp
408fce1de6 Core: Some optimizations 
- Declare some functions const
- Fix some mem leak
- Fix some resource leak
- Remove unused variables and functions
- Remove duplicate functions
- Reduce the scope of some variables
- Remove unused file

--HG--
branch : trunk
 2010-12-06 02:07:53 +01:00
Spp
25ac835507 Core/Groups: Move all function definition from .h to .cpp 
Core/Groups: Remove Group.h dependency from any .h file

--HG--
branch : trunk
 2010-11-29 07:50:31 +01:00
Shocker
48d90fab32 Misc: Some engrish fixes, thanks to ZxBiohazardZx, closes issue 4740 
--HG--
branch : trunk
 2010-11-14 23:46:34 +02:00
click
f0c4241ea4 Remove the accidental additions of CRLF-crap from the header updates 
--HG--
branch : trunk
 2010-10-07 15:35:36 +02:00
click
8ea4b32fab Update copyright headers (following the same standard in all files = good) 
--HG--
branch : trunk
 2010-10-07 12:41:56 +02:00
Liberate
00630d94d4 Core/Arena: Fix another exploit: When leaving your team in the middle of the arena fight your average Matchmaker Rating will not change till after the fight. 
--HG--
branch : trunk
 2010-09-12 18:41:47 +02:00
Shocker
8331da627d Some old typo fixes, closes issues #3747, #2756, #2607, thanks 2010phenix/jean-michele.nefen/toshik.777 
--HG--
branch : trunk
 2010-09-02 15:25:02 +03:00
Liberate
9bd804dece Updates the arena rating system to use Matchmaker Rating. 
The arena_team_stats sql in this commit sets all ratings to 0.
You start with 0 Team Rating and 1500 Matchmaker Rating.
Personal rating is moved to character_arena_stats, and will not reset when disbanding an arena team.
This new system is based on all the info I could get, but Blizzard didn't leak much info about the new system.
At least this system is really close to the official system.
Any issues found should be reported in an issue.
Huge thanks go to Aokromes for the intensive testing he has done with me.
Also thanks to Parzival for hearing me out and giving his ideas.
Fixes issue #3189

--HG--
branch : trunk
 2010-08-27 18:18:26 +02:00
silinoron
8649bee17f Replace World::getConfig with World::getFloatConfig, World::getIntConfig, and World::getBoolConfig. 
Also fix a warning from a previous commit.

--HG--
branch : trunk
 2010-08-23 19:56:47 -07:00
XTZGZoReX
39c61157c5 Fixed *nix build. 
--HG--
branch : trunk
 2010-08-08 09:36:45 -05:00
XTZGZoReX
9083271a2f * Some singleton renames for consistency: 
accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr

--HG--
branch : trunk
 2010-08-08 05:25:45 +02:00
XTZGZoReX
909e332579 * Rename: BattleGround -> Battleground. 
--HG--
branch : trunk
 2010-08-08 04:37:24 +02:00
click
3d1efa6ed7 Renaming a little bit more - this IS war! 
--HG--
branch : trunk
rename : src/server/game/BattleGrounds/BattleGroundQueue.cpp => src/server/game/Battlegrounds/BattlegroundQueue.cpp
rename : src/server/game/BattleGrounds/BattleGroundQueue.h => src/server/game/Battlegrounds/BattlegroundQueue.h
 2010-08-08 04:27:32 +02:00