Commit Graph

7906 Commits (cf7dbd478aac33f23d752b9075cb9e0f6eb35885)
 

Author SHA1 Message Date
PatrikLundell cf7dbd478a Made prompt respect color reset 2017-12-14 12:45:35 +01:00
PatrikLundell 88be4b2b6e
Merge pull request #1 from DFHack/develop
Develop
2017-12-13 11:24:28 +01:00
lethosor ad2c939fea Update Authors.rst: dfhack/scripts#33 2017-12-08 01:19:36 -05:00
lethosor 43b19c893a Bump version to alpha1 2017-12-07 14:43:50 -05:00
lethosor 7721a142d8 Add a basic Lua console API 2017-12-07 14:43:27 -05:00
lethosor 622a8dacb6 Update submodules 2017-12-07 14:39:15 -05:00
lethosor 23bb8c4f3d Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor 2017-12-07 14:37:15 -05:00
lethosor fc952bc67f Update NEWS-dev.rst 2017-12-07 14:36:54 -05:00
lethosor 5c9318654d Change release to alpha0 to avoid error from prerelease-warning 2017-12-04 13:31:42 -05:00
Quietust 88c7e493b8 Merge ui_area_map_width into ui_menu_width, now a 2-byte array 2017-12-03 20:34:59 -06:00
Quietust c72ae8d8a7 Merge "announcements" global into d_init where it belongs 2017-12-03 20:05:08 -06:00
Quietust ec06ed09c9 update structures - add remaining Linux 64-bit offsets 2017-12-03 13:49:57 -06:00
Quietust 1489e7db82 update structures - fix unit_personality and historical_figure_info.personality 2017-12-02 22:14:04 -06:00
Quietust 4edc7a6f43
update DataFuncs to support vmethods with 12-13 parameters (#1192) 2017-12-02 21:41:44 -06:00
Quietust e174135133 update structures 2017-12-02 21:09:00 -06:00
lethosor 35b0e962ce Fix crash on empty symbol tables 2017-11-25 01:10:47 -05:00
lethosor 2c95ac411e Update xml and all uses of job_handler 2017-11-25 00:59:59 -05:00
lethosor 7508126bef Change version to 0.44.02-r0 2017-11-25 00:50:22 -05:00
lethosor 69eb10a3e5 Update scripts 2017-11-24 23:40:58 -05:00
lethosor e2f705c76d Update version in CMakeLists.txt 2017-11-23 16:38:05 -05:00
lethosor dd325549c8 Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-11-23 16:34:49 -05:00
lethosor fb940b8836 Update NEWS.rst 2017-11-23 16:34:28 -05:00
lethosor 1b706bc162 Add anchor for luasocket 2017-11-23 16:34:22 -05:00
Lethosor c8cd2f40bc
Merge pull request #1188 from BenLubar/labormanager-culture-crash
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 16:22:44 -05:00
lethosor c546e5e52c Update Authors.rst (dfhack/scripts#31) 2017-11-23 16:06:19 -05:00
lethosor 5795a370bc Update xml again to fix GCC build error 2017-11-23 16:01:27 -05:00
lethosor a3288b4b05 Update Authors.rst (dfhack/scripts#32) 2017-11-23 15:54:45 -05:00
lethosor 2473476f98 Update Authors.rst (#1156) 2017-11-23 15:54:34 -05:00
lethosor 111df1312b Update xml to 1cdab5a (last for 0.43.05) 2017-11-23 15:50:58 -05:00
Lethosor 1d679e713e
Merge pull request #1156 from ViTuRaS/patch-1
max_barrels was serialized on max_bins position
2017-11-23 11:58:08 -05:00
Lethosor 9259cb22d2
Merge pull request #1184 from quietust/develop
update structures
2017-11-23 11:57:41 -05:00
Lethosor 30d17398c1
Merge pull request #1174 from BenLubar/auto-ptr-deprecated
auto_ptr is deprecated
2017-11-23 11:56:12 -05:00
Lethosor 6f44535d12
Merge pull request #1178 from BenLubar/orders-fencepost
Fix fencepost error in orders import.
2017-11-23 11:55:47 -05:00
Ben Lubar e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity 2017-11-23 10:55:37 -06:00
Quietust 33a43c5bfd update structures 2017-11-04 07:50:47 -06:00
Ben Lubar cc595d7a4e
Fix fencepost error in orders import. Fixes #1177. 2017-10-16 14:01:23 -05:00
Lethosor 0ee421a9d4 Merge pull request #1175 from quietust/develop
listcolumn tweak for GCC
2017-10-08 23:24:29 -04:00
Quietust c080da3750 listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux 2017-10-08 19:54:51 -06:00
Ben Lubar d3f3ebf778
auto_ptr is deprecated - use unique_ptr instead 2017-10-04 14:49:28 -05:00
ViTuRaS ca481fc69f max_barrels was serialized on max_bins position
When I save and load stockpile settings with stockpile management plugin, then saved barrels count will be loaded in bins and barrels are zero. So I think this change should correct it.
2017-08-28 22:33:24 +02:00
Lethosor 54b0d2fcb6 Merge pull request #1154 from JapaMala/master
RemoteFortressReader updates.
2017-08-22 10:48:47 -04:00
lethosor a39efc6f1d Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-08-21 19:35:14 -04:00
lethosor 4f38260e8c Pass the correct architecture to setarch on Linux
Fixes #1129
2017-08-21 19:34:46 -04:00
Japa a7b837f2d0 Increment version number 2017-08-20 20:44:55 +05:30
Japa 8e71cf9def Send Unit inventories with RFR 2017-08-19 17:48:18 +05:30
Japa 737aefefea send over beard styles 2017-08-19 09:38:56 +05:30
Japa 5b5ac7088d correct spelling 2017-08-12 19:12:14 +05:30
Japa b7783ba8b9 Added unkept hair to style list 2017-08-12 19:10:35 +05:30
Lethosor a39672fc15 Merge pull request #1150 from DFHack/luasock-fix
Fix luasocket receive with byte count
2017-08-12 08:51:31 -04:00
Warmist 620cfcc8bd Fix luasocket receive with byte count
Did not correctly detect when you typed in a number instead of pattern.
2017-08-12 15:42:56 +03:00