flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,495 Commits 1 Branch 0 Tags 92 MiB
32cab75e43
Commit Graph

343 Commits

Author SHA1 Message Date
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
Mattes D
7e3b26e7ba Merge pull request #1144 from mc-server/LuaCodeGen 
Lua code gen
 2014-07-06 14:44:52 +02:00
madmaxoft
c7a5347cd6 cPluginManager: Reformatted the switch statement. 2014-07-04 15:54:39 +02:00
madmaxoft
8f65d13d1b Merge remote-tracking branch 'origin/HandleCommand' 2014-07-04 15:41:48 +02:00
STRWarrior
41747f0500 Moved sending error messages to cPluginManager:CallHookChat 2014-07-04 15:07:41 +02:00
Tiger Wang
a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
madmaxoft
2dbed03cbc Changed OnWeatherChanging hook to always read the returned weather. 
Ref.: http://forum.mc-server.org/showthread.php?tid=1512
 2014-07-03 17:49:21 +02:00
Mattes D
9204c8a124 Merge pull request #1139 from Howaner/Hooks 
Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE
 2014-07-02 16:33:24 +02:00
Howaner
4a9002045b Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel() 2014-07-02 14:46:00 +02:00
madmaxoft
b6d5d50b31 Tolua generates LuaState_Call.inc file. 2014-07-01 22:29:39 +02:00
madmaxoft
bb0e88fcf8 Initial codegen for LuaState_Call.inc. 2014-07-01 22:29:38 +02:00
madmaxoft
0dfaad4123 Fixed a possibly unused variable. 2014-07-01 22:28:58 +02:00
Howaner
8e11f7a1f6 Fixes. 2014-06-30 21:50:40 +02:00
Howaner
aa753a92c0 Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE 2014-06-30 15:12:56 +02:00
STRWarrior
085cb4256e Fixed doxycomments 2014-06-28 21:55:21 +02:00
Mattes D
1495bba17c Fixed a silly path error in #include. 2014-06-28 18:20:46 +02:00
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL. 
Fixes #1130.
 2014-06-27 19:34:53 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
archshift
f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects 
Changed effect map to take a pointer of the effect as a result.
 2014-06-18 22:54:14 -07:00
STRWarrior
e0a9f37d90 (Force)ExecuteCommand returns the CommandResult enums 
Exported and documented the CommandResult enums
 2014-06-18 12:13:01 +02:00
madmaxoft
fa1d85feca Added the OnEntityAddEffect hook. 2014-06-17 11:39:22 -07:00
archshift
87b1bfaf2a Moved Effects.h to EntityEffects.h, added initial impl 2014-06-17 11:17:32 -07:00
STRWarrior
008a6ce311 Added crBlocked and crNoPermission 2014-06-17 16:19:31 +02:00
STRWarrior
15ae4ce233 HandleCommand now returns an CommandResult enum. 2014-06-17 14:55:15 +02:00
STRWarrior
8928310fd8 Fixed possible confusion. 
If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players.
 2014-06-17 13:27:04 +02:00
Mattes D
f1e3010839 Fixed bindings generation for Win64 builds. 
Fixes #1092.
 2014-06-14 15:47:37 +02:00
Tiger Wang
4b28a24514 Reduced cPluginManager code duplication 2014-06-14 09:51:42 +01:00
tycho
9254666a85 automaticlly build tolua and generate bindings as part of build. 2014-06-12 18:00:53 +01:00
madmaxoft
b3300e3854 Added cBlockArea:GetCoordRange to Lua API. 2014-06-11 14:22:27 +02:00
madmaxoft
02b509b81d ToLua can now be run in pure-lua mode. 
See the src/Bindings/AllToLua_lua.bat for usage example.
 2014-06-09 17:05:22 +02:00
madmaxoft
d92520016d Fixed OnProjectileHitBlock bindings. 
Also sorted the various cLuaState::Push() functions.
 2014-06-03 19:29:23 +02:00
Mattes D
61edb83ce5 Merge pull request #844 from mc-server/ProjectileHitBlock 
OnProjectileHitBlock tweak.
 2014-06-01 20:10:03 +02:00
STRWarrior
319169eafb Made a_BlockHitPos a reference 2014-06-01 14:06:47 +02:00
STRWarrior
d1b23060ad Used recommendations 2014-05-31 14:14:55 +02:00
madmaxoft
b9d306a801 Fixed bindings for cCompositeChat:SetMessageType(). 2014-05-30 22:42:00 +02:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +02:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
STRWarrior
079f8cd535 Fixed the console saying no plugins are loaded. 2014-05-10 17:55:39 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
madmaxoft
4d704255de HOOK_DISCONNECT has cClientHandle as its first parameter. 
Ref.: #655.
 2014-05-02 12:35:34 +02:00
