Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -5/+5 |
| | |||||
* | Updated and submodularised JsonCPP | Tiger Wang | 2015-07-10 | 1 | -0/+2 |
| | | | | | Conflicts: lib/jsoncpp | ||||
* | Merge pull request #2241 from lkolbly/master | worktycho | 2015-06-26 | 1 | -2/+5 |
|\ | | | | | Work on NetherPortalScanner. Setup portal scanner to reset PortalCool… | ||||
| * | Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. | Lane Kolbly | 2015-06-13 | 1 | -2/+5 |
| | | |||||
* | | Fixed log files' timestamps | Tiger Wang | 2015-06-14 | 1 | -1/+1 |
|/ | | | | | Also made Release mode log less technical information about the world storage threads. | ||||
* | Fixed build error on Linux | Alexander Harkness | 2015-06-12 | 1 | -1/+1 |
| | |||||
* | SelfTests are registered and executed after logging framework init. | Mattes D | 2015-06-11 | 1 | -3/+14 |
| | | | | Fixes #2228. | ||||
* | Daemon support on Linux. | Anthony Birkett | 2015-06-05 | 1 | -1/+1 |
| | | | | Added null console log listener, avoid printf() when stdout is closed. | ||||
* | Fix for the way connecting clients receive player lists and broadcast chat | b33duck | 2015-05-29 | 1 | -2/+17 |
| | |||||
* | Added method to get the uptime of the server in seconds. Implements #1650. | Lukas Pioch | 2015-05-26 | 1 | -16/+16 |
| | |||||
* | Move make_unique into a namespace to avoid ADL issues | tycho | 2015-05-16 | 1 | -2/+2 |
| | | | | this prevents VS finding std::make_unique for constructors that take types from std | ||||
* | Initial implementation of IniFile overloading | tycho | 2015-05-16 | 1 | -27/+30 |
| | |||||
* | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 1 | -2/+2 |
| | |||||
* | Eliminate race condition in cRoot::FindAndDoWithPlayer | worktycho | 2015-04-24 | 1 | -4/+4 |
| | | | Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer. | ||||
* | Fixed crash on exit introduced with Windows Service capability. | Mattes D | 2015-04-05 | 1 | -20/+14 |
| | | | | Ref.: #1845 | ||||
* | Working as a Windows service. Starts and stops correctly. | Anthony Birkett | 2015-04-01 | 1 | -1/+11 |
| | | | | | | | | | Added "/service" switch, to prompt the binary to attempt starting as a service. Added service* methods, to control service startup. Split up main() into universalMain(), which contains the startup code for both service and normal start. Added cRoot::m_RunningAsService bool, Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller. Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set. | ||||
* | Fixed server failure to open any port not aborting the server. | Mattes D | 2015-01-27 | 1 | -29/+35 |
| | |||||
* | Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types. | Kirill Kirilenko | 2015-01-17 | 1 | -1/+1 |
| | |||||
* | Init Mojang API pointer | worktycho | 2014-12-23 | 1 | -0/+1 |
| | | | Fixes CID 90583 | ||||
* | Fixed crash on restart | Tiger Wang | 2014-12-21 | 1 | -3/+12 |
| | |||||
* | Fixed print of milliseconds from chrono | Lukas Pioch | 2014-12-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1623 from p-mcgowan/issue_1253 | Mattes D | 2014-12-10 | 1 | -0/+16 |
|\ | | | | | Prevent multiple logins with same username, unless allowed in settings | ||||
| * | Changed DoWithPlayer to auto instead of using iterator. | Vincent | 2014-12-09 | 1 | -2/+2 |
| | | |||||
| * | created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. | Vincent | 2014-12-08 | 1 | -1/+8 |
| | | |||||
| * | Fixed compile errors | Vincent | 2014-12-08 | 1 | -1/+1 |
| | | |||||
| * | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. | Vincent | 2014-12-08 | 1 | -0/+9 |
| | | |||||
* | | Fixed compiling. | Howaner | 2014-12-09 | 1 | -1/+1 |
| | | |||||
* | | Fixed trailing whitespace. | Mattes D | 2014-12-04 | 1 | -1/+1 |
| | | |||||
* | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -1/+1 |
|\| | |||||
| * | cRoot: Fixed a memory leak with cRankManager. | Mattes D | 2014-11-26 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -0/+16 |
|\| | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | Fixed trailing whitespace. | Mattes D | 2014-11-12 | 1 | -1/+1 |
| | | |||||
| * | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump | Lukas Pioch | 2014-11-05 | 1 | -2/+2 |
| | | |||||
| * | Added FindAndDoWithUUID | Lukas Pioch | 2014-11-02 | 1 | -0/+16 |
| | | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -3/+2 |
|\| | |||||
| * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -3/+2 |
| | | |||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -22/+22 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-10-24 | 1 | -1/+1 |
| | | |||||
* | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -20/+20 |
| | | |||||
* | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 1 | -9/+3 |
| | | |||||
* | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -16/+6 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-19 | 1 | -1/+2 |
|\| | |||||
| * | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 1 | -1/+2 |
| |\ | | | | | | | Improved furnaces | ||||
| | * | Fixed failure for cRankManager to restart | Tiger Wang | 2014-10-18 | 1 | -1/+2 |
| | | | |||||
* | | | Use std::thread | Tiger Wang | 2014-10-19 | 1 | -10/+20 |
|/ / | |||||
* / | cMojangAPI: Don't update data if server is in offline mode. | Mattes D | 2014-10-17 | 1 | -2/+3 |
|/ | |||||
* | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 1 | -12/+0 |
| | |||||
* | Fixed minor style issues. | madmaxoft | 2014-09-17 | 1 | -2/+2 |
| | |||||
* | Added abilty to set build info | Tycho | 2014-09-10 | 1 | -0/+6 |
| | | | | | build info is displayed at startup Fixes #1410 | ||||
* | capitalisation error | worktycho | 2014-09-08 | 1 | -1/+1 |
| | |||||
* | derp | worktycho | 2014-09-08 | 1 | -1/+1 |
| | |||||
* | If server fails init, save any changed or generated settings. | worktycho | 2014-09-08 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 1 | -24/+19 |
|\ | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | Merge remote-tracking branch 'origin/master' into Ranks | Mattes D | 2014-08-22 | 1 | -8/+18 |
| |\ | |||||
| | * | Renamed Loggers | Tycho | 2014-08-12 | 1 | -7/+7 |
| | | | |||||
| | * | First Implementatation of new Loggin framework | Tycho | 2014-08-10 | 1 | -8/+18 |
| | | | |||||
| * | | Removed cGroup and cGroupManager. | Mattes D | 2014-08-21 | 1 | -16/+0 |
| | | | |||||
| * | | RankMgr: Initial migration code. | madmaxoft | 2014-08-13 | 1 | -0/+1 |
| |/ | |||||
* / | Added new console command with cleanup | Tiger Wang | 2014-08-29 | 1 | -11/+3 |
|/ | |||||
* | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -12/+24 |
|\ | |||||
| * | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| |\ | |||||
| | * | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -2/+2 |
| | | | |||||
| * | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -2/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -15/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
| * | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -9/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| * | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -8/+13 |
| | | | | |||||
* | | | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. | madmaxoft | 2014-07-30 | 1 | -0/+1 |
| |_|/ |/| | | | | | | | | The cache is persisted into a SQLite DB file on server shutdown. | ||||
* | | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -12/+12 |
| | | | |||||
* | | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -3/+3 |
| | | | |||||
* | | | main.cpp: field style fixes | archshift | 2014-07-20 | 1 | -4/+4 |
| | | | |||||
* | | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED | archshift | 2014-07-19 | 1 | -2/+0 |
| |/ |/| | |||||
* | | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
* | | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
* | | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | |||||
* | | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -2/+2 |
|/ | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -8/+6 |
| | |||||
* | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 1 | -2/+2 |
| | | | | Code by Howaner. Fixes/Changes by me. | ||||
* | Fixed a minor ini key duplication bug | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
| | |||||
* | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -5/+5 |
| | |||||
* | Fixed more Format issues | Tycho | 2014-03-11 | 1 | -5/+5 |
| | |||||
* | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -4/+2 |
| | |||||
* | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+0 |
| | |||||
* | Unicode :-( | Howaner | 2014-02-21 | 1 | -1/+1 |
| | |||||
* | Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini | Howaner | 2014-02-21 | 1 | -1/+3 |
| | |||||
* | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 1 | -2/+2 |
| | |||||
* | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+13 |
| | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -5/+12 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | WebAdmin is stopped properly on server shutdown / restart. | madmaxoft | 2014-02-07 | 1 | -5/+2 |
| | | | | | | | | Fixes #272. | ||||
| * | Fixed wiki link in auto-generated settings.ini. | madmaxoft | 2014-02-07 | 1 | -1/+2 |
| | | |||||
| * | Improvements: | STRWarrior | 2014-02-05 | 1 | -0/+9 |
| | | | | | | | | | | | | Adds a function in cRoot that allows you to reload all the groups permissions. Note: Players don't automatically load their new permissions. You can use cPlayer::LoadPermissionsFromDisk for that. | ||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -2/+2 |
|/ | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | Fixed timing on *nix. | madmaxoft | 2014-01-28 | 1 | -1/+1 |
| | |||||
* | Fixed GetPhysicalRAMUsage on Linux | andrew | 2014-01-01 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 1 | -9/+25 |
|\ | |||||
| * | Added many event catchers | Tiger Wang | 2013-12-22 | 1 | -9/+25 |
| | | | | | | | | | | | | * Window close * CTRL-C * etc. | ||||
* | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
|/ | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -34/+38 |
| | |||||
* | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. | STRWarrior | 2013-12-11 | 1 | -0/+1 |
| | |||||
* | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. | STRWarrior | 2013-12-11 | 1 | -0/+18 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Console trims its commands before executing 'em | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
|/ | |||||
* | DeadlockDetect is configurable now. | madmaxoft | 2013-11-30 | 1 | -4/+7 |
| | | | | This is needed when debugging Lua plugins. | ||||
* | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+10 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+744 |