Commit Graph

9444 Commits (ced8f4a55164da36f7b1b7b458eb1f8c789f2e97)
 

Author SHA1 Message Date
Japa e478c00ce5
Replace tab with space. 2017-12-19 11:20:12 +05:30
Japa c4f9f6edb2 Add item stack size. 2017-12-17 18:42:03 +05:30
Japa 29282a238b Bring in changes from the remoteServerUnsafe branch. 2017-12-17 18:05:38 +05:30
Quietust bbd823f5b0 Simplify logic in createitem, to avoid similar errors in the future 2017-12-16 15:40:39 -06:00
lethosor f59a91a0db Add more warnings about Lua's delete()
Closes #1170
2017-12-16 16:17:11 -05:00
lethosor b1e77fa260 createitem: fix an issue with items teleporting to the location of another unit
This was due to moveToGround() being called twice, first with the location of
world.units.active[0], which caused the item to teleport to that location later.

Fixes #1198
2017-12-16 16:09:43 -05:00
PatrikLundell 14996a9d67 Made prompt respect color reset 2017-12-14 12:46:52 +01:00
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
Japa d1c1dfe2cd update xml 2017-11-30 19:46:03 +05:30
Phillip Spiess bbdf157a52 Fixup autocomplete built ins per IRC 2017-11-27 13:45:58 -08:00
Phillip Spiess 7e55efa3f7 Autocomplete built in commands (die, etc.) 2017-11-27 13:15:16 -08:00
Japa Mala Illo a0634f9ee0 Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe 2017-11-25 11:50:56 +05:30
Japa Mala Illo ea8347e2ca update xml 2017-11-25 11:45:30 +05:30
lethosor 35b0e962ce Fix crash on empty symbol tables 2017-11-25 01:10:47 -05:00
Japa Mala Illo 7fd2586f62 Remove trailing whitespace 2017-11-25 11:39:15 +05:30
Japa Mala Illo 4a52f322c3 Remove tabs. 2017-11-25 11:37:54 +05:30
Japa Mala Illo 69a88e1641 Use json for server config. 2017-11-25 11:34:02 +05:30
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
Japa Mala Illo 272f51ef4b Merge remote-tracking branch 'remotes/DFHack/master' into RemoteServerUnsafe 2017-11-25 10:24:51 +05:30
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