1
0
Fork 0
Commit Graph

148 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