Commit Graph

1403 Commits (0fb5ad7729831796f5fb459d6e7a8ba76107c261)

Author SHA1 Message Date
Alexander Gavrilov 56ef33ea0e Support building steam engines on top of brooks without any down stairs. 2012-11-10 17:33:05 +04:00
Alexander Gavrilov eb936c4ce0 Support milking and shearing in workflow. 2012-11-10 17:06:54 +04:00
Alexander Gavrilov a7bf526f41 Make workflow consider squad-assigned items busy. 2012-11-08 21:27:56 +04:00
Petr Mrázek 0c70a448d0 Update submodules 2012-11-07 23:06:02 +01:00
Alexander Gavrilov f6b6d730a0 Fix fix-armory constantly trying to store ammo already stored in chest. 2012-11-07 22:49:40 +04:00
Alexander Gavrilov edf80ff748 Show the sex of the unit in the bottom line of Dwarf Manipulator. 2012-11-04 18:03:02 +04:00
Alexander Gavrilov 9bf24bde10 More various updates for search.
- Keep the search state as long as the screen is alive.
- Properly forget saved state when clearing search.
- Fix the start column in render for stocks screen.
- Allow search by profession in all Units pages.
- Dismiss search when trying to trade.
2012-11-03 15:34:04 +04:00
Alexander Gavrilov 8bccfb1e9a Fix gcc compiler errors and warnings in search, reindent plugin_init, etc. 2012-11-03 14:31:07 +04:00
Alexander Gavrilov 43ab172652 Merge remote-tracking branch 'falconne/master'
Conflicts:
	plugins/zone.cpp
