flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,496 Commits 1 Branch 0 Tags 92 MiB
c57bf8e538
Commit Graph

119 Commits

Author SHA1 Message Date
Tiger Wang
cc600de51f Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-19 12:34:05 +01:00
Tiger Wang
6d5a8892f3 Use std::thread 2014-10-19 00:29:34 +01:00
Tiger Wang
2874bf73be Merge pull request #1502 from mc-server/furnaces 
Improved furnaces
 2014-10-18 21:33:55 +01:00
Tiger Wang
eb821ff240 Fixed failure for cRankManager to restart 2014-10-18 19:55:01 +01:00
Mattes D
687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
Tycho
27be179939 Added abilty to set build info 
build info is displayed at startup
Fixes #1410
 2014-09-10 16:07:00 +01:00
worktycho
64071aeda9 capitalisation error 2014-09-08 17:45:23 +01:00
worktycho
4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho
5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01:00
Tiger Wang
431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer 
Conflicts:
	src/Server.cpp
 2014-08-29 14:56:40 +01:00
Tiger Wang
618741f78e Added new console command with cleanup 2014-08-29 14:43:49 +01:00
Mattes D
e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D
8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02:00
madmaxoft
e110f72268 RankMgr: Initial migration code. 2014-08-13 09:53:33 +02:00
Tycho
9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Tycho
806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft
4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. 
The cache is persisted into a SQLite DB file on server shutdown.
 2014-07-30 13:56:29 +02:00
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
Tiger Wang
a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang
6ab9afd0fd Bug and crash fixes 
* 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
 2014-07-20 10:46:45 +01:00
archshift
14826b6606 main.cpp: field style fixes 2014-07-19 15:44:19 -07:00
archshift
ed01e12ed7 main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED 2014-07-19 14:50:01 -07:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
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
 2014-07-18 20:10:51 +01:00
madmaxoft
7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
Tiger Wang
1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Tiger Wang
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
daniel0916
b506a74076 Added Yggdrasil Authentication System 
Code by Howaner.  Fixes/Changes by me.
 2014-04-13 13:04:56 +02:00
Tiger Wang
6eacf1aa92 Fixed a minor ini key duplication bug 2014-03-28 23:07:50 +00:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
7e6ee7ef81 Fixed more Format issues 2014-03-11 14:43:14 -07:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
Howaner
a755758553 Unicode :-( 2014-02-21 14:55:28 +01:00
Howaner
21febaf4b3 Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini 2014-02-21 14:53:46 +01:00
madmaxoft
52cd9dfe9f Removed the unnecessary LoopPlayersAndBroadcastChat() functions. 2014-02-15 23:26:19 +01:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions 
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
 2014-02-07 18:58:52 +00:00
madmaxoft
e165da946e WebAdmin is stopped properly on server shutdown / restart. 
Fixes #272.
 2014-02-07 12:26:41 +01:00
madmaxoft
916020d6c2 Fixed wiki link in auto-generated settings.ini. 2014-02-07 12:07:22 +01:00
STRWarrior
7c750914f0 Improvements: 
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.
 2014-02-05 18:10:08 +01:00
madmaxoft
76457d3673 Fixed timing on *nix. 2014-01-28 16:28:55 +01:00
andrew
852c52bee9 Fixed GetPhysicalRAMUsage on Linux 2014-01-01 11:18:56 +02:00
Tycho Bickerstaff
94ca07cfbf Merge branch 'master' of github.com:mc-server/MCServer 2013-12-22 13:19:27 +00:00
Tiger Wang
43e8196309 Added many event catchers 
* Window close
* CTRL-C
* etc.
 2013-12-22 20:03:58 +00:00
Tycho Bickerstaff
9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
STRWarrior
5a39dff904 HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. 2013-12-11 16:19:38 +01:00
STRWarrior
12bd5082b8 Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. 2013-12-11 12:39:13 +01:00
Tiger Wang
1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures 
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
 2013-12-08 14:02:45 +00:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder. 
Ref.: #407
 2013-12-08 12:17:54 +01:00
Tiger Wang
b779d84663 Console trims its commands before executing 'em 2013-12-07 22:35:24 +00:00
madmaxoft
bf30528ec4 DeadlockDetect is configurable now. 
This is needed when debugging Lua plugins.
 2013-11-30 22:14:47 +01:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00