Commit Graph

7646 Commits (9edfeb5b8c719782727fc13663411b420c93c246)
 

Author SHA1 Message Date
Japa 2e290f4837 Ignore the new VS version folders. 2016-10-15 00:18:25 +05:30
lethosor 0c0d68c9ed Update scripts 2016-10-14 08:56:54 -04:00
Japa a9ccec07bd Merge pull request #1001 from JapaMala/develop
RemoteFortressReader updates
2016-10-13 20:05:21 +05:30
Japa 980b6dd12f Update XML again. 2016-10-13 19:42:40 +05:30
Japa d5e8b5eeba Update XML 2016-10-13 19:35:40 +05:30
Japa 8d84b0d968 Merged branch v0.43.03 into develop 2016-10-13 19:27:06 +05:30
lethosor ada96b3162 Remove GCC version check in protobuf/CMakeLists.txt
The only thing this check was used for was disabled, and the root CMakeLists.txt
will enforce the minimum GCC version before protobuf is included.
2016-10-10 09:33:52 -04:00
lethosor e6bb7357df Update xml 2016-10-08 17:09:23 -04:00
lethosor 5ed9c935c7 Add dseguin and figment to Authors.rst 2016-10-08 17:05:59 -04:00
lethosor 1c20ebe62c Make title-folder work without SDL_WM_GetCaption 2016-10-08 17:02:45 -04:00
lethosor 2806fe73a9 ruby: Support for loading Ruby 2.x libruby
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
2016-10-08 17:01:52 -04:00
lethosor f6a91c2f30 Log architecture on startup 2016-10-08 16:58:08 -04:00
lethosor d414e60ff0 Mention DFHACK_BUILD_ARCH and other settings in Compile.rst 2016-10-08 16:57:39 -04:00
Japa 58ed20b25b Send world map snow coverage over remotefortressreader. 2016-10-06 22:16:40 +05:30
lethosor a5338d2f59 Fix rebase_delta type mismatch
See #984. GCC wasn't complaining about this on x64 for some reason.

Also reordered includes.
2016-09-28 20:43:02 -04:00
lethosor 714ba1a030 Warn if ruby library is missing instead of breaking installation 2016-09-26 18:28:59 -04:00
lethosor caa6a81669 Add ruby library for linux x64
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989

Closes dfhack/dfhack#989
2016-09-26 17:46:50 -04:00
lethosor 7abb82b6d1 Switch to downloading 32-bit libruby on Linux and Windows 2016-09-26 17:36:57 -04:00
lethosor 888a09bed5 Switch to downloading OS X libruby 2016-09-26 17:24:35 -04:00
Quietust 27d2229665 Fix follow_jmp for 64-bit code - skip REX prefix if found 2016-09-25 18:29:57 -05:00
lethosor 869e705549 Re-run zlib and pthread scans on Linux/OS X when the build architecture changes
Fixes #982, ref #992
2016-09-15 10:24:57 -04:00
lethosor 38cd830abf Revert "Added check to rescan zlib and pthread on linux"
This reverts commit 36b9ee5cf4.

Ref #992, #982
2016-09-15 01:52:54 -04:00
lethosor 1029e0f02a Fix a few whitespace issues
From #992
2016-09-15 01:37:07 -04:00
lethosor 39608f8a95 Merge remote-tracking branch 'dseguin/fix_cmake_64_linux' into develop 2016-09-15 01:35:52 -04:00
David Seguin 01a97f6487
Made pthread required for building protobuf 2016-09-08 17:12:42 -04:00
David Seguin 860e584006
Added @lethosor 's change 2016-09-08 11:28:15 -04:00
David Seguin 36b9ee5cf4 Added check to rescan zlib and pthread on linux
unset ZLIB_LIBRARY and CMAKE_HAVE_PTHREAD_H to rescan those libs
when arch changes from 32 to 64 (and vis-versa). There may be a
better way to do this.
2016-09-07 23:36:22 -04:00
lethosor 8f2cc5bc4d Fix and reorganize remotefortressreader includes 2016-09-04 16:06:26 -04:00
Japa e205dc82a5 Merge pull request #991 from JapaMala/v0.43.03
Removed the other foreach.
2016-08-29 22:30:43 +05:30
Japa 1862106fd1 Removed the other foreach. 2016-08-29 22:29:40 +05:30
Japa b09ee3407c Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
Conflicts:
	library/xml
	plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
Japa af5d4ec5a8 removed foreach. 2016-08-29 21:43:20 +05:30
lethosor 41e298bdfc Update submodules 2016-08-27 15:27:57 -04:00
lethosor bbaf129adf Fix ruby codegen for bitfields/enums with long base-type 2016-08-27 15:24:53 -04:00
Japa 7d145de4a7 Translate histfig mats into creature mats, rather than sending the entire histfig population. 2016-08-26 23:48:32 +05:30
Japa 91cb734a25 Send histfig materials over remotefortressreader.cpp, using unique ids. 2016-08-26 12:23:50 +05:30
Japa 5c3260c382 Actually check spatter amounts properly 2016-08-26 08:49:54 +05:30
Japa db7be082ef Only copy spatters if they actually have any amount. 2016-08-25 23:56:30 +05:30
lethosor 012e5e2a3b Add gui/manager-quantity keybinding 2016-08-25 12:14:44 -04:00
Japa a3ab757642 Add spatters to remotefortressreader.cpp 2016-08-25 21:14:23 +05:30
lethosor 85ebbf0e9c Fix df_expr_to_ref for raw userdata 2016-08-24 17:18:55 -04:00
lethosor 6ce470ad57 Add basic lua expression support to memview
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.

Closes #976
2016-08-24 16:26:34 -04:00
lethosor 7487f44fc8 Implement a helper to create lua environments with shortcuts (e.g. scr, unit)
Used in gui/gm-editor and lua

Closes #977
2016-08-23 21:47:41 -04:00
Lethosor ddc0c1b3cb Merge pull request #970 from PeridexisErrant/update-init
Update the example init file
2016-08-23 18:05:18 -04:00
lethosor 64e3b12f4f Make docs/build.sh a bit more configurable 2016-08-23 15:54:11 -04:00
lethosor 30601dc3fd Update Compile.rst for GCC 4.8 and x64 changes, and general cleanup
Closes #980
2016-08-23 15:52:39 -04:00
lethosor 7097b1f817 Add TC01, Qartar, milochristiansen to Authors.rst 2016-08-23 14:34:33 -04:00
lethosor f4b0c2fcfc color-dfhack-text: Fix potential overflow issue 2016-08-22 23:18:58 -04:00
lethosor 2dccd1d0ff Add CheckedArray:__tostring() method 2016-08-22 23:18:30 -04:00
lethosor 1dab45ffed Replace lua_pushnumber with lua_pushinteger in LuaApi.cpp 2016-08-22 23:18:08 -04:00