Commit Graph

4847 Commits (c0e6e62ceacb059d1c53377f67de19afd32c0c03)
 

Author SHA1 Message Date
Kelly Martin 59ece3d4f1 Merge branch 'master' into autolabor 2012-10-21 17:25:14 -05:00
Kelly Martin dfa3a520fd sync structures 2012-10-21 16:34:13 -05:00
Alexander Gavrilov 46938625fd Pass the hotkey keys to dwarfmode from overlays, and fix gui/workshop-job. 2012-10-21 21:45:51 +04:00
Anuradha Dissanayake f501ae0748 Bug fix on unit sort 2012-10-22 01:09:10 +13:00
Anuradha Dissanayake bf01ecd206 Added Trade screen 2012-10-22 00:48:27 +13:00
Warmist a3f6e9e305 Small error fix 2012-10-21 13:46:12 +03:00
Warmist 86ec66c0fb More work on dfusion. Embark anywhere script separated. 2012-10-21 13:42:55 +03:00
Anuradha Dissanayake c5b38a24eb Refactoring to use templates 2012-10-21 20:57:03 +13:00
Alexander Gavrilov 67674a7676 Merge remote-tracking branch 'jjyg/master' 2012-10-21 11:12:32 +04:00
jj 1f7a01d685 follow rename unit.military.squad_index to squad_id in df-structures 2012-10-20 22:35:39 +02:00
Alexander Gavrilov dee0c97584 Add a gui script for viewing and changing job_item properties. 2012-10-20 21:57:36 +04:00
Alexander Gavrilov fbba4caab2 Suppress checking the cookable material flag if the item is a container. 2012-10-20 21:16:00 +04:00
Alexander Gavrilov 0c9f1e0af4 Check the item type against job_item_vector_id when matching to jobs.
This will prevent setting an invalid item type via the job command.
2012-10-20 21:01:22 +04:00
Alexander Gavrilov 795961bfc4 Fix the treatment of non_economic in Materials/Items modules.
non_economic == !(is boulder && is inorganic && is economic)
2012-10-20 20:31:45 +04:00
Alexander Gavrilov 5388ad475f Fix a bug in lua wrapper caused by the recent pairs() addition.
It inadvertently removed all functions like df.new from the df table.
2012-10-20 20:14:50 +04:00
Alexander Gavrilov 2b1d856214 Add a few utility functions to the lua api. 2012-10-20 17:06:33 +04:00
Anuradha Dissanayake fd60db44ab Search plugin, early work. Unit and stocks screen. 2012-10-21 00:49:46 +13:00
Alexander Gavrilov 687dc7105f Merge remote-tracking branch 'kmartin/master' 2012-10-20 15:39:20 +04:00
Alexander Gavrilov cc0d92f4ba Merge remote-tracking branch 'peterix/master' 2012-10-20 15:38:46 +04:00
Anuradha Dissanayake 6a54878a6b Fix autobutcher resume 2012-10-20 01:38:08 +13:00
Warmist da92fb9a1c Start of dfusion module. Fixed small error in memscan.lua and start of custom embark command. 2012-10-17 21:43:44 +03:00
Alexander Gavrilov 1e2570f4cb Add an extremely simple item selection dialog by wrapping ListBox. 2012-10-17 21:42:06 +04:00
Alexander Gavrilov 2bbd00a8ec Add pairs and ipairs support for objects in df tree. 2012-10-17 20:58:37 +04:00
Warmist 1b5a6616e2 Just companion orders tool 2012-10-17 19:33:20 +03:00
Alexander Gavrilov 2d4935bc17 Add lua API functions for verifying item and material vs job_item flags. 2012-10-17 19:16:18 +04:00
Alexander Gavrilov 4f7895f571 Support restricting the set of materials presented in the dialog. 2012-10-17 18:29:15 +04:00
Quietust 5f4f540bfa Fix "fastdwarf" command to print syntax where appropriate, silence warning 2012-10-17 07:57:14 -05:00
jj ffe70e9ee7 ruby: unregister onupdate callback on exception 2012-10-17 14:40:28 +02:00
Alexander Gavrilov 0046b093f7 Link visibility and event handling order.
- Hidden widgets don't receive events.
- Children handle events in top to bottom order.
2012-10-17 11:49:11 +04:00
Alexander Gavrilov ad4f9908fb Extract a generic filtered list widget from the materials dialog. 2012-10-17 10:41:50 +04:00
Alexander Gavrilov b14e4e97f5 Natively support entry icons in the List widget. 2012-10-17 09:41:48 +04:00
Kelly Martin 8fd1dd04bb Display dfhack version number at end of baseline 'help' message. 2012-10-16 19:27:48 -05:00
Timothy Collett 7aae869d72 Add OS X build instructions to the Compile file 2012-10-16 15:58:34 -04:00
Alexander Gavrilov 023dc82564 Implement a material selection dialog. 2012-10-16 18:33:00 +04:00
Alexander Gavrilov d336abfd97 Add label and list widgets, and switch stock dialogs to them. 2012-10-16 14:18:35 +04:00
Alexander Gavrilov abfe2754fb Start implementing common widgets for lua screens. 2012-10-15 20:03:18 +04:00
Alexander Gavrilov 33bd8103de Extract an abstract View superclass from Screen to handle widget trees. 2012-10-15 15:30:00 +04:00
Kelly Martin 5abecf32e7 Merge remote-tracking branch 'angavrilov/master' 2012-10-12 20:33:15 -05:00
Kelly Martin 0003fe0b2a Merge remote-tracking branch 'jjyg/master' 2012-10-12 20:33:07 -05:00
Alexander Gavrilov adfb307942 Merge remote-tracking branch 'kmartin/master' 2012-10-12 16:02:42 +04:00
jj c089534f73 ruby: fix assigning value to pointer to number 2012-10-12 13:33:58 +02:00
jj 1f88c0eeed ruby: codegen: avoid bad vector_reftg accessor 2012-10-12 11:42:42 +02:00
jj 0547ee7f83 ruby: add magic "nolock " prefix to run ruby without Suspending main df 2012-10-12 11:12:31 +02:00
ab9rf 12eeb9e5c0 Correct wrong variable use in start_autonestbox. 2012-10-12 00:38:45 -05:00
jj 424c37c0ea ruby: fix codegen to handle composite vtables 2012-10-11 17:51:49 +02:00
Alexander Gavrilov 5f9489a843 Start making a script for viewing and changing minecart Guide paths. 2012-10-11 19:32:41 +04:00
Alexander Gavrilov 2865e1373a Experimental API for associating tile bitmasks with persistent data.
Use block_square_event_world_constructionst objects with the same
bogus negative id as the matching historical figure object.
2012-10-11 17:34:34 +04:00
Alexander Gavrilov 5206236b01 Look through missing intermediate bases when interposing subclasses. 2012-10-11 15:10:19 +04:00
Alexander Gavrilov 010417c812 Compute detailed focus string for the hauling menu. 2012-10-11 12:36:17 +04:00
ab9rf 39a25856cd Merge https://github.com/jjyg/dfhack 2012-10-11 00:05:25 -05:00