Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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 |