flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,860 Commits 1 Branch 0 Tags 92 MiB
ad935ef40f
Commit Graph

198 Commits

Author SHA1 Message Date
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Alexander Harkness
ad42adb5fa Removed polarSSL makefile. Fixes #591. 
Also normalises polarssl submodule URL.
 2014-09-27 12:04:54 +01:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Mattes D
690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98
9cdb9b6262 Merge branch 'master' into blocks 
Conflicts:
	MCServer/crafting.txt
 2014-09-06 22:06:40 +02:00
madmaxoft
fac89d0c43 Added cIniFile::HasValue() function. 2014-09-03 23:00:16 +02:00
madmaxoft
b4c6ad0036 Updated SQLiteCpp. 
This should fix #1374.
 2014-09-03 22:37:50 +02:00
archshift
62d5ab15a5 Quick fix for a preprocessor error with clang on OS X 2014-09-02 23:21:34 -07:00
Mattes D
8b8ccac0b8 ToLua++ lib: Assert when usertype is not known. 2014-08-22 10:32:32 +02:00
madmaxoft
36d1972336 ToLua driver: disabled output buffering. 2014-08-03 22:04:49 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft
036a8ff98e Added SQLiteCpp library. 
This provides C++ wrappers for SQLite, making it safer to use in the C++ environment.
 2014-07-28 19:59:53 +02:00
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
Tiger Wang
f1be1eb674 Monster fixes 
* Fixes #1203
* Fixes #627
 2014-07-18 10:47:00 +01:00
madmaxoft
8bb0baa842 Tolua driver: Fixed wrong indentation. 2014-07-13 17:07:55 +02:00
Tycho
2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
tycho
c3bd588826 Fixed OpenSSL programs and tests being generated when testing disabled. 2014-07-06 16:27:50 +01:00
Mattes D
decdbab2e6 LuaProxy compilation under MinGW. 2014-07-01 15:23:29 +02:00
Mattes D
9d843405b2 Merge branch 'master' into LuaProxy 2014-07-01 15:07:12 +02:00
Mattes D
eb8244f1c2 Proper sqlite dependency fix. 2014-07-01 08:01:39 +02:00
Mattes D
4f60f5aef4 Fixed linking order under MinGW. 
Ref.: #1044
 2014-07-01 06:40:38 +02:00
worktycho
0fb236bfe4 typo 2014-06-30 22:21:22 +01:00
worktycho
84272fb155 Added dependecy of tolualib on lua 2014-06-30 22:21:07 +01:00
Mattes D
ac01a8e483 Fixed lua compilation under MinGW. 2014-06-30 21:42:20 +02:00
Mattes D
6b8529544e Fixed tolua linking order. 
Ref.: #1044.
 2014-06-30 21:00:52 +02:00
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL. 
Fixes #1130.
 2014-06-27 19:34:53 +02:00
madmaxoft
dc284783f0 Added a missing endline. 2014-06-24 14:49:35 +02:00
madmaxoft
e96a774f59 Added the Lua Proxy DLL. 
This builds the lua5.1.dll file on Windows, making it 64-bit if so required.
 2014-06-24 14:48:18 +02:00
Tiger Wang
7188a1f670 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/World.h
 2014-06-14 09:57:07 +01:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +01:00
Tiger Wang
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
madmaxoft
9b5e852f75 Fixed debugging code in tolua++ driver script. 2014-06-09 20:00:17 +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
worktycho
b925eb4ad4 Capitalising 2014-06-07 00:18:58 +01:00
worktycho
3275bbf01b Fix reading 64 bit values 2014-06-07 00:10:58 +01:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
madmaxoft
b79142c8e7 Fixed buffer overflow in JSON. 
Reported on Coverity as CID 43614.
 2014-06-04 10:47:12 +02:00
Mattes D
0b758946ac Merge pull request #951 from worktycho/chunksparsing/structs 
Chunksparsing with segments
 2014-05-31 10:12:54 +02:00
worktycho
444cce1269 Cmake system name not System name 2014-05-28 21:39:28 +01:00
worktycho
a2b741d904 derp 2014-05-28 20:41:34 +01:00
worktycho
1cf426d881 FreeBSD requires __POSIX_VISIBLE macro to be defined 2014-05-28 20:39:47 +01:00
worktycho
171e13de4f for compiliers other than msvc we need to tell lua that its building as a dll 2014-05-28 15:59:59 +01:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.h
 2014-05-10 05:05:44 -07:00
Tycho
77395b3739 Maybe coverage working? 2014-05-10 05:03:36 -07:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Tycho
8d6919f3b6 Fixed polarssl programs included 2014-05-01 12:05:11 -07:00
Tycho
47cc1a84e1 Tests off by default take 2 2014-05-01 11:57:07 -07:00
Tycho
1929b46aff Disable polarssl tests by default 2014-05-01 11:52:08 -07:00
Tycho
8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
Tycho
9928698d6d Merged change to enable testing to be disabled 
This is confirmed upstream but is unlikely to get into the repository for
several weeks
 2014-05-01 09:53:43 -07:00
