summaryrefslogtreecommitdiffstats
path: root/src/Server.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Temporarily commented out override directives."Tycho2014-09-051-1/+1
| | | | | | | | | | | | | | | This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
* Merge branch 'master' into ComponentRewriteTycho2014-09-051-33/+50
|\ | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/LoggerListeners.cpp src/Mobs/Monster.cpp src/UI/SlotArea.h
| * Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-19/+11
| |\ | | | | | | | | | | | | Conflicts: src/Server.cpp
| | * Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-221-1/+3
| | |\
| | | * Added initializers for class members.Mattes D2014-08-211-1/+3
| | | | | | | | | | | | | | | | As reported by Coverity, these weren't initialized.
| | * | Removed cGroup and cGroupManager.Mattes D2014-08-211-18/+8
| | |/
| * / Added new console command with cleanupTiger Wang2014-08-291-17/+42
| |/
* / Temporarily commented out override directives.Samuel Barney2014-08-211-1/+1
|/
* Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-2/+2
|
* Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
|
* Revert "Only one instance of server can be started"Tiger Wang2014-07-201-0/+2
| | | | | | This reverts commit 6484e9814a3a540518606f552398e0b82f91ab4d. * Fixes #1200
* Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
|
* Removed duplicate IPvX labels.madmaxoft2014-07-181-2/+2
|
* Normalized comments.madmaxoft2014-07-171-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.madmaxoft2014-07-171-3/+3
| | | | There should be at least two spaces in front and one space after //-style comments.
* Store properties as Json::ValueTiger Wang2014-07-161-1/+1
|
* Player properties are now retrievedTiger Wang2014-07-141-2/+2
|
* Only one instance of server can be startedTiger Wang2014-07-131-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.madmaxoft2014-07-111-0/+3
|
* Nullify deleted pointers.archshift2014-06-191-0/+1
|
* Fixed some warnings in Server.cpp, and in UI/Julian Laubstein2014-05-191-1/+7
|
* removed the <list> includeJulian Laubstein2014-05-181-1/+0
|
* Added unload <pluginname> commandJulian Laubstein2014-05-181-5/+9
|
* Added load cmdJulian Laubstein2014-05-171-5/+29
|
* Added load command in the cServer classJulian Laubstein2014-05-171-0/+6
|
* Declared one mutex as mutable in order to allow for const correct get accessors.jfhumann2014-04-191-1/+1
|
* Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-2/+2
|\ | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * Added Yggdrasil Authentication Systemdaniel09162014-04-131-2/+2
| | | | | | | | Code by Howaner. Fixes/Changes by me.
* | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+1
|/
* Merge branch 'Werror' into warningsTycho2014-03-121-1/+1
|\ | | | | | | | | Conflicts: src/Globals.h
| * Unified Vector classesandrew2014-03-111-1/+1
| |
* | Fixed more Format issuesTycho2014-03-111-1/+1
|/
* Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-281-0/+2
|\ | | | | Add 'Group not found', when the Server load the users.ini and add auto g...
| * Remove old Output FinishHowaner2014-02-211-2/+0
| |
| * Add 'Group not found', when the Server load the users.ini and add auto generate from users.iniHowaner2014-02-211-0/+4
| |
* | Disabled the leak finder.madmaxoft2014-02-201-1/+3
|/
* "reload" is back.STRWarrior2014-02-091-0/+7
|
* Split "reload" in "reloadplugins" and "reloadgroups".STRWarrior2014-02-091-2/+5
|
* The console reload command also reloads the groups.STRWarrior2014-02-091-0/+1
|
* Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-281-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/mobimprovementsMattes D2014-01-251-1/+1
|\ | | | | Mob improvements & rudimentary artificial intelligence
| * Mob bugfixesTiger Wang2014-01-251-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.madmaxoft2014-01-231-10/+2
|/
* Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-10/+1
|\
| * Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-191-10/+1
| | | | | | | | This fixes #560 and #390.
* | Scoreboard protocol supportandrew2014-01-211-1/+1
|/
* Command blocks: Execute()andrew2014-01-181-1/+1
|
* Fixed faviconsTiger Wang2014-01-071-13/+1
|
* Merge pull request #514 from derouinw/masterMattes D2014-01-071-0/+14
|\ | | | | Implement favicon for 1.7.2
| * Avoid making copies of favicon stringBill Derouin2014-01-071-1/+1
| |
| * A few more touch upsBill Derouin2014-01-071-1/+1
| |
| * A few touch upsBill Derouin2014-01-071-1/+4
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-071-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.madmaxoft2014-01-071-1/+1
|/
* fixxed warnings in Server.cppTycho Bickerstaff2013-12-311-0/+5
|
* Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-161-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.madmaxoft2013-12-081-1/+1
| | | | Ref.: #407
* Fixed the remaining derpsAlexander Harkness2013-11-271-2/+2
|
* Compile fix againTiger Wang2013-11-261-1/+1
|
* Fixed Linux compile againTiger Wang2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
|
* Moved source to srcAlexander Harkness2013-11-241-0/+707
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:34:48 +0100