Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
Mattes D
a9e77fe7da
cRoot: Fixed a memory leak with cRankManager.
2014-11-26 11:00:46 +01:00
Tiger Wang
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
Mattes D
c9a3cb4d3f
Fixed trailing whitespace.
2014-11-12 21:59:42 +01:00
Lukas Pioch
13b20d6fe2
renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump
2014-11-05 21:57:38 +01:00
Lukas Pioch
9f71a4e7ae
Added FindAndDoWithUUID
2014-11-02 21:01:23 +01:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Tiger Wang
51fa6b4090
Suggestions
2014-10-23 23:58:01 +01:00
Mattes D
449d08cb3d
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Tiger Wang
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
Tiger Wang
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
Tiger Wang
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
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