1
0
Commit Graph

274 Commits

Author SHA1 Message Date
madmaxoft
3020e8cc05 Merge remote-tracking branch 'origin/master' into Ranks 2014-08-12 11:10:32 +02:00
madmaxoft
e0b45c1893 Fixed unchecked return values. 2014-08-11 16:06:40 +02:00
Tycho
df96f437a3 Fixed circular dependecy luaState_Call.inc 2014-08-10 22:15:52 +01:00
madmaxoft
b0dedb0197 WebAdmin: Manually exported string conversion functions.
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:56:15 +02:00
madmaxoft
50359ce656 WebAdmin: Manually exported string conversion functions.
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:54:43 +02:00
madmaxoft
0001a7c9fc RankMgr: Added GetRankVisuals() function. 2014-08-09 17:36:19 +02:00
madmaxoft
4b1505f39d Merge remote-tracking branch 'origin/master' into Ranks 2014-08-09 14:25:49 +02:00
madmaxoft
f1dc299fdb Exported cRankManager to LuaAPI. 2014-08-08 23:12:22 +02:00
madmaxoft
3df7d8446c cLuaState: Added GetStackValues() auto-generated templates.
These will read consecutive values off the stack, each value of a type independent of the other values.
Auto-generated because we don't have variadic templates in C++03.
2014-08-08 23:11:42 +02:00
Howaner
0c622522ea Removed debug message. 2014-08-07 01:08:31 +02:00
Howaner
5f04488a97 Made lua clamp() compatible with all number types. 2014-08-05 18:39:18 +02:00
Howaner
43de9af878 Added api documentation for Clamp() 2014-08-05 13:54:04 +02:00
Howaner
a92cff20ea Added Clamp() function to the lua api. 2014-08-05 13:47:10 +02:00
Tiger Wang
de9d908792 Made AllToLua output consistent 2014-08-04 21:21:35 +01:00
madmaxoft
7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +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
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
8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
madmaxoft
426773df17 ManualBindings: Fixed alignment. 2014-07-30 14:03:14 +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
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
archshift
1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
madmaxoft
1acd03f96f Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. 2014-07-28 17:09:39 +02:00
Howaner
f79e682664 Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. 2014-07-27 00:03:00 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
e171285408 Fixed Bindings generation in MSVC.
The bindings weren't regenerated because of the typo in the dependencies cmake variable.
2014-07-22 23:29:23 +02:00
Tiger Wang
18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves
Conflicts:
	src/Defines.h
2014-07-22 18:30:31 +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
d0e7b2f18b Merge branch 'master' into saplingsandleaves
Conflicts:
	src/Bindings/DeprecatedBindings.cpp
	src/Blocks/BlockSapling.h
2014-07-20 12:02:23 +01: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
madmaxoft
9e7958e7fb Fixed MSVC bindings generation. 2014-07-19 13:22:16 +02:00
madmaxoft
c7b7938c04 Renamed AllToLua_lua script.
Fixes #1222.
2014-07-19 09:57:23 +02:00
archshift
0960e6ae8f Moved Windows custom command to src/CMakeLists.txt 2014-07-18 19:53:47 -07:00
archshift
135dc333c1 CMakeLists: Moved Bindings-specific code to subdir 2014-07-18 19:05:51 -07:00
archshift
8325304693 CMake: Add Bindings library from subdirectory 2014-07-18 17:41:44 -07:00
archshift
84fef3c156 src/CMakeLists.txt: Replaced glob with list of files
On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list.
2014-07-18 17:41:44 -07:00
Tiger Wang
0f8c24e04d Fixed issues relating to saplings and leaves
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
2014-07-17 22:26:53 +01:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments.
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.
2014-07-17 22:15:34 +02:00
madmaxoft
7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1 Merge pull request #1193 from mc-server/deathmessages
Death messages
2014-07-17 10:12:22 +02:00
Tiger Wang
2189f37c20 Resolved backwards compatibility issues 2014-07-16 11:38:52 +01:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00