1
0
Commit Graph

202 Commits

Author SHA1 Message Date
Tycho
d904e89712 Merge branch 'Werror' into warnings
Conflicts:
	src/Globals.h
2014-03-12 10:12:13 -07:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
madmaxoft
5d7df54e35 Fixed Lua string return values.
Fixes #773.
2014-03-12 14:11:28 +01:00
madmaxoft
a7f9df24d4 The entire unknown command is echoed back to the user on error. 2014-03-12 13:11:34 +01:00
madmaxoft
0c15fdf7b0 Moved Lua API registering into a separate function.
This will allow us to use Lua as lite-config files as well, should we want to.
2014-03-12 13:05:28 +01:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
andrew
9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +02:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tycho
c3758112cc Merge branch 'master' into warnings 2014-03-08 07:13:45 -08:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
fd4eda7d24 Fixed a typo. 2014-03-07 17:43:19 +01:00
Howaner
c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
madmaxoft
97d803e34f Added cBlockArea serialization to string.
Fixes #665.
2014-03-07 09:17:13 +01:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
madmaxoft
8f78288564 Manually exported cCompositeChat modifiers.
This adds chaining support to them. Fixes #755.
2014-03-04 22:17:23 +01:00
madmaxoft
ecfe17b096 cLuaState: Made public the GetStackValue() functions. 2014-03-04 21:55:24 +01:00
madmaxoft
7fb354e8f0 Fixed MSVC warnings in DeprecatedBindings. 2014-03-02 16:34:16 +01:00
andrew
0c87341631 GetById => Get 2014-03-02 16:24:09 +02:00
andrew
cff4ee11f1 Removed g_BlockXXX arrays 2014-03-02 11:30:20 +02:00
andrew
68b75f7b7a Manually exported g_Block tables 2014-03-02 11:12:29 +02:00
andrew
3ca56b39bc Exported cBlockInfo 2014-03-02 10:50:24 +02:00
andrew
39c8e68ef0 Exported cScoreboard::ForEachTeam 2014-03-01 14:27:55 +02:00
andrew
a28e5eca18 Exported cScoreboard::ForEachObjective 2014-03-01 14:03:16 +02:00
andrew
5c44945287 Exported and documented cScoreboard 2014-03-01 12:08:40 +02:00
madmaxoft
aaddc98b46 Attempted fix for several GCC warnings. 2014-02-26 21:37:38 +01:00
madmaxoft
f96801290e Fixed tolua export for Byte.
No longer treated as an unknown class.
2014-02-24 22:52:55 +01:00
Tiger Wang
f77720c43f Merge pull request #669 from xdot/master
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
madmaxoft
3af235b9bb Added cBlockArea:GetSize() and :GetOrigin() to Lua API.
These don't have a direct C++ equivalent, but are rather useful for the plugins.
2014-02-23 14:03:24 +01:00
andrew
30b22e9f59 Manually exported DoWithMap 2014-02-23 13:25:02 +02:00
andrew
9fa4fa1cc7 Documented and exported cMapManager 2014-02-23 12:55:55 +02:00
andrew
866fde81ca Documented and exported cMap 2014-02-22 13:59:49 +02:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
madmaxoft
a3fa52ec73 Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().
They no longer require the ghost output params.
2014-02-20 11:06:14 +01:00
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner
d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
Tiger Wang
6788dbe7f2 Properly exported and documented paintings 2014-02-18 11:37:45 +00:00
madmaxoft
1a26f05ed0 Added cPluginManager:GetPluginsPath() to the Lua API. 2014-02-17 23:36:39 +01:00
madmaxoft
865ae82114 Add Lua plugin path to package.path and .cpath.
Fixes #693.
2014-02-17 23:12:46 +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
andrew
5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
madmaxoft
a1e01ff725 cWorld:ChunkStay() accepts nils as callbacks.
Also removed leftover debug logging.
2014-02-11 15:04:35 +01:00
madmaxoft
33c84aaa4d Added cLuaState::CheckParamFunctionOrNil().
Also fixed error reporting for the two function-checking functions.
2014-02-11 15:03:35 +01:00
madmaxoft
b41bb3bb44 Fixed nested plugin function calls. 2014-02-11 08:52:14 +01:00
madmaxoft
9cebc9157c Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
2014-02-10 22:47:10 +01:00
madmaxoft
589a4839df cLuaState: Stack traces don't include ghost 0-th element. 2014-02-10 22:44:56 +01:00
madmaxoft
5aa1123f70 Added cPluginLua::cOperation.
This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete.
2014-02-10 20:38:02 +01:00
madmaxoft
47a497fa89 First working version of cLuaChunkStay.
It works, but has random failures, probably due to threading issues.
2014-02-09 20:39:45 +01:00
madmaxoft
9455f59b11 Initial Lua cChunkStay export. 2014-02-09 18:56:16 +01:00
madmaxoft
310a25c456 cLuaState::cRef can be unbound and re-bound.
This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor.
2014-02-09 18:39:22 +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
f86f066615 Merge branch 'master' into playerimprovements
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
madmaxoft
cfd6875c86 Fixed cWorld:TryGetHeight() API. 2014-02-08 13:35:08 +01:00
Tiger Wang
aa8b46e947 Server internally uses new functions 2014-02-05 23:24:16 +00:00
madmaxoft
e5dce265ae Added cPluginManager:LogStackTrace() to the Lua API.
Fixes #637.
2014-02-05 00:16:33 +01:00
madmaxoft
82173db9bf Fixed a gcc warning in ManualBindings.
Constructor member order...
2014-02-04 22:26:35 +01:00
madmaxoft
010e64be11 Removed a useless check in cLuaState. 2014-02-04 22:24:03 +01:00
madmaxoft
3dc1452790 Fixed calling plugins with userdata params. 2014-02-04 14:26:36 +01:00
madmaxoft
1dbfd7eb76 Removed a leftover debug message. 2014-02-04 11:37:34 +01:00
madmaxoft
69c85e5169 Fixed error handling in cPluginManager:CallPlugin() API.
Fixed: When the called function malfunctioned, the entire plugin's call was aborted.
2014-02-04 10:29:10 +01:00
madmaxoft
aa19f4fd04 Improved error resistance in cPluginManager:CallPlugin().
Fixed: If the call failed, all the next plugin calls would fail as well.
2014-02-04 09:18:32 +01:00
Mattes D
33759197e9 Merge pull request #585 from daniel0916/hooks
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
daniel0916
dbbd47b96d Removed "player destroying" hook 2014-02-01 13:27:44 +01:00
madmaxoft
882d108622 Fixed cLineBlockTracer:Trace() signature. 2014-01-31 16:01:16 +01:00
madmaxoft
5092ae5266 Added cPluginManager:BindCommand() form to the API.
That's the canonical way to call static functions.
2014-01-31 16:01:15 +01:00
madmaxoft
b61a74d6a2 Lua: Fixed an error in table-functions callbacks. 2014-01-29 22:56:38 +01:00
madmaxoft
e40c5a20c8 Plugin files are loaded in alphabetical order.
Except for the Info.lua file which gets loaded always last. Implements #597.
2014-01-29 17:48:04 +01:00
Mattes D
09ee8a1bb6 Merge pull request #589 from mc-server/minecartimprovements
Minecart improvements
2014-01-26 05:13:54 -08:00
Tiger Wang
52f7467fe1 Reduced unnecessary echoes (thanks xoft) 2014-01-25 23:48:48 +00:00
Mattes D
f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Tiger Wang
1d0e1bdcb1 Improved AllToLua UI experience 2014-01-25 19:36:20 +00:00
Tycho
2a18feb015 Stupid Mistake fixed 2014-01-25 10:13:54 -08:00
Tycho
2806b48afa Fixed exports 2014-01-25 06:06:30 -08:00
daniel0916
bac750b24e Added "player destroying" and "player destroyed" hooks
Hooks:
HOOK_PLAYER_DESTROYING
HOOK_PLAYER_DESTROYED

