Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -1/+1 |
|\ | |||||
| * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | | |||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -11/+11 |
| | | |||||
* | | Missing space. | Alexander Harkness | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-20 | 1 | -0/+11 |
|\| | |||||
| * | Fix for fix #1552 | Julian Laubstein | 2014-10-20 | 1 | -2/+2 |
| | | |||||
| * | Added error message | Julian Laubstein | 2014-10-20 | 1 | -0/+11 |
| | | |||||
* | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 1 | -10/+6 |
| | | |||||
* | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -2/+0 |
|/ | |||||
* | cMojangAPI: Don't update data if server is in offline mode. | Mattes D | 2014-10-17 | 1 | -2/+2 |
| | |||||
* | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | Added an explicit setting for allowing BungeeCord handshake. | madmaxoft | 2014-09-17 | 1 | -0/+7 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 1 | -19/+11 |
|\ | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | Merge remote-tracking branch 'origin/master' into Ranks | Mattes D | 2014-08-22 | 1 | -1/+3 |
| |\ | |||||
| | * | Added initializers for class members. | Mattes D | 2014-08-21 | 1 | -1/+3 |
| | | | | | | | | | | | | As reported by Coverity, these weren't initialized. | ||||
| * | | Removed cGroup and cGroupManager. | Mattes D | 2014-08-21 | 1 | -18/+8 |
| |/ | |||||
* / | Added new console command with cleanup | Tiger Wang | 2014-08-29 | 1 | -17/+42 |
|/ | |||||
* | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -2/+2 |
| | |||||
* | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | |||||
* | Revert "Only one instance of server can be started" | Tiger Wang | 2014-07-20 | 1 | -0/+2 |
| | | | | | | This reverts commit 6484e9814a3a540518606f552398e0b82f91ab4d. * Fixes #1200 | ||||
* | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 1 | -1/+2 |
| | |||||
* | Removed duplicate IPvX labels. | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| | |||||
* | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
* | 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. | ||||
* | 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 |
| | |||||
* | Only one instance of server can be started | Tiger Wang | 2014-07-13 | 1 | -2/+0 |
| | | | | | | | | | This disallows the UDP multicasting that the original code enabled. xoft deterrent, in PR #1151 you implied that this was unwanted behaviour (but comments gone now as I force pushed - check emails?). Revert at will if unsatisfactory :P | ||||
* | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 1 | -0/+3 |
| | |||||
* | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | |||||
* | Fixed some warnings in Server.cpp, and in UI/ | Julian Laubstein | 2014-05-19 | 1 | -1/+7 |
| | |||||
* | removed the <list> include | Julian Laubstein | 2014-05-18 | 1 | -1/+0 |
| | |||||
* | Added unload <pluginname> command | Julian Laubstein | 2014-05-18 | 1 | -5/+9 |
| | |||||
* | Added load cmd | Julian Laubstein | 2014-05-17 | 1 | -5/+29 |
| | |||||
* | Added load command in the cServer class | Julian Laubstein | 2014-05-17 | 1 | -0/+6 |
| | |||||
* | Declared one mutex as mutable in order to allow for const correct get accessors. | jfhumann | 2014-04-19 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 1 | -2/+2 |
| | | | | | | | | Code by Howaner. Fixes/Changes by me. | ||||
* | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/Globals.h | ||||
| * | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+1 |
| | | |||||
* | | Fixed more Format issues | Tycho | 2014-03-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #709 from Howaner/GlobalFixes | Mattes D | 2014-02-28 | 1 | -0/+2 |
|\ | | | | | Add 'Group not found', when the Server load the users.ini and add auto g... | ||||
| * | Remove old Output Finish | Howaner | 2014-02-21 | 1 | -2/+0 |
| | | |||||
| * | Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini | Howaner | 2014-02-21 | 1 | -0/+4 |
| | | |||||
* | | Disabled the leak finder. | madmaxoft | 2014-02-20 | 1 | -1/+3 |
|/ | |||||
* | "reload" is back. | STRWarrior | 2014-02-09 | 1 | -0/+7 |
| | |||||
* | Split "reload" in "reloadplugins" and "reloadgroups". | STRWarrior | 2014-02-09 | 1 | -2/+5 |
| | |||||
* | The console reload command also reloads the groups. | STRWarrior | 2014-02-09 | 1 | -0/+1 |
| | |||||
* | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 1 | -1/+2 |
| | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
* | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 1 | -1/+1 |
|\ | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
* | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 1 | -10/+2 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -10/+1 |
|\ | |||||
| * | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 1 | -10/+1 |
| | | | | | | | | This fixes #560 and #390. | ||||
* | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -1/+1 |
|/ | |||||
* | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -1/+1 |
| | |||||
* | Fixed favicons | Tiger Wang | 2014-01-07 | 1 | -13/+1 |
| | |||||
* | Merge pull request #514 from derouinw/master | Mattes D | 2014-01-07 | 1 | -0/+14 |
|\ | | | | | Implement favicon for 1.7.2 | ||||
| * | Avoid making copies of favicon string | Bill Derouin | 2014-01-07 | 1 | -1/+1 |
| | | |||||
| * | A few more touch ups | Bill Derouin | 2014-01-07 | 1 | -1/+1 |
| | | |||||
| * | A few touch ups | Bill Derouin | 2014-01-07 | 1 | -1/+4 |
| | | |||||
| * | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 1 | -0/+11 |
| | | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet | ||||
* | | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
|/ | |||||
* | fixxed warnings in Server.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+5 |
| | |||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -1/+1 |
| | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
* | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | Ref.: #407 | ||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Compile fix again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Fixed Linux compile again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -2/+2 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+707 |