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
Samuel Barney
71e9133e49
Added one more missing newline.
2014-03-25 10:34:31 -06:00
Samuel Barney
d77a6417f6
Added newlines. Without them, the files would not compile.
2014-03-25 10:33:52 -06:00
Mattes D
c6186acf58
Merge pull request #828 from mc-server/Wither
...
Wither invulnerability
2014-03-25 08:54:13 +01:00
andrew
4f3377bbbf
Minor fixes
2014-03-25 09:10:55 +02:00
Mattes D
9226b8480e
Merge pull request #829 from Howaner/Cake
...
Add log pickups.
2014-03-24 22:13:25 +01:00
Howaner
a6414d3348
Add log pickups.
2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
Tiger Wang
83d0c6d6a7
Fixed bad cmake document interpretation
...
Docs say:
"If nothing is found, the result will be <VAR>-NOTFOUND"
2014-03-23 20:37:23 +00:00
madmaxoft
fd8e5bf551
Updated the ToLua windows executable.
2014-03-23 20:54:37 +01:00
Mattes D
b3a22acb2c
Merge pull request #826 from worktycho/xxd_check
...
Added better check for xxd existance
2014-03-23 20:21:12 +01:00
Tycho
0cfb12f0d1
Added Additonal check for xxd existance
2014-03-22 08:30:49 -07:00
Mattes D
4497f1166b
Merge pull request #810 from worktycho/size_t_lua
...
gave tolua awareness of size_t
2014-03-22 16:28:49 +01:00
Tycho
2266c2150d
Merge branch 'master' into size_t_lua
...
Conflicts:
lib/tolua++/src/bin/basic_lua.h
2014-03-22 07:48:16 -07:00
madmaxoft
c9163d39f7
Implemented faster upscaling using templates.
...
Fixes #819 .
2014-03-21 22:53:46 +01:00
madmaxoft
20fc7d6aea
Updated the tolua++ executable for Win builds.
2014-03-20 22:41:12 +01:00
madmaxoft
62f84d968a
Merge branch 'unreachable'
2014-03-20 22:36:24 +01:00
Tycho
a69a1ef032
Fixed enum checking functions not being called in generated code
2014-03-20 13:23:15 -07:00
madmaxoft
b370cacf0c
Plugins can set flying speed.
2014-03-20 16:14:40 +01:00
madmaxoft
9fae50f447
APIDump: Fixed wrong escaped strings.
2014-03-20 16:05:22 +01:00
madmaxoft
64d9390069
Rewritten player speeds to be relative unit-less.
...
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
madmaxoft
93d4cbb989
ProtoProxy: Fixed MSVC compilation.
2014-03-20 15:21:28 +01:00
madmaxoft
b1ad3322e5
Fixed code style after recent merge.
2014-03-20 09:28:29 +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
Mattes D
fe6c03595f
Merge pull request #790 from mc-server/awesometnt
...
TNT Shrapnel
2014-03-20 09:05:53 +01:00
Tiger Wang
3e49cada80
Added braces
2014-03-19 23:07:58 +00:00
Tiger Wang
a0720a65d6
Minor Entity.cpp cleanup
2014-03-19 23:07:16 +00:00
Tiger Wang
0524d70774
ENUMified shrapnel level
2014-03-19 23:06:39 +00: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
d6a72da382
APIDump: Updated comments to reflect current code.
2014-03-19 22:51:02 +01:00
madmaxoft
96e0b26912
APIDump: Added ZeroBraneStudio API export.
...
Fixes #821 .
2014-03-19 22:42:56 +01:00
Tycho
6a3fe7adcc
Fixed bugs in patched tolua output
2014-03-19 12:38:00 -07:00
Tycho
1635c696de
Merge branch 'master' into unreachable
2014-03-19 12:13:05 -07:00
Tycho
363c92ed53
Added unreachable lines backit prtected by preprocessor guards
2014-03-19 12:06:12 -07:00
Tycho
04adca3410
Fixed tolua emitting isnumber insteand of is<Enum>
2014-03-19 12:02:26 -07:00
Tycho
e8f7c18ba7
Fixed type error in lua bindings
2014-03-19 11:34:33 -07:00
madmaxoft
7c717fe6df
APIDump: Reformatted the plugin to avoid all ZBS Analyzer issues.
2014-03-19 13:57:37 +01:00
madmaxoft
4a67114f56
LuaChunkStay: Removed a debugging output.
2014-03-19 13:57:06 +01:00
Tiger Wang
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7
Added levels of shrapnel
2014-03-18 20:45:10 +00:00
madmaxoft
91f64da2a6
Fixed chunkmap tree block replacing.
2014-03-18 15:45:16 +01:00
madmaxoft
38aad32a8b
Debuggers: Using binary file mode for .schematics.
2014-03-18 13:54:32 +01:00
madmaxoft
4dc5650023
Fixed cGZipFile::ReadRestOfFile returning incorrect value.
2014-03-18 13:54:17 +01:00
madmaxoft
9447cd20f3
Fixed a crash in firework rockets.
...
Fixes #816 .
2014-03-17 22:12:02 +01:00
Tycho
0a505576e5
Fixed =~ bug
2014-03-17 10:28:04 -07:00
Tycho
90ab055eab
Merge branch 'master' into unreachable
2014-03-17 09:44:34 -07:00
madmaxoft
89027cb675
Fixed double to float conversions.
2014-03-16 22:00:28 +01:00
madmaxoft
260d13c7a4
Added override specifier where appropriate in cWorld.
2014-03-16 21:56:27 +01:00
Mattes D
728bfd155e
Merge pull request #811 from mc-server/DumpInfo
...
Created a small plugin for InfoDump
2014-03-16 21:53:11 +01:00
STRWarrior
5a9f17060d
Only check for "Info.lua" with capital I
2014-03-16 21:52:28 +01:00
Samuel Barney
Mattes D
andrew
Howaner
Tiger Wang
Tycho
STRWarrior