madmaxoft
06da2c86b4 Fixed warnings in ManualBindings. 2014-05-01 23:43:11 +02:00
madmaxoft
d950c8346f Fixed warnings in Lua helpers. 2014-05-01 23:38:35 +02:00
Tycho
ee354a405b Fixed OnPluginMessage hook not exiting early. 
OnPluginMessage hook would call all plugins even after one returned true.
Fixes CID 43512
 2014-04-27 12:37:08 -07:00
jfhumann
26568a852e Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618) 2014-04-26 01:35:25 +02:00
madmaxoft
7119dd293a Updated the tolua executable for Windows. 2014-04-06 22:05:44 +02:00
Mattes D
12b82de502 Removed the bindings to set old g_BlockXXX arrays. 
Those were supposed to be read-only; there's no point in writing to them anyway.
Also fixed MSVC type warnings in the code.
 2014-04-03 09:26:44 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
madmaxoft
bcf5021feb Exported the Base64 encoding and decoding functions to Lua API. 2014-04-01 22:47:39 +02:00
madmaxoft
7aa6a3b866 LOG() API reads the LogLevel from the cCompositeChat's MessageType. 2014-04-01 09:32:14 +02:00
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
STRWarrior
36e1e57d03 Using recommendations (I think) 2014-03-30 17:21:13 +02:00
STRWarrior
66f1bb7b67 Added a BlockHitPos parameter to OnProjectileHitBlock 2014-03-30 14:04:44 +02:00
STRWarrior
47d5395d24 Added a blockface parameter to the OnProjectileHitBlock hook. 2014-03-30 13:44:28 +02:00
Mattes D
37812813d3 Merge pull request #842 from mc-server/ProjectileHooks 
Projectile hooks
 2014-03-29 22:32:50 +01:00
madmaxoft
782c111b81 Renamed lua dll for tolua++.exe. 
Fixes #843.
 2014-03-29 22:29:34 +01:00
STRWarrior
ec4638a228 Added HOOK_PROJECTILE_HIT_BLOCK. 2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e Fixed error when the hook gets called. 2014-03-29 15:43:03 +01:00
STRWarrior
339d555111 Added HOOK_PROJECTILE_HIT_ENTITY 2014-03-29 15:26:41 +01:00
madmaxoft
773ce7fde6 Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
Howaner
3774b1be64 Add SpreadSource 2014-03-27 23:20:28 +01:00
Howaner
c4a8336e84 Add HOOK_BLOCK_SPREAD 2014-03-27 23:20:28 +01:00
Samuel Barney
eb3cc729d4 More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. 
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
 2014-03-25 11:15:05 -06:00
madmaxoft
fd8e5bf551 Updated the ToLua windows executable. 2014-03-23 20:54:37 +01:00
madmaxoft
20fc7d6aea Updated the tolua++ executable for Win builds. 2014-03-20 22:41:12 +01:00
madmaxoft
964647a900 Made pushing plain pointer to Lua a valid operation, with a warning. 
This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning)
 2014-03-20 09:16:47 +01:00
madmaxoft
74b7f51b89 Errors in Lua don't include the error handler in the stack trace. 
Fixes #817.
 2014-03-19 22:55:47 +01:00
madmaxoft
4a67114f56 LuaChunkStay: Removed a debugging output. 2014-03-19 13:57:06 +01:00
Mattes D
50b53ff3e8 Merge pull request #800 from mc-server/EntireCommandError 
The entire unknown command is echoed back to the user on error.
 2014-03-15 07:52:37 +01:00
Tycho
8e11c270fc Added Noreturn attribtes to a couple of functions and made a missing noreturn an error 2014-03-14 07:59:25 -07:00
Tycho
8b83c1a653 Merge branch 'master' into warnings 2014-03-14 06:46:20 -07:00
madmaxoft
9b63156447 cPlugin:BindConsoleCommand can be called statically. 
This has been documented before it was written.
 2014-03-14 14:37:39 +01:00
Tycho
692cf5bb70 Merge branch 'master' into warnings 2014-03-14 06:01:45 -07:00
madmaxoft
bba090ebdd cPluginManager:Bind[Console]Command returns true on success. 
Fixes #801.
 2014-03-14 11:18:14 +01:00
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