summaryrefslogtreecommitdiffstats
path: root/lib (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merged IniFile into main MCS sources.Mattes D2014-10-233-1143/+0
|
* Removed polarSSL makefile. Fixes #591.Alexander Harkness2014-09-271-0/+0
| | | | Also normalises polarssl submodule URL.
* Removed more unessicary includesTycho2014-09-261-0/+0
|
* Fixed submodules' downgrade from the previous PR merge.Mattes D2014-09-071-0/+0
|
* Merge branch 'master' into blocksMasy982014-09-063-1/+26
|\ | | | | | | | | Conflicts: MCServer/crafting.txt
| * Added cIniFile::HasValue() function.madmaxoft2014-09-032-0/+23
| |
| * Updated SQLiteCpp.madmaxoft2014-09-031-0/+0
| | | | | | | | This should fix #1374.
| * Quick fix for a preprocessor error with clang on OS Xarchshift2014-09-031-1/+3
|/
* ToLua++ lib: Assert when usertype is not known.Mattes D2014-08-221-4/+7
|
* ToLua driver: disabled output buffering.madmaxoft2014-08-031-0/+3
|
* Merged branch 'master' into NameToUUID.madmaxoft2014-07-312-0/+29
|\
| * SuggestionsTiger Wang2014-07-211-1/+1
| |
| * Merge branch 'master' into portalsTiger Wang2014-07-1812-503/+351
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-142-67/+74
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/World.h
| * \ \ Merge branch 'master' into portalsTiger Wang2014-06-105-8/+100
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | | | Portal improvements and suggestionsTiger Wang2014-06-101-0/+4
| | | | |
| * | | | Capitalisingworktycho2014-06-071-1/+1
| | | | |
| * | | | Fix reading 64 bit valuesworktycho2014-06-071-2/+5
| | | | |
| * | | | SuggestionsTiger Wang2014-06-052-0/+22
| | | | |
* | | | | Added SQLiteCpp library.madmaxoft2014-07-281-0/+0
| |_|_|/ |/| | | | | | | | | | | This provides C++ wrappers for SQLite, making it safer to use in the C++ environment.
* | | | Monster fixesTiger Wang2014-07-181-0/+0
| | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627
* | | | Tolua driver: Fixed wrong indentation.madmaxoft2014-07-131-15/+15
| | | |
* | | | Adjusted calls to CreateProjectile that passed ItemsTycho2014-07-131-0/+0
| | | |
* | | | Fixed OpenSSL programs and tests being generated when testing disabled.tycho2014-07-061-2/+2
| | | |
* | | | LuaProxy compilation under MinGW.Mattes D2014-07-011-1/+4
| | | |
* | | | Merge branch 'master' into LuaProxyMattes D2014-07-016-486/+14
|\ \ \ \
| * | | | Proper sqlite dependency fix.Mattes D2014-07-011-1/+2
| | | | |
| * | | | Fixed linking order under MinGW.Mattes D2014-07-011-2/+8
| | | | | | | | | | | | | | | | | | | | Ref.: #1044
| * | | | typoworktycho2014-06-301-1/+1
| | | | |
| * | | | Added dependecy of tolualib on luaworktycho2014-06-301-0/+1
| | | | |
| * | | | Fixed lua compilation under MinGW.Mattes D2014-06-301-8/+4
| | | | |
| * | | | Fixed tolua linking order.Mattes D2014-06-301-3/+1
| | | | | | | | | | | | | | | | | | | | Ref.: #1044.
| * | | | Removed the md5 library, obsoleted by PolarSSL.Mattes D2014-06-273-474/+0
| | |_|/ | |/| | | | | | | | | | Fixes #1130.
* | | | Added a missing endline.madmaxoft2014-06-241-1/+1
| | | |
* | | | Added the Lua Proxy DLL.madmaxoft2014-06-244-0/+317
|/ / / | | | | | | | | | This builds the lua5.1.dll file on Windows, making it 64-bit if so required.
* | / Fixed constnessworktycho2014-06-112-67/+74
| |/ |/|
* | Fixed debugging code in tolua++ driver script.madmaxoft2014-06-091-1/+1
| |
* | ToLua can now be run in pure-lua mode.madmaxoft2014-06-095-8/+100
|/ | | | See the src/Bindings/AllToLua_lua.bat for usage example.
* Fixed buffer overflow in JSON.madmaxoft2014-06-041-1/+1
| | | | Reported on Coverity as CID 43614.
* Merge pull request #951 from worktycho/chunksparsing/structsMattes D2014-05-313-1/+190
|\ | | | | Chunksparsing with segments
| * Merge branch 'master' into chunksparsing/structsTycho2014-05-101-3/+3
| |\ | | | | | | | | | | | | Conflicts: src/Chunk.h
| * | Maybe coverage working?Tycho2014-05-102-0/+183
| | |
| * | Fixed polarssl programs includedTycho2014-05-011-1/+2
| | |
| * | Tests off by default take 2Tycho2014-05-011-1/+1
| | |
| * | Disable polarssl tests by defaultTycho2014-05-011-0/+1
| | |
| * | Merge branch 'master' into chunksparsing/structsTycho2014-05-011-0/+0
| |\ \
| * | | Added Testing capabilityTycho2014-04-271-1/+5
| | | |
* | | | Cmake system name not System nameworktycho2014-05-281-1/+1
| | | |
* | | | derpworktycho2014-05-281-1/+1
| | | |
* | | | FreeBSD requires __POSIX_VISIBLE macro to be definedworktycho2014-05-281-0/+4
| | | |
* | | | for compiliers other than msvc we need to tell lua that its building as a dllworktycho2014-05-281-0/+6
| |_|/ |/| |
* | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-3/+3
| |/ |/|
* | Merged change to enable testing to be disabledTycho2014-05-011-0/+0
|/ | | | | This is confirmed upstream but is unlikely to get into the repository for several weeks
* Updated MSVC side of CMake files after recent changes.madmaxoft2014-04-251-4/+2
|
* Missed these CMakeLists.archshift2014-04-255-2/+10
|
* Added new AI rulesTiger Wang2014-04-171-2/+3
| | | | | | | + 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
* Added forgoten lua fileTycho2014-04-061-0/+1476
|
* Merge branch 'master' into overrideTycho2014-04-054-8/+15
|\ | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt
| * 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.Samuel Barney2014-03-251-1/+1
| | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
| * Fixed bad cmake document interpretationTiger Wang2014-03-231-1/+1
| | | | | | | | | | | | Docs say: "If nothing is found, the result will be <VAR>-NOTFOUND"
| * Merge pull request #826 from worktycho/xxd_checkMattes D2014-03-231-6/+9
| |\ | | | | | | Added better check for xxd existance
| | * Added Additonal check for xxd existanceTycho2014-03-221-6/+9
| | |
| * | Merge branch 'master' into size_t_luaTycho2014-03-2210-2826/+3163
| |\| | | | | | | | | | | | | Conflicts: lib/tolua++/src/bin/basic_lua.h
| * | Patched tolua to understand size_tTycho2014-03-152-1/+4
| | |
* | | Fixed tolua++ override supportTycho2014-04-025-1319/+164
| | |
* | | FIrst attempt at adding override support to toluaTycho2014-03-221-5/+6
| |/ |/|
* | Fixed enum checking functions not being called in generated codeTycho2014-03-208-2569/+2572
| |
* | Fixed bugs in patched tolua outputTycho2014-03-1910-2211/+2531
| |
* | Fixed tolua emitting isnumber insteand of is<Enum>Tycho2014-03-194-449/+462
| |
* | Fixed type error in lua bindingsTycho2014-03-192-162/+163
| |
* | Fixed =~ bugTycho2014-03-172-2/+2
| |
* | Made buffers static constTycho2014-03-164-6/+6
|/
* Fix indentationTycho2014-03-151-1/+1
|
* Patched tolua to emit range checks for enumsTycho2014-03-157-1747/+2302
|
* Rewound PolarSSL to master branch.madmaxoft2014-03-071-0/+0
| | | | The current Devel branch fails to build on RasPi.
* Fixed compatibility with ZeroBraneStudio and LuaRocks.madmaxoft2014-02-281-1/+5
| | | | Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll.
* Merge pull request #684 from narroo/Bug402Mattes D2014-02-172-1/+39
|\ | | | | Addressed Issue #402.
| * Fixed comment typonarroo2014-02-171-1/+1
| |
| * Fixed Comment Typo.narroo2014-02-171-1/+1
| |
| * Fixed the tab spacing.narroo2014-02-171-22/+22
| |
| * Fixed Tab spacing of cases.narroo2014-02-171-10/+10
| |
| * Reworked RemoveBom to use unsigned chars and reverted the logic changes in WriteFile. Should work fine now.narroo2014-02-161-82/+96
| |
| * Changed unsigned char[] back to char[].narroo2014-02-161-1/+1
| |
| * Changed char[] to unsigned char[] in cIniFile::RemoveBomnarroo2014-02-161-1/+1
| |
| * Addressed Issue #402. cIniFile can now process UTF-8 files that have anarroo2014-02-162-67/+91
| | | | | | | | Byte Order Marker, BOM.
* | FogotTycho2014-02-161-0/+5
| |
* | Allow building MCADefrag at the same time as MCServerTycho2014-02-161-6/+8
| |
* | Added a seperate module for Setting flagsTycho2014-02-161-1/+1
|/
* Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-0/+0
| | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
* Updated Core & PolarSSLTiger Wang2014-02-051-0/+0
|
* Removed CryptoPP files.madmaxoft2014-01-22194-48168/+0
|
* Added PolarSSL as a submodule.madmaxoft2014-01-221-0/+0
|
* CMake: Fixed Lua output folder for MSVC2010+.Mattes D2014-01-171-2/+13
|
* CMake: Fixed output paths for all MSVC versions.madmaxoft2014-01-161-4/+10
|
* Another VarArgs fix.madmaxoft2014-01-161-4/+2
| | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
* Using a 2nd argument instead of va_copy().madmaxoft2014-01-151-2/+4
| | | | This seems to be the only reasonable C++03-only solution.
* CMake: Removed SCL warnings from Lua and ZLib.madmaxoft2014-01-152-0/+9
|
* Renamed unused source files from zlib.madmaxoft2014-01-132-0/+0
| | | | 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.
* CMake: Lua DLL is built in the correct folder.madmaxoft2014-01-131-0/+11
| | | | Also removed SCL warnings from MSVC builds.
* Merge pull request #526 from mc-server/IniFileFixMattes D2014-01-122-48/+77
|\ | | | | Fixed cIniFile's SetValue().
| * Fixed reading the files.madmaxoft2014-01-111-1/+1
| | | | | | | | Duplicate values were ignored.
| * IniFile: Split SetValue() into AddValue() and SetValue().madmaxoft2014-01-112-39/+76
| | | | | | | | 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).
| * Fixed cIniFile's SetValue().madmaxoft2014-01-101-9/+1
| | | | | | | | How did we not see this earlier? Each call to SetValue would actually ADD a value!
* | Fixed the warning in CryptoPP.madmaxoft2014-01-111-1/+1
| | | | | | | | It was getting on my nerves too much, decided to actually fix their code.
* | Using dlopen() on all platforms except WIN32.madmaxoft2014-01-101-5/+1
| |
* | Specified the dynamic loader Lua should use.madmaxoft2014-01-091-0/+9
|/
* Fixed FreeBSD compilitionTycho2014-01-072-2/+2
|
* removed tolua++ makefile which is overwritten by cmakeTycho2014-01-031-338/+0
|
* removed lua makefileTycho Bickerstaff2013-12-221-944/+0
|
* fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker notTycho Bickerstaff2013-12-221-54/+0
|
* Fixed unix Lua dependencies.madmaxoft2013-12-271-1/+1
|
* Made cmake compilation possible on Windows.madmaxoft2013-12-273-9/+36
|
* fixed lua dynamic libraryTycho Bickerstaff2013-12-211-2/+2
|
* fixed include of math on windowstycho2013-12-201-0/+2
|
* made LUA shared unless STATIC_LUA is setTycho Bickerstaff2013-12-201-0/+4
|
* fixed lua dependency on libmTycho Bickerstaff2013-12-201-0/+1
|
* possable fix of typoTycho Bickerstaff2013-12-201-1/+1
|
* Revert "fixed bad reference to math library"Tycho Bickerstaff2013-12-201-2/+1
| | | | This reverts commit 0836e5e6602f3101660e7653d7796be7f8f5bd80.
* Revert "fixed bad reference to math library"Tycho Bickerstaff2013-12-201-2/+2
| | | | This reverts commit c2167d7ed73c96c7e8cb935074ba860e11c821f9.
* fixed bad reference to math libraryTycho Bickerstaff2013-12-201-2/+2
|
* fixed bad reference to math libraryTycho Bickerstaff2013-12-201-1/+2
|
* fixed compile errors with headers and math librarytycho2013-12-201-1/+5
|
* added md5 as a dependency for bindingsTycho Bickerstaff2013-12-191-0/+11
|
* added expat as lua bindings dependincyTycho Bickerstaff2013-12-194-19/+63
|
* compiling sqliteTycho Bickerstaff2013-12-191-0/+14
|
* fixed bindings generationTycho Bickerstaff2013-12-196-8036/+1087
|
* Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linuxTycho Bickerstaff2013-12-196-0/+16332
| | | | This reverts commit 906fd503439becaa0856119c573d5dfbbd7f7039.
* bindings regenration logicTycho Bickerstaff2013-12-193-132/+281
|
* added zlib and UITycho Bickerstaff2013-12-181-0/+11
|
* added zlibTycho Bickerstaff2013-12-111-1/+0
|
* more cmake changesTycho Bickerstaff2013-12-102-2/+13
|
* more cmakeTycho Bickerstaff2013-12-102-0/+17
|
* started work on cmakeTycho Bickerstaff2013-12-101-0/+7
|
* Fixed tolua++ compilation.madmaxoft2013-12-083-4/+4
| | | | Duplicate files, wrong includes, const-incorrect code...
* Removed unused ToLua files.madmaxoft2013-12-086-16332/+0
| | | | Those were used to compile the tolua executable and were getting in the way - Unix makefile tried to compile them into MCS.
* Removed faulty .gitattributes.madmaxoft2013-11-271-8/+8
| | | | | They cause git to think that files have been modified although they have not, and makes it impossible to revert the files to un-changed form. See http://stackoverflow.com/questions/5009096/files-showing-as-modified-directly-after-git-clone 's first answer.
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-272-5/+5
|
* Fixed all outstanding VS compilation issuesTiger Wang2013-11-251-1/+1
| | | | Also updated VS2008 files.
* Further attempts to fix compileTiger Wang2013-11-253-7/+7
|
* Attempt to fix compilationTiger Wang2013-11-2411-22/+22
|
* Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-0/+148557
|
* Moved tolua++Alexander Harkness2013-11-2457-0/+25232
|
* Moved zlibAlexander Harkness2013-11-2428-0/+13968
|
* Moved LuaAlexander Harkness2013-11-2461-0/+17630
|
* Moved JSONCPPAlexander Harkness2013-11-2416-0/+6513
|
* Moved iniFileAlexander Harkness2013-11-242-0/+1012
|
* Moved expatAlexander Harkness2013-11-2418-0/+13475
|
* move cryptopp into libAlexander Harkness2013-11-24193-0/+48154
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:55:22 +0100