Tycho
1d3ad6faa2 Added Testing capability 2014-04-27 12:25:03 -07:00
madmaxoft
087210302f Updated MSVC side of CMake files after recent changes. 2014-04-25 23:45:16 +02:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
Tiger Wang
bdea8706d8 Added new AI rules 
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
 2014-04-17 18:50:25 +01:00
Tycho
c89f7902df Added forgoten lua file 2014-04-06 05:56:43 -07:00
Tycho
23395a5ce1 Merge branch 'master' into override 
Conflicts:
	lib/tolua++/CMakeLists.txt
 2014-04-05 14:12:17 -07:00
Tycho
298c0b409a Fixed tolua++ override support 2014-04-02 06:04:17 -07: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
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
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
Tycho
830a9c3bb4 FIrst attempt at adding override support to tolua 2014-03-22 08:16:07 -07: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
Tycho
a69a1ef032 Fixed enum checking functions not being called in generated code 2014-03-20 13:23:15 -07:00
Tycho
6a3fe7adcc Fixed bugs in patched tolua output 2014-03-19 12:38:00 -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
Tycho
0a505576e5 Fixed =~ bug 2014-03-17 10:28:04 -07:00
Tycho
3e0dfbc7a1 Made buffers static const 2014-03-16 07:59:58 -07:00
Tycho
7f84c8d60b Patched tolua to understand size_t 2014-03-15 10:42:35 -07:00
Tycho
a427f004b8 Fix indentation 2014-03-15 07:15:02 -07:00
Tycho
2e9fe777e4 Patched tolua to emit range checks for enums 2014-03-15 06:45:26 -07:00
madmaxoft
31df026808 Rewound PolarSSL to master branch. 
The current Devel branch fails to build on RasPi.
 2014-03-07 10:25:18 +01:00
madmaxoft
6a191cce0a Fixed compatibility with ZeroBraneStudio and LuaRocks. 
Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll.
 2014-02-28 08:27:02 +01:00
Mattes D
7aeae734e5 Merge pull request #684 from narroo/Bug402 
Addressed Issue #402.
 2014-02-17 23:47:04 +01:00
narroo
794be05f22 Fixed comment typo 2014-02-17 08:51:36 -05:00
narroo
952a338c7f Fixed Comment Typo. 2014-02-17 08:50:22 -05:00
narroo
ecabb2b34f Fixed the tab spacing. 2014-02-17 08:46:41 -05:00
narroo
3ce8bf9712 Fixed Tab spacing of cases. 2014-02-17 08:45:31 -05:00
narroo
6eefd54d45 Reworked RemoveBom to use unsigned chars and reverted the logic changes in WriteFile. Should work fine now. 2014-02-16 09:25:32 -05:00
narroo
03fd3b556a Changed unsigned char[] back to char[]. 2014-02-16 08:22:10 -05:00
narroo
d4f2788008 Changed char[] to unsigned char[] in cIniFile::RemoveBom 2014-02-16 07:49:09 -05:00
Tycho
e3dd931be2 Fogot 2014-02-16 04:39:41 -08:00
Tycho
2acf218700 Allow building MCADefrag at the same time as MCServer 2014-02-16 03:37:31 -08:00
narroo
8c34b2d974 Addressed Issue #402. cIniFile can now process UTF-8 files that have a 
Byte Order Marker, BOM.
 2014-02-15 19:56:36 -05:00
Tycho
faa6456344 Added a seperate module for Setting flags 2014-02-15 15:17:58 -08:00
narroo
e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as 
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
 2014-02-10 20:00:07 -05:00
Tiger Wang
7d151d5494 Updated Core & PolarSSL 2014-02-04 23:53:10 +00:00
madmaxoft
34f13d589a Removed CryptoPP files. 2014-01-22 22:26:40 +01:00
madmaxoft
37e820d16e Added PolarSSL as a submodule. 2014-01-22 22:17:20 +01:00
Mattes D
4385ab008f CMake: Fixed Lua output folder for MSVC2010+. 2014-01-17 08:09:03 +01:00
madmaxoft
dab37db562 CMake: Fixed output paths for all MSVC versions. 2014-01-16 18:33:28 +01:00
madmaxoft
ba49a32c3a Another VarArgs fix. 
This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
 2014-01-16 08:34:10 +01:00
madmaxoft
dd6c5779ec Using a 2nd argument instead of va_copy(). 
This seems to be the only reasonable C++03-only solution.
 2014-01-15 18:28:51 +01:00
madmaxoft
d23e743303 CMake: Removed SCL warnings from Lua and ZLib. 2014-01-15 12:01:03 +01:00
madmaxoft
bc24cd8c70 Renamed unused source files from zlib. 
These files are included in zlib, but they should not be compiled into the actual library. Since they contain example code on how to use the lib, I decided to keep them, renamed to .txt.
 2014-01-13 21:28:27 +01:00
madmaxoft
caea934d37 CMake: Lua DLL is built in the correct folder. 
Also removed SCL warnings from MSVC builds.
 2014-01-13 10:59:37 +01:00
Mattes D
1ec9eb564c Merge pull request #526 from mc-server/IniFileFix 
Fixed cIniFile's SetValue().
 2014-01-11 23:32:54 -08:00