Commit Graph
561 Commits
Author SHA1 Message Date
Mattes D 936604ca95 cMojangAPI: Fixed MakeUUID___() bindings.
ToLua would generate a shadow return value for the input strings.
2014-08-21 15:19:30 +02:00
STRWarrior 3a113e3a75 Merge pull request #1339 from mc-server/Hooks
Added HOOK_SERVER_PING
2014-08-20 22:57:48 +02:00
Howaner 4da61e67d7 Renamed a_Motd to a_ServerDescription. 2014-08-20 22:22:38 +02:00
Howaner cf5ab14ca5 Added a_ClientHandle to the HOOK_SERVER_PING hook. 2014-08-20 22:19:50 +02:00
Howaner cfdf39a75f Added "HOOK_SERVER_PING" call to older protocols 2014-08-20 16:12:05 +02:00
Howaner 2cca4d70c8 Cleaned up code. 2014-08-20 16:04:18 +02:00
Howaner 228dd61995 Added HOOK_SERVER_PING 2014-08-20 16:01:30 +02:00
Franz Reiter 8f0c4911f7 Merge pull request #1296 from mc-server/LuaAPI
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
2014-08-12 16:05:33 +02:00
madmaxoft 0a52ed6eb9 cProtocol172: Check return values.
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
2014-08-11 15:33:20 +02:00
Howaner 47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
archshift 92f67789fc Gave names to unnamed enums 2014-08-10 15:06:59 -07:00
madmaxoft 9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Howaner f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
Mattes D 7b986e65d2 Merge pull request #1285 from mc-server/StrCaseRefactor
Refactored case-conversion functions.
2014-08-04 12:02:57 +02:00
madmaxoft 1fa210c7f9 Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
Howaner 8cdcfcceb3 Changed properties for-loop. 2014-08-04 11:26:31 +02:00
Howaner 977a9948b9 Fixed skins in mc 1.7.9/1.7.10 2014-08-03 22:15:26 +02:00
madmaxoft 21f52676f3 cMojangAPI: Added UUID-to-Name lookup.
Also fixed the bindings, now all functions are static-like.
2014-08-03 22:04:51 +02:00
madmaxoft 003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName().
This is a simpler way to ask for a single name -> uuid conversion.
2014-08-03 22:04:50 +02:00
Mattes D 941a182d8a Merge pull request #1255 from mc-server/NameToUUID
Name to UUID
2014-08-01 22:35:12 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft 70fd7caf1f Removed trailing whitespace. 2014-07-31 22:54:45 +02:00
madmaxoft 59adf113f0 MojangAPI: Moved the settings to a separate ini section. 2014-07-31 17:22:48 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
madmaxoft 8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft 0336e12cee MojangAPI: Renamed cache file to MojangAPI.sqlite. 2014-07-30 17:09:41 +02:00
madmaxoft 85d64d291a MojangAPI: Clarified the UUID conversion code. 2014-07-30 14:09:30 +02:00
madmaxoft 17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
madmaxoft 6476bd0e2e Exported cMojangAPI to Lua. 2014-07-30 13:56:29 +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
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
madmaxoft f5f9656917 cAuthenticator: Added GetUUIDsFromPlayerNames(). 2014-07-28 12:37:48 +02:00
archshift 4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07: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
archshift 52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft 1cb26bda8e Fixed spaces after commas in protocol data.
The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
2014-07-19 15:07:28 +02:00
madmaxoft 00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D 4293db5eae Merge pull request #1214 from mc-server/anti-glob
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift f94cf49980 Authenticator.cpp: Killed a global destructor warning 2014-07-18 21:38:55 -07:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 15aacc24a5 Protocol/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang 719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01: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
archshift 33b0a719da ProtocolRecognizer.cpp: removed unused NumBytesRead 2014-07-17 18:39:44 -07:00
madmaxoft c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00