2012-11-03 14:07:42 +04:00
Alexander Gavrilov 71c1ba84e3 Merge remote-tracking branch 'q-github/master' 2012-11-03 14:05:15 +04:00
Quietust 3257eb80a1 Add checks to avoid crashing if we encounter a soulless unit 2012-11-02 16:28:48 -05:00
Warmist e887c60e93 Removed unused buffers. 2012-11-02 21:00:35 +02:00
Warmist 86e4a42bdd Small fix due to vmethod change 2012-11-02 20:59:05 +02:00
Warmist 6be65690f7 Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge 2012-11-02 20:29:27 +02:00
Warmist 5295be5fdb More work done. Only bin-plugs left (and docs) 2012-11-02 20:28:08 +02:00
Warmist 296d1cf090 More scripts for dfusion. Only fixes left, and updating bin-plugins (friendship and migrants(??)) 2012-11-02 00:50:20 +02:00
Warmist ba071468dc New way of doing things!
Now using a class for menus, also no (non script) way to use bin-plugins.
2012-11-02 00:28:16 +02:00
Warmist 209d593f21 Another day, another commit. 2012-11-01 16:00:00 +02:00
jj 0a78064467 ruby: raise on invalid enum symbols 2012-10-31 16:11:06 +01:00
Alexander Gavrilov 69bdb0f8b8 Update fix-armory documentation and comments. 2012-10-31 11:31:31 +04:00
Alexander Gavrilov 05b73af9bb Extend fix-armory with support for storing ammo in barracks. 2012-10-30 23:20:34 +04:00
Quietust c4f544d796 Fix stupid MSVC 2012-10-30 13:50:14 -05:00
Quietust b46885bb3c Fix compile 2012-10-30 11:48:28 -05:00
Alexander Gavrilov 4fa826d2b9 Block instant creation of store in stockpile jobs when removing uniforms. 2012-10-30 13:11:57 +04:00
Alexander Gavrilov 3ff5d38a5c Add a few utility functions to the main library. 2012-10-30 12:40:26 +04:00
Alexander Gavrilov dc2805b1f3 Link the renderer vtable from libgraphics on linux. 2012-10-30 10:38:32 +04:00
Quietust cd14bdfd43 Disable dfstream by default 2012-10-29 22:29:07 -05:00
Quietust 3a6b0357a2 Fix compilation on Windows, incorporate latest df-structures data 2012-10-29 16:56:22 -05:00
Quietust c69ae2fc4a Merge https://github.com/Mortal/dfhack 2012-10-29 16:34:26 -05:00
Mathias Rav 7646fa6aa3 Add dfstream plugin. Broadcasts the Dwarf Fortress display on TCP port 8008. For use with https://github.com/Mortal/dfstream 2012-10-29 22:18:50 +01:00
Alexander Gavrilov 7219200d17 Split the armory tweak into a separate plugin - it is too big now. 2012-10-28 22:05:00 +04:00
Alexander Gavrilov ed4904fb66 Add a tweak that makes dwarves haul equipment from stockpiles to the armory. 2012-10-28 21:13:28 +04:00
Alexander Gavrilov fa88ee5f17 Update the armory tweak to protect other potential squad equipment.
Specifically clothing in cabinets and flasks/backpacks/quivers in boxes.
2012-10-28 15:37:16 +04:00
Alexander Gavrilov 4c2c6a1911 Fix handling of Collect Webs jobs in workflow. 2012-10-26 23:53:18 +04:00
Alexander Gavrilov c5d8bd9db6 Add a tweak to stop stockpiling items on weapon racks and armor stands. 2012-10-26 23:30:44 +04:00
Alexander Gavrilov b976e01b8c Follow the change in the base-type of job_skill. 2012-10-26 20:29:21 +04:00
jj 1b9d11090f ruby: ANY_FREE/IN_PLAY 2012-10-25 13:44:01 +02:00
Alexander Gavrilov 1f994295b8 Consider assigned vehicles in use, and tweak text color rendering. 2012-10-25 13:20:41 +04:00
Alexander Gavrilov 79d2cb1a5c Remove the C++ version of the job output deduction code and switch to lua. 2012-10-25 12:44:23 +04:00
Alexander Gavrilov 8eebfa007c Tweak the workflow gui script to make the UI operate smoother. 2012-10-25 12:15:18 +04:00
Alexander Gavrilov a7f1ceb75d Link lua to workflow. 2012-10-24 23:01:31 +04:00
Alexander Gavrilov 59ec9b304e Implement adding workflow constraints from gui/workflow. 2012-10-24 21:49:30 +04:00
Alexander Gavrilov 616c57257d Support changing the constraint ranges from the workflow gui script.
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
Alexander Gavrilov cd852e2240 Fix one more place that was using ANY_FREE. 2012-10-24 17:51:47 +04:00
Alexander Gavrilov 7b67df4b4e Merge remote-tracking branch 'q-github/master' 2012-10-24 16:49:12 +04:00
Alexander Gavrilov 09f8e8e419 Start working on gui for workflow. 2012-10-23 21:42:03 +04:00
Quietust 27c7dfde4f ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages 2012-10-23 12:14:21 -05:00
Anuradha Dissanayake 94898a73fb Add Search plugin comments 2012-10-23 21:20:51 +13:00
jj cfbdf47f6e follow rename Carried->Hauled in df-structures unit inventory mode 2012-10-22 19:37:12 +02:00
Anuradha Dissanayake 2fcceaa65e Set priority over manipulator plugin
Include animal type is search
2012-10-22 21:44:02 +13:00
Anuradha Dissanayake c433a8eeff Better handling of Trade screen. Tracks marked items and handles re-orders is sort plugin is used to sort filtered list. 2012-10-22 19:54:36 +13: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
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
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
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
Kelly Martin 0003fe0b2a Merge remote-tracking branch 'jjyg/master' 2012-10-12 20:33:07 -05: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
jj 9148079745 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-10-10 19:47:01 +02:00
jj 46a24a83fb ruby: fix item_find(:selected) in item details screen 2012-10-10 18:01:57 +02:00
Alexander Gavrilov 41de37a5c1 Add a special workshop for add spatter reactions into example raws. 2012-10-10 18:29:59 +04:00
Alexander Gavrilov 7c969f774f Split the liquipowder fix-dimensions hook into separate liquid and powder.
The item_liquipowder vtable is completely optimized out by MSVC.
2012-10-10 18:22:01 +04:00
jj 5cf42fd6f8 ruby: add Matinfo#=== 2012-10-10 14:57:45 +02:00
Quietust ab90e3eefe Manipulator - take false identities into account 2012-10-07 17:35:41 -05:00
Warmist 49476818c4 Dfusion rebuild start (lua script side plugins) 2012-10-07 20:45:14 +03:00
Warmist 923ea3f4b0 Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers) 2012-10-07 20:44:18 +03:00
Alexander Gavrilov 459c69046b Dissolve the World module class into a namespace.
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
Alexander Gavrilov 696cc4a911 Stop autobutcher and autonestbox crashing if started without world. 2012-10-06 13:07:11 +04:00
Alexander Gavrilov 6fefd09072 Fix re-enabling autobutcher after being disabled. 2012-10-06 12:51:34 +04:00
Alexander Gavrilov 5396a67465 Some tweaking and edited NEWS. 2012-10-06 12:40:46 +04:00
jj cbbb164dad ruby: add MapTile distance_to and spiral_search 2012-10-05 20:44:29 +02:00
Quietust ddcc2ee90d Should use "break" in this construct, not "continue" 2012-10-04 20:20:35 -05:00
Quietust 6b3d85eb0f Don't make teledwarf skip everything after it if there's a problem 2012-10-04 20:17:33 -05:00
Quietust faa131942c Partial rewrite of 'fastdwarf' plugin:
* add "fastdwarf 2" to use DF builtin "turbo speed" debug setting
* use Units::isCitizen() instead of race/civ check
* only scan active units, not all of them
* do both fastdwarf and teledwarf in the same loop
* teledwarf: don't use MapCache - it's faster to do it directly
* teledwarf: don't clear both occupancy flags - check unit 'prone' flag
* teledwarf: set proper unit occupancy flag at destination tile
* teledwarf: if destination tile has standing unit, make dwarf lie down
* cleanup 'fastdwarf' command
* improve help text
2012-10-04 20:14:50 -05:00
Alexander Gavrilov 9f687f64a4 Fix build. 2012-10-03 12:58:05 +04:00
Quietust 7962f24cce Display actual key bindings for Manipulator 2012-10-02 10:20:54 -05:00
jj 150704f1af ruby: raise when using unknown symbols in viewscreen.feed 2012-10-01 16:05:07 +02:00
jj fbc2d85609 ruby: rename building_isitemfree to item_isfree, add trader flag check 2012-10-01 11:14:00 +02:00
jj 4de245d691 ruby: install generated autogen after copying *.rb 2012-09-30 17:08:03 +02:00
jj 6fd002382f ruby: fix cmake dependency on codegen.out.xml 2012-09-29 12:13:04 +02:00
Alexander Gavrilov 7a74088287 Make backspace seek to top left corner in manipulator. 2012-09-29 13:01:11 +04:00
Petr Mrázek 1bac22884e xMerge https://github.com/jjyg/dfhack 2012-09-29 01:58:29 +02:00
jj 12f5e6028c manipulator: avoid NULL deref with unassigned job in unit list 2012-09-29 01:38:32 +02:00
Petr Mrázek 4258d1eb83 Merge branch 'experimental' of https://github.com/expwnent/dfhack 2012-09-29 01:31:12 +02:00
expwnent 0e124bf62b Merge branch 'teledwarf' into experimental 2012-09-28 19:17:56 -04:00
expwnent d41c4849f9 Fixed unit_grounded in teleporting dwarf tile. 2012-09-28 19:17:12 -04:00
expwnent 4b99d096da Merge branch 'teledwarf' into experimental 2012-09-28 19:07:29 -04:00
expwnent 1bde32fa5b Fixed a tile occupancy problem with teleporting dwarves. 2012-09-28 19:06:22 -04:00