Idea from: https://github.com/mc-server/MCServer/issues/473
2014-01-25 11:25:22 +01:00
Tycho
27d1d5d491 Bugfixes 2014-01-23 11:00:36 -08:00
Tycho
e0956be0a7 added dependecies for bindings regen 2014-01-23 10:41:08 -08:00
madmaxoft
435eae3858 Fixed crash while calling disabled plugins. 2014-01-23 16:14:00 +01:00
Tycho
5ef0a00a6c Fixed spelling error 2014-01-22 10:39:09 -08:00
Tycho
571200019d Added manual bindings for moved functions 2014-01-22 10:35:36 -08:00
madmaxoft
2a018cfa49 Implemented cPluginManager:CallPlugin() API.
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
madmaxoft
41618bf242 Changed the cWorld::ScheduleTask() signature.
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
4a01879911 cLuaState can now check function params. 2014-01-19 23:45:26 +01:00
STRWarrior
24df625fbd Exported cFloater to the Lua API. 2014-01-19 00:04:46 +01:00
andrew
1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
madmaxoft
c44ce84497 Fixed whitespace in previous commit. 2014-01-16 20:30:25 +01:00
madmaxoft
343136a2ae Finished exporting cWorld:ScheduleTask() to Lua API. 2014-01-16 19:56:08 +01:00
Mattes D
eb89de4c88 Merge pull request #542 from worktycho/schedular
added cWorld::ScheduleTask Function
2014-01-15 02:45:25 -08:00
Mattes D
457e93f1ed Merge pull request #538 from mc-server/minecarts
Minecarts
2014-01-15 02:42:24 -08:00
Tycho
292ccdc09e added cWorld::ScheduleTask Function
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
2014-01-14 12:17:03 -08:00
madmaxoft
7e59296157 Generating the bindings outputs a message at the end. 2014-01-13 19:57:19 +01:00
madmaxoft
332c1c59eb cCreeper is no longer available in API.
Has been replaced by cMonster.
2014-01-13 17:25:16 +01:00
Tiger Wang
e114008559 Fixed settings plugin generation after IniFile 2014-01-12 14:03:50 +00:00
madmaxoft
328b2db252 Disabled a useless MSVC warning in Bindings.cpp. 2014-01-12 08:43:13 +01:00
Mattes D
751c53ecc6 Merge pull request #532 from mc-server/LuaStateErrorHandler
Lua state error handler
2014-01-11 23:33:29 -08:00
madmaxoft
023ba17688 Lua errors display stack trace.
Fixes #418.
2014-01-11 23:10:40 +01:00
madmaxoft
b2b7e45757 Removed internal methods from public cLuaState interface.
PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides.
Push() needs to be left in the public part, it is used for pushing results in the ManualBindings.

Preparation for #418.
2014-01-11 22:51:10 +01:00
madmaxoft
acfebab027 Removed an unused file. 2014-01-11 21:22:40 +01:00
Mattes D
498fb5b675 Merge pull request #527 from derouinw/biomessplit
Biomessplit
2014-01-11 12:20:41 -08:00