Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 12 | -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 | ||||
| * | Monster fixes | Tiger Wang | 2014-07-18 | 1 | -0/+0 |
| | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| * | Tolua driver: Fixed wrong indentation. | madmaxoft | 2014-07-13 | 1 | -15/+15 |
| | | |||||
| * | Adjusted calls to CreateProjectile that passed Items | Tycho | 2014-07-13 | 1 | -0/+0 |
| | | |||||
| * | Fixed OpenSSL programs and tests being generated when testing disabled. | tycho | 2014-07-06 | 1 | -2/+2 |
| | | |||||
| * | LuaProxy compilation under MinGW. | Mattes D | 2014-07-01 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'master' into LuaProxy | Mattes D | 2014-07-01 | 6 | -486/+14 |
| |\ | |||||
| | * | Proper sqlite dependency fix. | Mattes D | 2014-07-01 | 1 | -1/+2 |
| | | | |||||
| | * | Fixed linking order under MinGW. | Mattes D | 2014-07-01 | 1 | -2/+8 |
| | | | | | | | | | | | | Ref.: #1044 | ||||
| | * | typo | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | | |||||
| | * | Added dependecy of tolualib on lua | worktycho | 2014-06-30 | 1 | -0/+1 |
| | | | |||||
| | * | Fixed lua compilation under MinGW. | Mattes D | 2014-06-30 | 1 | -8/+4 |
| | | | |||||
| | * | Fixed tolua linking order. | Mattes D | 2014-06-30 | 1 | -3/+1 |
| | | | | | | | | | | | | Ref.: #1044. | ||||
| | * | Removed the md5 library, obsoleted by PolarSSL. | Mattes D | 2014-06-27 | 3 | -474/+0 |
| | | | | | | | | | | | | Fixes #1130. | ||||
| * | | Added a missing endline. | madmaxoft | 2014-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | Added the Lua Proxy DLL. | madmaxoft | 2014-06-24 | 4 | -0/+317 |
| |/ | | | | | | | This builds the lua5.1.dll file on Windows, making it 64-bit if so required. | ||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 2 | -67/+74 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Fixed constness | worktycho | 2014-06-11 | 2 | -67/+74 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 5 | -8/+100 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Fixed debugging code in tolua++ driver script. | madmaxoft | 2014-06-09 | 1 | -1/+1 |
| | | |||||
| * | ToLua can now be run in pure-lua mode. | madmaxoft | 2014-06-09 | 5 | -8/+100 |
| | | | | | | | | See the src/Bindings/AllToLua_lua.bat for usage example. | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -0/+4 |
| | | |||||
* | | Capitalising | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | |||||
* | | Fix reading 64 bit values | worktycho | 2014-06-07 | 1 | -2/+5 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-05 | 2 | -0/+22 |
|/ | |||||
* | Fixed buffer overflow in JSON. | madmaxoft | 2014-06-04 | 1 | -1/+1 |
| | | | | Reported on Coverity as CID 43614. | ||||
* | Merge pull request #951 from worktycho/chunksparsing/structs | Mattes D | 2014-05-31 | 3 | -1/+190 |
|\ | | | | | Chunksparsing with segments | ||||
| * | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | | Maybe coverage working? | Tycho | 2014-05-10 | 2 | -0/+183 |
| | | | |||||
| * | | Fixed polarssl programs included | Tycho | 2014-05-01 | 1 | -1/+2 |
| | | | |||||
| * | | Tests off by default take 2 | Tycho | 2014-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | Disable polarssl tests by default | Tycho | 2014-05-01 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 1 | -0/+0 |
| |\ \ | |||||
| * | | | Added Testing capability | Tycho | 2014-04-27 | 1 | -1/+5 |
| | | | | |||||
* | | | | Cmake system name not System name | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | derp | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | FreeBSD requires __POSIX_VISIBLE macro to be defined | worktycho | 2014-05-28 | 1 | -0/+4 |
| | | | | |||||
* | | | | for compiliers other than msvc we need to tell lua that its building as a dll | worktycho | 2014-05-28 | 1 | -0/+6 |
| |_|/ |/| | | |||||
* | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Merged change to enable testing to be disabled | Tycho | 2014-05-01 | 1 | -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. | madmaxoft | 2014-04-25 | 1 | -4/+2 |
| | |||||
* | Missed these CMakeLists. | archshift | 2014-04-25 | 5 | -2/+10 |
| | |||||
* | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -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 file | Tycho | 2014-04-06 | 1 | -0/+1476 |
| | |||||
* | Merge branch 'master' into override | Tycho | 2014-04-05 | 4 | -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 Barney | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
| * | Fixed bad cmake document interpretation | Tiger Wang | 2014-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Docs say: "If nothing is found, the result will be <VAR>-NOTFOUND" | ||||
| * | Merge pull request #826 from worktycho/xxd_check | Mattes D | 2014-03-23 | 1 | -6/+9 |
| |\ | | | | | | | Added better check for xxd existance | ||||
| | * | Added Additonal check for xxd existance | Tycho | 2014-03-22 | 1 | -6/+9 |
| | | | |||||
| * | | Merge branch 'master' into size_t_lua | Tycho | 2014-03-22 | 10 | -2826/+3163 |
| |\| | | | | | | | | | | | | | Conflicts: lib/tolua++/src/bin/basic_lua.h | ||||
| * | | Patched tolua to understand size_t | Tycho | 2014-03-15 | 2 | -1/+4 |
| | | | |||||
* | | | Fixed tolua++ override support | Tycho | 2014-04-02 | 5 | -1319/+164 |
| | | | |||||
* | | | FIrst attempt at adding override support to tolua | Tycho | 2014-03-22 | 1 | -5/+6 |
| |/ |/| | |||||
* | | Fixed enum checking functions not being called in generated code | Tycho | 2014-03-20 | 8 | -2569/+2572 |
| | | |||||
* | | Fixed bugs in patched tolua output | Tycho | 2014-03-19 | 10 | -2211/+2531 |
| | | |||||
* | | Fixed tolua emitting isnumber insteand of is<Enum> | Tycho | 2014-03-19 | 4 | -449/+462 |
| | | |||||
* | | Fixed type error in lua bindings | Tycho | 2014-03-19 | 2 | -162/+163 |
| | | |||||
* | | Fixed =~ bug | Tycho | 2014-03-17 | 2 | -2/+2 |
| | | |||||
* | | Made buffers static const | Tycho | 2014-03-16 | 4 | -6/+6 |
|/ | |||||
* | Fix indentation | Tycho | 2014-03-15 | 1 | -1/+1 |
| | |||||
* | Patched tolua to emit range checks for enums | Tycho | 2014-03-15 | 7 | -1747/+2302 |
| | |||||
* | Rewound PolarSSL to master branch. | madmaxoft | 2014-03-07 | 1 | -0/+0 |
| | | | | The current Devel branch fails to build on RasPi. | ||||
* | Fixed compatibility with ZeroBraneStudio and LuaRocks. | madmaxoft | 2014-02-28 | 1 | -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/Bug402 | Mattes D | 2014-02-17 | 2 | -1/+39 |
|\ | | | | | Addressed Issue #402. | ||||
| * | Fixed comment typo | narroo | 2014-02-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed Comment Typo. | narroo | 2014-02-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed the tab spacing. | narroo | 2014-02-17 | 1 | -22/+22 |
| | | |||||
| * | Fixed Tab spacing of cases. | narroo | 2014-02-17 | 1 | -10/+10 |
| | | |||||
| * | Reworked RemoveBom to use unsigned chars and reverted the logic changes in WriteFile. Should work fine now. | narroo | 2014-02-16 | 1 | -82/+96 |
| | | |||||
| * | Changed unsigned char[] back to char[]. | narroo | 2014-02-16 | 1 | -1/+1 |
| | | |||||
| * | Changed char[] to unsigned char[] in cIniFile::RemoveBom | narroo | 2014-02-16 | 1 | -1/+1 |
| | | |||||
| * | Addressed Issue #402. cIniFile can now process UTF-8 files that have a | narroo | 2014-02-16 | 2 | -67/+91 |
| | | | | | | | | Byte Order Marker, BOM. | ||||
* | | Fogot | Tycho | 2014-02-16 | 1 | -0/+5 |
| | | |||||
* | | Allow building MCADefrag at the same time as MCServer | Tycho | 2014-02-16 | 1 | -6/+8 |
| | | |||||
* | | Added a seperate module for Setting flags | Tycho | 2014-02-16 | 1 | -1/+1 |
|/ | |||||
* | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 1 | -0/+0 |
| | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | Updated Core & PolarSSL | Tiger Wang | 2014-02-05 | 1 | -0/+0 |
| | |||||
* | Removed CryptoPP files. | madmaxoft | 2014-01-22 | 194 | -48168/+0 |
| | |||||
* | Added PolarSSL as a submodule. | madmaxoft | 2014-01-22 | 1 | -0/+0 |
| | |||||
* | CMake: Fixed Lua output folder for MSVC2010+. | Mattes D | 2014-01-17 | 1 | -2/+13 |
| | |||||
* | CMake: Fixed output paths for all MSVC versions. | madmaxoft | 2014-01-16 | 1 | -4/+10 |
| | |||||
* | Another VarArgs fix. | madmaxoft | 2014-01-16 | 1 | -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(). | madmaxoft | 2014-01-15 | 1 | -2/+4 |
| | | | | This seems to be the only reasonable C++03-only solution. | ||||
* | CMake: Removed SCL warnings from Lua and ZLib. | madmaxoft | 2014-01-15 | 2 | -0/+9 |
| | |||||
* | Renamed unused source files from zlib. | madmaxoft | 2014-01-13 | 2 | -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. | madmaxoft | 2014-01-13 | 1 | -0/+11 |
| | | | | Also removed SCL warnings from MSVC builds. | ||||
* | Merge pull request #526 from mc-server/IniFileFix | Mattes D | 2014-01-12 | 2 | -48/+77 |
|\ | | | | | Fixed cIniFile's SetValue(). | ||||
| * | Fixed reading the files. | madmaxoft | 2014-01-11 | 1 | -1/+1 |
| | | | | | | | | Duplicate values were ignored. | ||||
| * | IniFile: Split SetValue() into AddValue() and SetValue(). | madmaxoft | 2014-01-11 | 2 | -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(). | madmaxoft | 2014-01-10 | 1 | -9/+1 |
| | | | | | | | | How did we not see this earlier? Each call to SetValue would actually ADD a value! | ||||
* | | Fixed the warning in CryptoPP. | madmaxoft | 2014-01-11 | 1 | -1/+1 |
| | | | | | | | | It was getting on my nerves too much, decided to actually fix their code. | ||||
* | | Using dlopen() on all platforms except WIN32. | madmaxoft | 2014-01-10 | 1 | -5/+1 |
| | | |||||
* | | Specified the dynamic loader Lua should use. | madmaxoft | 2014-01-09 | 1 | -0/+9 |
|/ | |||||
* | Fixed FreeBSD compilition | Tycho | 2014-01-07 | 2 | -2/+2 |
| | |||||
* | removed tolua++ makefile which is overwritten by cmake | Tycho | 2014-01-03 | 1 | -338/+0 |
| | |||||
* | removed lua makefile | Tycho Bickerstaff | 2013-12-22 | 1 | -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 not | Tycho Bickerstaff | 2013-12-22 | 1 | -54/+0 |
| | |||||
* | Fixed unix Lua dependencies. | madmaxoft | 2013-12-27 | 1 | -1/+1 |
| | |||||
* | Made cmake compilation possible on Windows. | madmaxoft | 2013-12-27 | 3 | -9/+36 |
| | |||||
* | fixed lua dynamic library | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
| | |||||
* | fixed include of math on windows | tycho | 2013-12-20 | 1 | -0/+2 |
| | |||||
* | made LUA shared unless STATIC_LUA is set | Tycho Bickerstaff | 2013-12-20 | 1 | -0/+4 |
| | |||||
* | fixed lua dependency on libm | Tycho Bickerstaff | 2013-12-20 | 1 | -0/+1 |
| | |||||
* | possable fix of typo | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Revert "fixed bad reference to math library" | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+1 |
| | | | | This reverts commit 0836e5e6602f3101660e7653d7796be7f8f5bd80. | ||||
* | Revert "fixed bad reference to math library" | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+2 |
| | | | | This reverts commit c2167d7ed73c96c7e8cb935074ba860e11c821f9. | ||||
* | fixed bad reference to math library | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+2 |
| | |||||
* | fixed bad reference to math library | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+2 |
| | |||||
* | fixed compile errors with headers and math library | tycho | 2013-12-20 | 1 | -1/+5 |
| | |||||
* | added md5 as a dependency for bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+11 |
| | |||||
* | added expat as lua bindings dependincy | Tycho Bickerstaff | 2013-12-19 | 4 | -19/+63 |
| | |||||
* | compiling sqlite | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+14 |
| | |||||
* | fixed bindings generation | Tycho Bickerstaff | 2013-12-19 | 6 | -8036/+1087 |
| | |||||
* | Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux | Tycho Bickerstaff | 2013-12-19 | 6 | -0/+16332 |
| | | | | This reverts commit 906fd503439becaa0856119c573d5dfbbd7f7039. | ||||
* | bindings regenration logic | Tycho Bickerstaff | 2013-12-19 | 3 | -132/+281 |
| | |||||
* | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 1 | -0/+11 |
| | |||||
* | added zlib | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+0 |
| | |||||
* | more cmake changes | Tycho Bickerstaff | 2013-12-10 | 2 | -2/+13 |
| | |||||
* | more cmake | Tycho Bickerstaff | 2013-12-10 | 2 | -0/+17 |
| | |||||
* | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
| | |||||
* | Fixed tolua++ compilation. | madmaxoft | 2013-12-08 | 3 | -4/+4 |
| | | | | Duplicate files, wrong includes, const-incorrect code... | ||||
* | Removed unused ToLua files. | madmaxoft | 2013-12-08 | 6 | -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. | madmaxoft | 2013-11-27 | 1 | -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. | madmaxoft | 2013-11-27 | 2 | -5/+5 |
| | |||||
* | Fixed all outstanding VS compilation issues | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | | | | Also updated VS2008 files. | ||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 3 | -7/+7 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 11 | -22/+22 |
| | |||||
* | Moved SQLite, LuaExpat, and MD5 to /lib | Tiger Wang | 2013-11-24 | 8 | -0/+148557 |
| | |||||
* | Moved tolua++ | Alexander Harkness | 2013-11-24 | 57 | -0/+25232 |
| | |||||
* | Moved zlib | Alexander Harkness | 2013-11-24 | 28 | -0/+13968 |
| | |||||
* | Moved Lua | Alexander Harkness | 2013-11-24 | 61 | -0/+17630 |
| | |||||
* | Moved JSONCPP | Alexander Harkness | 2013-11-24 | 16 | -0/+6513 |
| | |||||
* | Moved iniFile | Alexander Harkness | 2013-11-24 | 2 | -0/+1012 |
| | |||||
* | Moved expat | Alexander Harkness | 2013-11-24 | 18 | -0/+13475 |
| | |||||
* | move cryptopp into lib | Alexander Harkness | 2013-11-24 | 193 | -0/+48154 |