Commit Graph
97 Commits
Author SHA1 Message Date
Mattes D fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02: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
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
madmaxoft 7fa5217aad Fixed the warning in CryptoPP.
It was getting on my nerves too much, decided to actually fix their code.
2014-01-11 20:27:07 +01:00