madmaxoft
180b9b9099
Merge branch master into CmakeMultiConfig.
2014-01-12 10:04:16 +01: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
Mattes D
1ec9eb564c
Merge pull request #526 from mc-server/IniFileFix
...
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -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
madmaxoft
2634261a28
Removed unused variables.
...
The Lua API calls had no side-effects, either.
2014-01-11 20:29:56 +01:00
madmaxoft
7fa5217aad
Fixed the warning in CryptoPP.
...
It was getting on my nerves too much, decided to actually fix their code.
2014-01-11 20:27:07 +01:00
Mattes D
5417f7bd2d
Merge pull request #530 from mc-server/GeneratorDecouple
...
Decoupled cChunkGenerator from cWorld and cRoot.
2014-01-11 11:26:09 -08:00
madmaxoft
7739238d3d
Fixed reading the files.
...
Duplicate values were ignored.
2014-01-11 20:10:50 +01:00
madmaxoft
2e0fcbdcb7
Documented the cIniFile:AddValue* functions.
...
Now the documentation really matches the implementation.
2014-01-11 16:50:52 +01:00
madmaxoft
a332a5dc73
IniFile: Split SetValue() into AddValue() and SetValue().
...
Each function does what one would assume - AddValue adds a new value, SetValue overwrites existing value (creates a new one if not exists, if instructed to do so).
2014-01-11 16:44:28 +01:00
Mattes D
7a55f91be2
Merge pull request #531 from xdot/master
...
Fixed glowstone drop count
2014-01-11 06:52:48 -08:00
madmaxoft
37025fca77
Merge branch 'master' into IniFileFix
2014-01-11 13:03:51 +01:00
andrew
05e22dccf2
Fixed glowstone drop count
2014-01-11 11:38:34 +02:00
Bill Derouin
af89794d76
Globals.h needs to be first include
2014-01-10 15:50:52 -06:00
madmaxoft
cea997426b
Decoupled cChunkGenerator from cWorld and cRoot.
...
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
2014-01-10 22:22:54 +01:00
Bill Derouin
fe48f62575
Include Biome enum in ChunkDef
...
Can't forward declare an enum
2014-01-10 10:30:56 -06:00
Mattes D
e213769216
Merge pull request #522 from mc-server/LuaDlFix
...
Lua dl fix
2014-01-10 08:27:43 -08:00
Bill Derouin
ee74411024
Added newlines at ends of files
2014-01-10 10:10:24 -06:00
madmaxoft
712e6e0bb2
Fixed generator adding values to ini file.
2014-01-10 16:34:09 +01:00
Bill Derouin
0a72390587
Added files to VC2013 project file
2014-01-10 09:33:48 -06:00
Bill Derouin
1c2004dfbb
Fixed missing externals
...
Turns out you actually have to include the .cpp in the project file
2014-01-10 09:23:53 -06:00
madmaxoft
4c360b54e3
Fixed cIniFile's SetValue().
...
How did we not see this earlier? Each call to SetValue would actually ADD a value!
2014-01-10 16:23:22 +01:00
Mattes D
6943a4df74
Merge pull request #520 from mc-server/SoulSand
...
NetherGen: Now generates SoulSand.
2014-01-10 07:14:19 -08:00
STRWarrior
36c100a53e
Fixed recurring pattern.
2014-01-10 16:12:45 +01:00
Matyas Dolak
8104f611f1
BiomeVisualiser: Added zooming using the 1 - 8 keys.
2014-01-10 11:55:43 +01:00
madmaxoft
1704d0fd6b
Using dlopen() on all platforms except WIN32.
2014-01-10 10:03:39 +01:00
Bill Derouin
cee76f1ace
Move biome definition to separate files
2014-01-09 15:21:46 -06:00
madmaxoft
00af5d4d6e
Debuggers: Test code for WECUI plugin messaging.
2014-01-09 14:26:44 +01:00
madmaxoft
bb96737f45
Exported cClientHandle::SendPluginMessage() to Lua.
2014-01-09 14:25:37 +01:00
madmaxoft
f3bedb3c32
Fixed wrong packet number for PluginMessage packet.
2014-01-09 14:24:57 +01:00
STRWarrior
6c75cbc8d7
Fixed chunk borders.
2014-01-09 13:30:04 +01:00
madmaxoft
fe978f0d1e
Added cClientHandle::SendPluginMessage().
...
It is not yet exported in the API, though.
2014-01-09 11:39:42 +01:00
madmaxoft
bd17662412
Composition generator creating moved to a separate function.
...
Also it forces the defaults into the INI file.
2014-01-09 10:35:51 +01:00
madmaxoft
1ef20e858f
Height generator creating moved info HeiGen.cpp.
...
The generator also explicitly sets the default back into the INI file.
2014-01-09 10:21:26 +01:00
madmaxoft
4a1b78787f
Windows nightbuild updated to generate .example.ini files.
...
Fixes #314 .
2014-01-09 09:47:16 +01:00
Mattes D
91d70b87e5
Merge pull request #517 from derouinw/master
...
Add missing plugin error
2014-01-08 23:51:32 -08:00
madmaxoft
18310752b8
Fixed a typo in the TestLuaRocks test plugin.
2014-01-09 08:05:34 +01:00
madmaxoft
53e2ed8473
Specified the dynamic loader Lua should use.
2014-01-09 08:05:08 +01:00
STRWarrior
d462085108
Speed-up. I got about 40 extra ch/s
2014-01-08 22:23:26 +01:00
Bill Derouin
154d6b989a
A couple touchups
2014-01-08 13:45:16 -06:00
madmaxoft
71946f5671
Added a known working favicon.
2014-01-08 20:18:26 +01:00
madmaxoft
17363716a1
ProtoProxy: Fixed favicon relaying.
...
The buffer was too small for the favicon; now it's dynamic.
2014-01-08 17:17:37 +01:00
STRWarrior
5aa34cf77d
WormNestCaves now remove soul sand.
2014-01-08 15:34:49 +01:00
STRWarrior
ca8421fe26
NetherGen: Now generates SoulSand.
2014-01-08 15:26:43 +01:00
madmaxoft
38d0bdf00a
Fixed AppendVPrintf() handling for large strings.
...
This caused a failure in server favicons.
2014-01-08 14:23:15 +01:00
Mattes D
b952ea11c7
Merge pull request #519 from mc-server/sigterm
...
Graceful shutdown on SIGTERM
2014-01-07 23:36:01 -08:00
