Tiger Wang
|
da267649a1
|
With eXtra line!
|
2014-04-02 20:04:41 +01:00 |
|
Tiger Wang
|
43af11ee38
|
Removed extra brackets
|
2014-04-02 20:03:42 +01:00 |
|
Tycho
|
0075b2f72e
|
Merge branch 'master' into HTTPSizeT
Conflicts:
src/HTTPServer/EnvelopeParser.h
src/HTTPServer/HTTPFormParser.h
src/HTTPServer/MultipartParser.h
|
2014-04-02 07:51:48 -07:00 |
|
madmaxoft
|
5c6d474599
|
Fixed boat placement code.
|
2014-04-02 16:40:28 +02:00 |
|
madmaxoft
|
26c3bc4076
|
Fixed more virtual destructors for interfaces.
|
2014-04-02 16:40:27 +02:00 |
|
Tycho
|
b449ad8613
|
Merge branch 'MacFixes'
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
|
2014-04-02 06:54:57 -07:00 |
|
Tycho
|
741a64c250
|
Merge branch 'master' into HTTPSizeT
|
2014-04-02 06:37:24 -07:00 |
|
Tycho
|
1f5a4a39f2
|
Fixed All signedness warnings in HTTPServer.cpp
|
2014-04-02 06:36:25 -07:00 |
|
Tycho
|
dcaea749ae
|
Merge branch 'master' into globals
|
2014-04-02 06:05:55 -07:00 |
|
Tycho
|
298c0b409a
|
Fixed tolua++ override support
|
2014-04-02 06:04:17 -07:00 |
|
Tycho
|
7ece0cc836
|
Fixed format string in HTTPConnection
|
2014-04-02 05:10:08 -07:00 |
|
Tycho
|
93bb5369a8
|
Fixed Comparison to -1 in HTTPMessage.h
|
2014-04-02 05:06:38 -07:00 |
|
Mattes D
|
01c38505fd
|
Merge pull request #831 from mc-server/Wither
Wither
|
2014-04-02 12:00:26 +02:00 |
|
madmaxoft
|
67d7ad8689
|
Debuggers: Added a Base64 API roundtrip test.
|
2014-04-02 11:58:19 +02:00 |
|
madmaxoft
|
bcd7f9669b
|
Added schematic string serializer self-test.
|
2014-04-02 11:56:27 +02:00 |
|
madmaxoft
|
3301c5be1f
|
Fixed StringCompression's GZIP handling for larger strings.
|
2014-04-02 11:56:10 +02:00 |
|
madmaxoft
|
bcf5021feb
|
Exported the Base64 encoding and decoding functions to Lua API.
|
2014-04-01 22:47:39 +02:00 |
|
madmaxoft
|
e7e65b5005
|
Merged branch 'msDifference'.
|
2014-04-01 21:21:11 +02:00 |
|
STRWarrior
|
21e0607e49
|
APIDump: Gave msDifference it's own table.
|
2014-04-01 21:12:48 +02:00 |
|
madmaxoft
|
1229795ff0
|
cBlockArea: Added the msMask merge strategy.
|
2014-04-01 20:50:10 +02:00 |
|
madmaxoft
|
1795cca552
|
Rewritten HTTPServer to use size_t for data lengths.
|
2014-04-01 16:36:00 +02:00 |
|
madmaxoft
|
0d916a3e2f
|
Removed the exit-time-destructors flag from clang.
We don't care about exit-time destructors, at least for now.
|
2014-04-01 16:10:08 +02:00 |
|
madmaxoft
|
2672b14c03
|
More cFile warning fixes.
|
2014-04-01 16:00:20 +02:00 |
|
madmaxoft
|
fd062f611e
|
Merge branch 'RemoveClangFlags'
|
2014-04-01 15:01:14 +02:00 |
|
madmaxoft
|
b9a090d835
|
Fixed clang warnings in cGZipFile.
|
2014-04-01 15:00:30 +02:00 |
|
madmaxoft
|
42e30b6513
|
Fixed clang warnings in BlockHandlers.
|
2014-04-01 14:58:17 +02:00 |
|
madmaxoft
|
45150e9754
|
Fixed clang warnings in cFile.
We only support 32-bit filesizes (files < 2 GiB).
|
2014-04-01 14:58:05 +02:00 |
|
madmaxoft
|
aa7552309a
|
Simplified the anvil placement code.
|
2014-04-01 14:23:11 +02:00 |
|
madmaxoft
|
7cc322332b
|
Removed an unneeded code branch.
|
2014-04-01 13:38:40 +02:00 |
|
madmaxoft
|
e610262fb1
|
Attempt at disabling the useless clang warnings.
Ref.: #846, #847
|
2014-04-01 09:44:11 +02:00 |
|
madmaxoft
|
7aa6a3b866
|
LOG() API reads the LogLevel from the cCompositeChat's MessageType.
|
2014-04-01 09:32:14 +02:00 |
|
Tiger Wang
|
ef48b30baa
|
Final realisation of suggestions
|
2014-03-31 22:37:05 +01:00 |
|
madmaxoft
|
58f2550321
|
APIDump: Documented the cCompositeChat support in logging functions.
|
2014-03-31 23:05:31 +02:00 |
|
madmaxoft
|
8126d9e66e
|
Console logging supports cCompositeChat as its parameters.
|
2014-03-31 22:51:14 +02:00 |
|
Tiger Wang
|
fc940b6da4
|
Realised suggestions
|
2014-03-31 21:36:19 +01:00 |
|
Tiger Wang
|
ee07b7ae3e
|
Simplified and fixed slabs, fixes #835
|
2014-03-31 20:34:11 +01:00 |
|
Tiger Wang
|
0836fe9a84
|
Fixed a few Y too high/low asserts
|
2014-03-31 20:33:33 +01:00 |
|
STRWarrior
|
b19022fc7e
|
Added extra table which should make it more clear what msDifference does.
|
2014-03-31 20:13:08 +02:00 |
|
STRWarrior
|
a8bc27f872
|
Fixed typo
|
2014-03-31 20:05:48 +02:00 |
|
STRWarrior
|
f7df8e133b
|
Documented msDifference
|
2014-03-31 19:58:19 +02:00 |
|
STRWarrior
|
c4e07631c8
|
Added new merge strategy "msDifference"
|
2014-03-31 19:47:18 +02:00 |
|
madmaxoft
|
55d0db1606
|
APIDump: Added code completion support file to ZBS tutorial.
|
2014-03-31 18:34:27 +02:00 |
|
madmaxoft
|
f38a009b3c
|
APIDump: Renamed the ZBS API dump file to mcserver_api.lua.
This is to avoid confusion with ZBS, where two "mcserver.lua" files were present.
|
2014-03-31 18:25:00 +02:00 |
|
madmaxoft
|
43844fc0f0
|
cCompositeChat has a MessageType param in the constructor.
This should make it easier to use.
|
2014-03-31 13:28:38 +02:00 |
|
madmaxoft
|
8288e53c0b
|
Fixed a few Clang warnings in BlockHandlers.
|
2014-03-30 23:13:13 +02:00 |
|
madmaxoft
|
a5c0600e6c
|
Fixed a few clang warnings.
|
2014-03-30 20:02:30 +02:00 |
|
madmaxoft
|
1bda9b0424
|
Merge branch 'NetherFortGen'.
|
2014-03-30 19:17:33 +02:00 |
|
madmaxoft
|
b64a1daf6c
|
APIDump: Added article: Setting up ZeroBrane Studio.
Fixes #824.
|
2014-03-30 18:48:11 +02:00 |
|
Alexander Harkness
|
dc1d620c90
|
Merge pull request #845 from mc-server/License
License
|
2014-03-30 17:34:33 +01:00 |
|
andrew
|
451a3e97c3
|
Apache license
|
2014-03-30 19:25:17 +03:00 |
|