4e45cc5bbb
stocks: Use ^ and $ to match the beginning/end of item names
...
Closes #624
2015-07-29 13:44:32 -04:00
7fc682b199
Fix dismissal of current screen when zooming to items
2015-07-29 11:22:38 -04:00
825d46af51
Move ListColumn class to a separate header
2015-07-28 21:48:00 -04:00
dd7c20c848
Add safer helpers to get STRING_X keys from interface_key sets
...
A few plugins were using input->rbegin() previously, which crashes
if input is empty and isn't strictly guaranteed to return a
STRING_X key.
2015-07-28 18:34:29 -04:00
b73e859a37
Reorganize stocks viewscreen to fit a 25-row resolution
2015-07-28 14:37:49 -04:00
5ca5feb855
Stop embark-tools from crashing on unload
...
Also enable sand indicator and mouse controls by default and refactor
2015-07-27 21:38:53 -04:00
c3c625e7bd
Remove embark-tools nano (implemented in 0.40.24)
2015-07-27 18:22:18 -04:00
889c76b147
buildingplan: Don't assume building and item type names match
...
There are a few building types (e.g. hatch covers) where this is not
the case.
Fixes #604
2015-07-27 14:10:55 -04:00
6352a6e266
Expand confirm plugin and improve safety of adding/removing hooks
...
* New option: trade-select-all: Prompts when selecting all goods
when some goods are already selected
* Improved trade confirmation message depending on selected goods
* Made seize and offer confirmations only display when goods in the
appropriate columns are selected
* States of each option are now listed by "confirm help"
2015-07-27 12:03:29 -04:00
ed3cbe2e60
Add several trade-related confirmations
2015-07-27 10:05:59 -04:00
35f229c578
Add confirmations for hauling route/stop deletion and depot removal
2015-07-27 10:05:59 -04:00
175edf501a
Add "confirm" plugin - implements a few confirmation dialogs
...
See #577
2015-07-27 10:05:59 -04:00
f1a6e5fbe9
tweak farm-plot-select: Don't require crops to be discovered
...
Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
2015-07-24 11:17:04 -04:00
6c55164be4
Fix a potential crash in tweak farm-plot-select
...
Related to #396
2015-07-24 10:54:59 -04:00
867e78b6fd
Correctly identify ice material.
2015-07-04 09:22:41 +05:30
87b1524aec
search: give text input priority over cursor keys
2015-06-30 16:45:45 -04:00
8058472dd9
Check for null pointers in several places in the search plugin
...
Fixes #650 (and a few other potential issues)
2015-06-30 16:20:01 -04:00
2c734233eb
New tweak: kitchen-keys
...
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614
See #526
2015-06-27 11:02:26 -04:00
3795edb673
Fix colors in 'tweak kitchen-prefs-color'
2015-06-27 09:54:31 -04:00
4246dbd02a
New tweak: kitchen-prefs-color
...
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
8d21dd0a23
New tweak: kitchen-prefs-empty
...
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000
See #526
2015-06-26 23:19:39 -04:00
38d377f4c4
Fix a few zone plugin crashes
...
* Avoid checking building types of null pointers
* Detect selected cages properly
Fixes #646
2015-06-23 21:21:21 -04:00
c9f7fcfd05
Merge pull request #640 from lethosor/search-look-list
...
Add look menu search
2015-06-22 08:44:34 -04:00
33cb5e951f
Fixed whitespace and returns.
2015-06-22 18:01:19 +05:30
a071f5bf6c
Added preliminary building list to remotefortressreader. Untested.
2015-06-22 00:40:17 +05:30
96640c837f
Made remotefortressreader send an item list, and the item that constructions are made from.
2015-06-20 22:17:35 +05:30
4182a30cc5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-19 23:30:47 +05:30
4b05423e58
Made remotefortressreader send proper indices for inbuilt materials.
2015-06-19 23:28:32 +05:30
a8480070a0
Add look menu search
2015-06-16 20:36:19 -04:00
81cba0b0fc
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-06-16 19:56:16 -04:00
8145a04944
dwarfmonitor: Add mouse cursor widget
...
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
93c9a41a3a
Reimplement dwarfmonitor widgets in Lua (and improve customizability)
...
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.
Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
no longer copied into the DF directory when building DFHack. This
keeps developers' personal settings intact, but will require
copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
772ad0372d
Improved issue with workflow job being resumed but never being worked
...
Fixes #487
* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue
* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field
This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
84b2f814e8
Disable some plugin output on startup
...
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
in dfhack.init-example
2015-05-16 18:23:02 -04:00
a577248a38
Make memview output more readable
2015-05-09 19:41:13 -04:00
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
a8f5e683f7
Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop
2015-05-09 09:39:55 -04:00
d0ba6d7019
Fix tweak fps-min
2015-05-08 17:35:46 -04:00
9c404a535d
Make search plugin intercept MOVIES and HELP keys
2015-05-08 16:27:52 -04:00
3001053cef
Change tabs to spaces.
2015-05-07 21:51:03 -07:00
7aac9a8fb8
Improve workflow handling of plant reactions
...
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.
Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.
This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
3da939bb02
Change tabs to spaces.
2015-05-07 20:41:11 -07:00
684ff433d4
Autolabor changes
...
Try harder to concentrate skill on certain dwarves, at the expense of
potentially allowing more idle dwarves.
Attempt to keep dwarves with tools from running off and doing other
things while holding on the tool so much.
Add comments explaining the two modes autolabor uses depending on number
of idle dwarves.
2015-05-07 20:37:01 -07:00
82202efb26
Don't reset disabled labors
...
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
a1fd1d9219
Document dwarfmonitor and allow date format to be modified
2015-04-19 12:38:37 -04:00
6187ac3054
Only initialize steam-engine when a fortress mode map is loaded
...
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.
Fixes #444
2015-04-02 17:17:29 -04:00
786581689f
Move get_dfhack_version() to a separate namespace and add a few other version-related functions
2015-04-02 16:37:58 -04:00
9b6d8d2799
Allow dev plugins to be skipped on startup
2015-04-01 17:50:22 -04:00
82d72007fc
Move zoom-related commands to a separate dev plugin
2015-04-01 17:24:52 -04:00
7913517b2c
Add "nyan stop" command
2015-04-01 17:02:33 -04:00
6779849bc6
This requires a return value in Windows, and really should have one anyway.
2015-03-29 14:21:59 -04:00
88c3a629d5
Fix vshook
2015-03-26 19:27:22 -04:00
f8d8baef39
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:04:52 -04:00
d182b6c1c3
only create the stocksettings directory when it is requested
2015-03-24 17:46:49 -05:00
a5b2b92b30
Merge remote-tracking branch 'eswald/stockflow' into develop
2015-03-24 16:05:48 -04:00
ff38a60d56
Merge remote-tracking branch 'lethosor/ui-tweaks' into develop
2015-03-24 15:53:36 -04:00
4fac0aff0d
Fix compile: missing include in plugins/manipulator.cpp.
2015-03-24 12:25:50 -04:00
4f963233f4
Enticing the bookkeeper to work more often
2015-03-20 19:23:04 -06:00
caed509d0b
Simply maniuplator professions by adding the text token to the SkillColumn entries
2015-03-19 03:30:03 -04:00
23707db1d3
Fixed ballistic arrow head orders
2015-03-15 16:38:59 -06:00
6bfaa8d35d
Better way to handle obsolete job types.
2015-03-15 16:37:35 -06:00
81c2a6e79f
Refactoring a table insert into reaction_entry.
2015-03-15 16:02:29 -06:00
11d65b4f2d
Always clear reactions when loading.
...
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
d18bd3e2a5
Preventing a stockflow error message in Arena mode
2015-03-15 14:08:47 -06:00
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
48b7c51027
Merge pull request #574 from melkor217/master
...
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
0c5b5c691a
Use gametype checks in plugins
2015-03-09 20:17:18 -04:00
c2eba99cb9
Create professions folder if necessary
2015-03-05 16:57:58 -05:00
efa9224eef
Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop
2015-03-05 16:55:30 -05:00
6f276ac419
Shorten option width to stay within 80 columns
2015-03-05 16:48:11 -05:00
4c06e022a6
Negative autolabor pool size uses most unskilled dwarves.
2015-03-06 00:47:18 +03:00
be2349d67d
Revert "Expose manipulator columns to Lua"
...
This reverts commit 1d8b2d8cea
2015-03-05 16:32:57 -05:00
8459959124
Add fps-min to dfhack.init-example and plugin help
2015-03-05 16:29:36 -05:00
83cb7b48f9
Add "fps-min" tweak and allow onupdate-based tweaks
2015-03-04 19:03:39 -05:00
abc60f53ad
Add `tweak shift-8-scroll`; misc. tweak plugin changes
...
* Avoid dumping complete usage information for unrecognized tweaks
* Alphabetize tweaks in Readme.rst
2015-03-04 18:32:10 -05:00
499ac05ad3
Merge pull request #569 from Fukken-Saved/master
...
Small update (autohauler)
2015-03-04 15:08:52 -05:00
7a26e633e9
Update autohauler.cpp
2015-03-04 07:06:24 -05:00
36cee730f1
Update autohauler.cpp
2015-03-04 06:59:29 -05:00
0b912f54be
Fix field name in lua/stockflow.lua
...
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
6bfbb93377
Merge pull request #557 from jlogsdon/manipulator-job-view
...
Add current job as a view mode in manipulator
2015-03-01 17:14:29 -05:00
1ebb1f1d11
Add current job as a view mode in manipulator
2015-02-28 17:09:58 -05:00
87867b96b9
Add autohauler to plugins/CMakeLists.txt
2015-02-27 23:18:26 -05:00
fdfebf4d4e
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-02-27 23:15:49 -05:00
cdf211d437
Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop
2015-02-27 23:13:06 -05:00
64123d8fea
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2015-02-27 23:09:56 -05:00
ac5909ad2a
Update autohauler.cpp
...
Some small text changes
2015-02-25 07:47:15 -05:00
a228977976
Update autohauler.cpp
...
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
53c88bab56
Update autohauler.cpp
2015-02-25 07:22:25 -05:00
68d088eeb5
Revert "Add autohauler plugin to cmakelist"
...
This reverts commit a13c9b0310
2015-02-25 07:13:29 -05:00
6e0c7d6a4e
Revert "whoops"
...
This reverts commit 5f498b1b78
2015-02-25 07:13:09 -05:00
2549f116a0
Custom Profession Templates in manipulator!
2015-02-24 15:51:24 -05:00
c2c8ae6a44
Add current job as a view mode in manipulator
2015-02-24 15:51:24 -05:00
1d8b2d8cea
Expose manipulator columns to Lua
2015-02-24 15:50:27 -05:00
70824ade14
Allow shift to extend selection
2015-02-24 15:50:27 -05:00
e2d7a7395e
Add several additional format options
...
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
c36daa4d7d
Fix a few minor StringFormatter issues
...
* Recognize the end of a format specifier properly
* Make '$' actually work
2015-02-24 15:50:27 -05:00
5a92080cc1
Add various ID formatting options, allow editing a single dwarf
2015-02-24 15:50:27 -05:00
b5797daa8a
Allow custom nicknames/profession names to use format specifiers
...
Also prevent selecting/applying operations to uneditable units
2015-02-24 15:50:27 -05:00
21e96ba369
Implement batch operation callbacks and a basic string formatter
2015-02-24 15:50:26 -05:00
dd17f90dcd
Add a flag to allow mouse clicks to select ListColumn items
2015-02-24 15:50:26 -05:00
9d600f00a0
Add batch operations menu
2015-02-24 15:50:26 -05:00
990ab9c76b
Typecast nullptr in ListColumn::getFirstSelectedElem()
2015-02-24 15:50:26 -05:00
481e5cc19e
Implement dwarf selection
2015-02-24 15:50:25 -05:00
17fda7ffa0
Fixed whitespace.
2015-02-24 20:28:49 +02:00
e9ab892369
Building hacks changes.
...
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
cebfa603e0
Update isoworld, stonesense
2015-02-22 16:51:37 -05:00
5f498b1b78
whoops
2015-02-22 14:45:15 -05:00
a13c9b0310
Add autohauler plugin to cmakelist
2015-02-22 14:43:08 -05:00
250bc0a58d
Autohauler - An alternative to Autolabor
2015-02-22 14:41:45 -05:00
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
c80fbbc397
Remove AS prefixes from add-spatter.cpp
...
The actual cause of this crash was fixed in #558
See #205
2015-02-19 12:05:32 -05:00
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
f287a99a37
Merge pull request #542 from scamtank/fix-armory
...
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
35d357776c
Substitute removed jobtypes with working ones
...
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -05:00
50770f8cdd
Clean up whitespace in zone.cpp
2015-02-06 19:13:34 -05:00
00072dae1d
Fix crash in zone plugin from scrolling when assigning an owner to a cage
...
Fixes #534
2015-02-06 19:12:10 -05:00
67bf26dbbe
Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
...
New tweak to display pet genders on trade request screen
2015-02-03 08:25:12 -05:00
69dfec88cb
Merge remote-tracking branch 'dfhack/develop' into develop
2015-02-03 01:12:34 -05:00
5a93de3f31
New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
...
Closes #515
2015-02-02 10:04:31 -05:00
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
e34178e367
Fix add-spatter crash
...
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
5b3e5b533e
Make zone compile on Windows.
2015-01-31 21:04:12 -05:00
e9b4fc513a
Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
...
Conflicts:
NEWS
plugins/zone.cpp
2015-01-31 21:01:41 -05:00
1d8fd55a4a
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
...
Conflicts:
NEWS
2015-01-31 20:22:17 -05:00
6b2e7cfe3e
Merge pull request #511 from lethosor/stocksettings-create-dir
...
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
ab01e7d102
Eventful no longer requires LUA_HOOK to do reaction events.
2015-01-31 20:10:06 -05:00
f608235b1e
Fix some Lua things
2015-01-29 19:56:50 -05:00
f2eec3198c
Rename findPenPitAtCoord
2015-01-29 15:02:54 -05:00
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
4199728ba6
Cleanup building methods before extracting to Buildings.h
2015-01-29 13:57:50 -05:00
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
789cc01e93
Remove gcc warnings
2015-01-28 21:28:32 -05:00
10ec5f1330
Use auto to reduce vector iteration redundancy
2015-01-28 21:17:37 -05:00
5f9fe871b3
Add isGelded() to the priority butcher checks
...
Fixes #484
2015-01-28 21:17:37 -05:00
26ad797c43
isGelded function
2015-01-28 21:17:37 -05:00
58f896d569
Create `stocksettings` directory on startup
2015-01-26 16:28:57 -05:00
ae2e4f99eb
Merge branch 'develop' of https://github.com/DFHack/dfhack
2015-01-19 20:02:19 +05:30
8efac385cc
changed tile direction to a string, rather than a hard to understand int.
2015-01-19 19:58:09 +05:30
53a8032f8a
Fix compile of blueprint plugin on Linux.
2015-01-16 03:27:14 -05:00
06c4755168
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
...
Conflicts:
NEWS
Readme.html
2015-01-15 22:45:57 -05:00
da2224b0ba
Changed how parameters are parsed.
2015-01-14 14:58:15 -05:00
106612f386
Use alternate qf syntax for output.
2015-01-14 14:08:54 -05:00
d0273b8eff
Now puts room designations in the query blueprint
2015-01-13 16:15:54 -05:00
f315ee43a4
Added stockpiles
2015-01-13 14:28:28 -05:00
3489c2f39a
Buildings complete
2015-01-13 09:40:24 -05:00
3e91d34ab3
remotefortressreader.cpp only sends map changes now.
2015-01-11 16:16:53 +05:30
ea313b6bf5
plugins/blueprint.cpp: Buildings hopefully
2015-01-09 16:00:47 -05:00
aa332e18e2
Remove stray whitespace
2015-01-08 16:59:37 -05:00
859fdd60d6
annoucnement -> announcement
2015-01-08 16:59:25 -05:00
b627240943
Dig mode complete
2015-01-08 12:17:18 -05:00
819327348b
Blueprint plugin basic structure
...
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
c39cf1fb49
Add room assignment search
2015-01-05 21:09:30 -05:00
448404a465
Fix buildingplan stuff on Windows.
2015-01-05 20:02:54 -05:00
1519d8e9ea
Disable fortplan and buildingplan for now because it doesn't compile on Windows.
2015-01-05 19:34:01 -05:00
cd64fb84b7
Make fortplan use Filesystem::getcwd()
2015-01-05 17:37:41 -05:00
f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
67f0aa774c
Merge remote-tracking branch 'lethosor/tweaks-2'
...
Conflicts:
NEWS
2015-01-05 16:54:24 -05:00
e9fd8cf231
Merge remote-tracking branch 'lethosor/embark-tools-mouse'
...
Also update NEWS
2015-01-05 16:53:06 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
1d0b4deef6
Merge remote-tracking branch 'eswald/trackstop'
...
Conflicts:
NEWS
2015-01-05 16:22:18 -05:00
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
6e36b224d1
Merge remote-tracking branch 'ramblurr/stockpiles'
...
Also update stockpiles plugin to use REQUIRE_GLOBAL()
Conflicts:
plugins/stockpiles.cpp
2015-01-05 16:16:29 -05:00
ca0860c3bd
Merge remote-tracking branch 'lethosor/plugin-globals'
2015-01-05 16:05:40 -05:00
929f63ee2e
Fix error in WatchedRace::SortUnitsByAge
2015-01-05 15:57:34 -05:00
c069a87b47
Update isGay(df::unit) with better determination
2015-01-05 14:59:32 -05:00
1cdf61908e
Collapse ProcessUnits_* methods.
2015-01-05 14:25:44 -05:00
084bbc3162
Add isGay(df::unit*) method
2015-01-05 13:54:17 -05:00
5626bb8da7
layer and vein materials were being set wrong.
2015-01-04 19:05:48 +05:30
47d6e111c8
New tweak: "max-wheelbarrow"
2015-01-01 14:36:49 -05:00
ffac2f1795
New tweak: "eggs-fertile"
2015-01-01 13:48:11 -05:00
cade0d9723
Add local area mouse controls to embark-tools
2015-01-01 11:06:50 -05:00
c373e57c02
Added world names.
2014-12-31 17:50:43 +05:30
efc42c253e
Fix remaining issues with mousequery
2014-12-27 11:03:06 -05:00
088f3715cb
Finish up the bare-bones fortplan plugin with support for furniture that is made from an item of the same name
2014-12-23 17:09:35 -05:00
5547722414
Initial work on fortplan plugin, including separating out code that needs to be shared with buildingplan
2014-12-23 16:56:15 -05:00
ee958c0f8f
Update some plugins/scripts for 0.40.22
...
* autolabor, manipulator: Add BUILD_CONSTRUCTION and BUILD_ROAD labors
* mousequery: Support "toggle engravings" sidebar mode
* devel/export-dt-ini.lua: Add body_part_flags
Conflicts:
plugins/mousequery.cpp
2014-12-21 16:49:33 -05:00
bc58b0a822
Added map location to info.
2014-12-17 19:42:40 +05:30
0b7f890d87
Trackstop bugfix: No longer prevents cancelling building removal.
...
Thanks to Ramblurr for pointing this out.
2014-12-16 21:10:18 -07:00
cc5a78f848
Added function to get the map size, and fixed a stupid material bug.
2014-12-17 08:40:29 +05:30
5fc8a1f51f
digFlood CLEAR error.
2014-12-15 13:41:22 -05:00
f3826abc0c
cleaning up in needs_porting
...
Removed obsolete plugins. Started hotkeys port. Mostly-finished
position port. Corrected dwarfmonitor date display. Documented
putontable.lua in readme.
2014-12-15 23:11:23 +11:00
6982de88bd
Added very basic viewport size and position sending.
2014-12-12 21:04:23 +05:30
d11df5b87f
Added a simple unit listing to remotefortressreader.cpp. Updated stonesense.
2014-12-11 20:10:49 +05:30
22edb5a033
Merge branch 'master' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
plugins/isoworld
plugins/rendermax/CMakeLists.txt
plugins/rendermax/renderer_light.cpp
plugins/rendermax/renderer_light.hpp
plugins/rendermax/renderer_opengl.hpp
plugins/rendermax/rendermax.cpp
plugins/rendermax/rendermax.lua
2014-12-11 17:53:19 +05:30
09681cf029
Update skeleton plugin
2014-12-06 20:55:57 -05:00
88b51fcb5b
Allow strangemood to work if debug_nomoods is not available
2014-12-06 20:29:08 -05:00
a615723b38
Update remaining plugins to use REQUIRE_GLOBAL
2014-12-06 19:30:05 -05:00
5de3e6110a
Merge remote-tracking branch 'origin/develop' into plugin-globals
2014-12-06 17:32:44 -05:00
b9a2ecb440
stockpiles: properly initialize quality arrays
...
Props to @fricy for identifying this bug.
2014-12-05 17:39:29 +01:00
b0e0bbda9b
stockpiles: show proper cased names in filter list
2014-12-05 16:53:19 +01:00
52f4cb3fc1
stockpiles: load prompt uses typing + filtering
2014-12-05 14:49:40 +01:00
332566f6a1
stockpiles: disable gui/script when plugin is disabled
2014-12-05 13:27:58 +01:00
0f06eb7f6f
stockpiles: quiet debug
2014-12-05 12:42:59 +01:00
346f397bca
stockpiles: fix loading crash
2014-12-05 12:35:24 +01:00
7e6066daf2
stockpiles: user friendly error handling
...
* display errors in the GUI when necessary
* handle older versions of DFHack without the persist module
2014-12-05 12:35:24 +01:00
2f4678eee5
stockpiles: more error handling & cleanup
...
* prevent crashes when the path doesn't exist
* remove duplicated functions
* sort file list case insensitively
2014-12-05 12:35:24 +01:00
1525823948
Create stocksettings directory on startup if necessary
2014-12-05 12:35:24 +01:00
b6118d272c
stockpiles: integrate gui plugin into dfhack.init-example
2014-12-05 12:35:24 +01:00
1cde8cffa4
stockpiles: implement GUI controls
2014-12-05 12:35:19 +01:00
2e43ea8b38
stockpiles: refactor code into separate files
...
The file was approaching 3000 lines and contained multiple classes,
making it a real PITA to navigate through. upcoming features would only
add more LOC, so splitting was necessary.
2014-12-05 11:02:40 +01:00
19e977528c
Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
...
Conflicts:
NEWS
2014-12-04 23:49:13 -05:00
c83ed531bc
Merge remote-tracking branches 'lethosor/stocks-esc', 'lethosor/patch-8', 'lethosor/0.40.19-update-labors' and 'lethosor/fixTexts' into develop
2014-12-04 23:34:48 -05:00
cac2245438
Update some plugins to use REQUIRE_GLOBAL
2014-12-03 23:26:54 -05:00
16c2d4df99
stocks: Make LEAVESCREEN have priority over text entry
...
This should fix conflicts if LEAVESCREEN is bound to "Space" only
2014-12-03 17:52:42 -05:00
e206c242c6
Add a plugin_globals vector to aid in safety checks for plugins that require globals
...
This allows "using df::global::foo" to be replaced by "REQUIRE_GLOBAL(foo)",
and DFHack will refuse to load the plugin if df::global::foo is NULL
2014-12-02 21:32:04 -05:00
2d7ea52c40
Clarify autolabor initialization failure
2014-12-02 17:58:30 -05:00
e3c13fc555
Add gelding to autolabor and manipulator
2014-12-02 17:30:16 -05:00
7859da7d77
Update stonesense.
2014-11-30 12:31:29 -05:00
921f0dd06a
Merge remote-tracking branch 'quietust/develop' into develop
2014-11-30 11:31:59 -05:00
9dbe639919
Merge pull request #402 from Ramblurr/stockpiles
...
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
a6ae6d4c28
autolabor: Fix compile on Windows.
...
VC10 wants an explicit return type for lambdas.
2014-11-28 00:55:26 +01:00
794e1ee6f0
autolabor: Document and improve the talent pool parameter.
2014-11-27 21:13:20 +01:00
cb6d4da2f2
stockpules: fix protobuf-lite support
...
Looks like we lost more than just TextFormat when we lost full protobuf
support. Copied these two serialization functions over.
2014-11-27 16:36:42 +01:00
8b1b32a499
autolabor: Add a talent pool parameter.
2014-11-27 15:56:14 +01:00
d352d0f42d
stockpiles: remove dependency on full protobuf
2014-11-27 14:23:54 +01:00
de919050b1
Revert "install the full protobuf library"
...
This reverts commit 443a9676e1
2014-11-27 13:40:11 +01:00
7cbb1ed043
Revert "use full protobuf library project wide"
...
This reverts commit f100d30f56
2014-11-27 13:39:30 +01:00
b6f5bcb7dc
stockpiles: fix compilation on windows
...
VS2010 only supports a subset of C++11
2014-11-27 13:28:17 +01:00
445640f80c
Allow commands invoked through command-prompt to access selected items/units/buildings
...
Fixes #273
2014-11-25 20:25:31 -05:00
84d24ca13f
Fix Hold->HoldTerrain, also use a proper fix for Attack
2014-11-25 11:30:25 -06:00
f100d30f56
use full protobuf library project wide
...
since plugins are using full protobuf, there is no reason
for everything not to. this removes the need to ship both the full
protobuf lib and the protobuf-lite lib.
2014-11-25 10:48:51 +01:00
063b669f6b
stockpiles: cleanup output and add docs
2014-11-22 18:57:56 +01:00
00c1676744
stockpiles: correct typo
2014-11-22 18:54:22 +01:00
e599f4b1e1
stockpiles: more user documentation
2014-11-22 18:33:49 +01:00
f2d4bf53bd
stockpiles: fix empty list crash
...
I was clear()ing all empty stockpile index vectors , but DF expects them
to be initialized with '\0' despite the fact they aren't used.
To keep DF happy and prevent segfaults, we now initialize all lists to
their appropriate sizes with a sane default value.
2014-11-22 18:33:49 +01:00
869a92dfc5
stockpiles: handle all metals and stones
2014-11-22 18:33:49 +01:00
0e8832f05d
stockpiles: overwrite existing files
2014-11-22 18:33:49 +01:00
f1ce575be3
stockpiles: animals list still shown even when disabled
2014-11-22 18:33:49 +01:00
4f2851199e
stockpiles: handle animal cages and prepared meals
2014-11-22 18:33:49 +01:00
e525b47815
stockpiles: make gem other mats more robust
2014-11-22 18:33:49 +01:00
eb3a71c739
stockpiles: fix finished goods quality
2014-11-22 18:33:48 +01:00
12b27e09bb
stockpiles: handle furniture sand_bags field
2014-11-22 18:33:48 +01:00
98a1278128
stockpiles: fix quality unserialization
2014-11-22 18:33:48 +01:00
cc1e4d16a2
stockpiles: allow loading without file extension
2014-11-22 18:33:48 +01:00
e66732f731
stockpiles: add missing protobuf field
2014-11-22 18:33:48 +01:00
79c65e0fcf
stockpiles: fix male/female creature mat lookups
2014-11-22 18:33:48 +01:00
44af084e8e
stockpiles: import from disk and write to memory
2014-11-22 18:33:48 +01:00
543a88d03d
stockpiles: pass correct filename
2014-11-22 18:33:48 +01:00
c251aeabe3
stockpiles: add optional debug output
2014-11-22 18:33:48 +01:00
86ba81a3a9
stockpiles: format with ANSI style and 4 spaces
2014-11-22 18:33:48 +01:00
a4d19070e8
stockpiles: write some documentation
2014-11-22 18:33:48 +01:00
f7ed821ef9
stockpiles: serialization complete
...
* working file import/export
2014-11-22 18:33:48 +01:00
224a19295d
stockpiles: serialize through weapons+trap components
...
* generalize itemdefs
2014-11-22 18:33:48 +01:00
25f6c440d8
stockpiles: serialize through cloth
2014-11-22 18:33:47 +01:00
d74ac1b3a6
stockpiles: serialize through leather
...
* more code reuse!
2014-11-22 18:33:47 +01:00
e863df512b
stockpiles: serialize through finished goods
...
* add stubs for remaining categories
* refactor w/ generics to reuse code
2014-11-22 18:33:47 +01:00
dc5f0fed1a
stockpiles: serialize ammo and coins
2014-11-22 18:33:47 +01:00
d167b3f385
stockpiles: basic serialization for animals - stone
2014-11-22 18:33:47 +01:00
443a9676e1
install the full protobuf library
...
required to access text_format (needed by stockpiles plugin)
2014-11-22 18:33:47 +01:00
ebb1345332
stockpiles: add settings protobuf message format
2014-11-22 18:33:47 +01:00
4922c36ada
Prevent farm-plot-select from selecting crops when no crops are listed
...
Fixes #396
2014-11-18 19:57:29 -05:00
889bd06ffc
ruby: fix windows platform detection
2014-11-16 13:00:38 +01:00
9fd6e9f03c
Expand dwarfmonitor weather indicator
2014-11-15 17:29:19 -05:00
bc73319333
Make rain indicator LIGHTBLUE for better visibility
2014-11-15 16:39:19 -05:00
9b0d0eba45
Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins
2014-11-15 16:36:35 -05:00
4513fa4ab2
Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins
2014-11-15 16:34:59 -05:00
61fa2fbda0
Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins
...
Conflicts:
NEWS
plugins/CMakeLists.txt
plugins/automelt.cpp
2014-11-15 16:31:51 -05:00
f7fcb342ed
Fix buildingplan compiling with GCC
2014-11-15 16:21:47 -05:00
578ac08999
Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins
2014-11-15 16:18:00 -05:00
3c1e07252b
Update autotrade stockpile controls
2014-11-15 16:16:32 -05:00
d62305b69e
Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins
...
Conflicts:
plugins/autotrade.cpp
2014-11-15 15:56:44 -05:00
3021fa47db
Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
...
Conflicts:
NEWS
2014-11-15 15:07:20 -05:00
8042c5d342
ruby: load arch-specific ruby-autogen
2014-11-14 12:49:08 +01:00
696380e749
ruby: distinguish ruby-autogen.rb name based on architecture
2014-11-14 12:47:42 +01:00
e2229f6a6a
ruby: remove DL_RUBY cmake option
2014-11-14 12:38:24 +01:00
be1d411b83
Add missing <functional> include for std::greater
2014-11-09 11:19:51 +01:00
1b0a2ecb8a
Merge remote-tracking branch 'eswald/tradescreen' into develop
...
Conflicts:
NEWS
2014-11-09 00:42:50 -05:00
c9cf94128e
Merge pull request #376 from lethosor/mousequery-z-level-fix
...
Fix selection behavior of mousequery on lowest z-level
2014-11-09 00:37:46 -05:00
267d0837ad
Merge pull request #381 from lethosor/update-cmakelists
...
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
7929d44030
Merge pull request #382 from PeridexisErrant/autolabor-fixes
...
Autolabor fixes
2014-11-09 00:33:46 -05:00
8e492b1669
Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
...
Make dwarfmonitor compile for 0.40.14+
2014-11-09 00:33:14 -05:00
f069676fc2
Fix automaterial/box-select cursor color
...
Only use a dark green cursor when actually building a construction
2014-11-08 19:05:45 -05:00
2484f89542
Update dwarfmonitor's happiness display
2014-11-08 15:08:56 -05:00
04ceb64bad
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
...
Conflicts:
NEWS
2014-11-08 14:36:20 -05:00
195ccf4bc8
Fix beekeeping, enable help message
...
Plugins should now be enabled with "enable autolabor". The beekeeping
bug was fixed in DF0.40.07, so autolabor can set multiple beekeepers
again.
2014-11-08 11:45:20 +11:00
ec580cdfa5
Re-enable rendermax in CMakeLists.txt
2014-11-07 16:43:50 -05:00
8ac9748700
Switching fast-trade Shift-Up to move before marking
...
This makes it undo Shift-Down, instead of mirroring it, which works much better when you've gone too far down the list.
2014-11-06 23:06:17 -07:00
46ebeaa722
Adding Shift-Up to the fast-trade tweak.
2014-11-06 22:22:02 -07:00
7fb82131c7
Switching fast-trade from Shift-Enter to Shift-Down
...
Technically, from SELECT_ALL to CURSOR_DOWN_FAST, to avoid blocking the new native Select All functionality.
As a bonus, the new key repeats as you hold it down.
2014-11-06 22:14:00 -07:00
777b2f6416
Moving trade screen search options to match the new column size
2014-11-06 22:05:05 -07:00
db7bc8c5c8
Removing autotrade's version reporting.
...
It's built with DFHack itself now, so the global version is more accurate than the plugin-specific version, which hasn't been consistently getting incremented.
2014-11-06 21:53:00 -07:00
2ebc318daa
Removing autotrade's obsolete Mark All
2014-11-06 21:47:14 -07:00
e9e8b83656
Update stonesense.
2014-11-05 20:57:57 -05:00
b81346fa21
Merge pull request #349 from lethosor/tweak-reorganization
...
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
5232bffb53
farm-plot-select: Actually check for crop validity
2014-11-02 12:21:51 -05:00
29d6bba669
Fix trackstop ambiguity complaints, update df-structures.
2014-11-02 11:55:01 -05:00
14b947837c
Merge remote-tracking branch 'origin/develop' into tweak-reorganization
...
Conflicts:
NEWS
Readme.html
plugins/tweak/tweak.cpp
2014-11-02 11:40:53 -05:00
87443035a9
Merge remote-tracking branch 'quietust/develop' into develop
...
Conflicts:
plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
4ccfb07a54
Merge pull request #350 from hobotron-df/fastdwarf-attack-speed
...
Fixes for fastdwarf combat speed and attack retargeting.
2014-11-02 03:37:55 -05:00
bfac2b97cc
Merge pull request #352 from eswald/trackstop
...
New trackstop plugin
2014-11-02 03:34:22 -05:00
82fb533176
Merge pull request #353 from eswald/autotrade-bugfix
...
Autotrade bugfix: Mark All now unmarks bin contents.
2014-11-02 03:33:28 -05:00
6c356b5ae9
Merge pull request #359 from lethosor/embark-tools-oo-pr
...
embark-tools cleanup
2014-11-02 03:30:38 -05:00
0fa2cab5ac
Merge pull request #360 from eswald/automelt
...
Faster automelt
2014-11-02 03:29:01 -05:00
0fd15cc1e4
Merge pull request #365 from eswald/stable-sorting
...
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
49939ccb9c
Merge pull request #369 from warmist/fix-rendermax
...
Update rendermax
2014-11-02 03:25:04 -05:00
bad923130c
Manipulator - remove minimum width for Labors column, since it triggered the "should never happen" case upon extending the first column from 4 to 6
2014-11-01 11:24:05 -05:00
7c92f4abaa
Seems I misread the code from 0.34.11 - it switches against rand(2), not rand(3)
2014-10-31 13:47:04 -05:00
f08a32f4e2
Update Manipulator to display stress level instead of happiness
2014-10-31 13:33:35 -05:00
ed225de365
Update strangemood to check stress level for fell/macabre moods
2014-10-31 13:33:18 -05:00
f683395cae
Comment out more of military-training tweak, which no longer compiles
2014-10-31 13:33:04 -05:00
d05f249619
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-10-31 13:32:49 -05:00
72654e602a
Merge pull request #355 from lethosor/patch-6
...
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
04ec2c9932
Update version to v0.40.14 and hack things so they compile.
...
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
ac73c0eeba
Allowing non-labor skills to sort stably.
2014-10-21 22:49:50 -06:00
169da1342d
Switching Dwarf Manipulator to a stable sort.
...
This means, for example, that when you sort by one skill, then by a second, dwarves with the first skill but not the second will still be grouped together.
2014-10-21 22:43:56 -06:00
f3626c1004
embark-tools cleanup
...
Fix #358 : Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
0fd3f3dbf4
Update digFlood documentation to mention onLoad(World).init
...
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
95dd009a15
Restoring automelt for items in bins.
...
The stockpile iterator yields bins, but not their contents. Should other containers be checked, too?
2014-10-05 17:57:57 -06:00
aafa3a5f91
Expanding on the rollers menu.
...
As requested by fricy.
2014-10-02 22:00:40 -06:00
d2fb51f99e
New tweak: nestbox-color
2014-10-01 20:14:41 -04:00
2e80c6053c
Autotrade bugfix: Mark All now unmarks bin contents.
...
This prevents a form of cheating, because they already get traded with the bin itself, so their value had been counted twice.
However, the search plugin still enables this kind of cheating...
2014-09-29 21:37:05 -06:00
4af9b7a054
Checking for more required variables.
...
Trying to use trackstop without ui or world results in a hard crash.
2014-09-28 21:34:42 -06:00
0fad63bba7
New trackstop plugin.
...
Simply adds a menu to track stops, showing and changing friction and dump direction.
2014-09-28 18:24:07 -06:00
425d81ea2d
New tweak: civ-view-agreement
2014-09-28 13:13:53 -04:00
da72848b0b
Fixes for fastdwarf combat speed and attack retargeting.
2014-09-27 19:47:27 -05:00
d34b22b2c2
New tweak: farm-plot-select
2014-09-27 19:56:31 -04:00
999d265d50
New tweak: import-priority-category
2014-09-27 18:14:25 -04:00
aeb9ea54ec
'tweak' plugin cleanup/reorganization
...
* Removed confirm-embark, stable-temp, patrol-duty
* Split (enabled) tweaks into separate files
* New tweak: manager-quantity
2014-09-27 17:01:32 -04:00
e46a27c8a4
Switching automelt to the stockpile iterator.
2014-09-27 11:07:26 -06:00
eed684a8df
fix superdwarf
2014-09-26 11:39:05 +02:00
0766538ecd
ruby: add df.print_color(col, string)
2014-09-25 15:53:03 +02:00
1a38c72763
ruby: add stl-fstream to codegen
2014-09-25 13:19:00 +02:00
beb5216640
Fix selection behavior of mousequery on lowest z-level
2014-09-24 17:48:49 -04:00
c894346639
ruby: call RUBY_INIT_STACK
2014-09-19 21:38:22 +02:00
d75c01b0ff
merge git://github.com/hobotron-df/dfhack
2014-09-19 21:37:28 +02:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
c927f0fa3c
Merge remote-tracking branch 'lethosor/patch-5'
2014-09-16 17:25:28 -04:00
fde49176fe
Merge remote-tracking branch 'lethosor/update-search-keys'
2014-09-16 17:23:45 -04:00
040acd166b
Merge remote-tracking branch 'eswald/automelt'
...
Conflicts:
dfhack.init-example
2014-09-16 17:20:50 -04:00
a225984bc5
Merge remote-tracking branch 'eswald/hotkeys'
2014-09-16 17:11:15 -04:00
5a1d88307f
Merge remote-tracking branch 'eswald/stockpile-iterator'
2014-09-16 17:05:02 -04:00
1ea1b50790
job_material_category -> dfhack_material_category
...
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
991fb3cea2
Change search key from 's' to 'q' on unit/job lists
...
Avoids a conflict with the "suspend job" option (added in 0.40.12)
2014-09-10 16:59:09 -04:00
e76b8c4b6b
Merging automelt hotkey into autotrade line when links intrude.
...
The new interface looks significantly different, but only when there are too many stockpile links to show the lines in their usual places.
The difference between bright green and grey should be obvious most of the time, right?
2014-09-09 21:08:38 -06:00
8bc2f02aee
Moving the automelt hotkey next to autotrade.
2014-09-09 20:51:58 -06:00
757491f112
Add automelt plugin
2014-09-09 20:31:55 -06:00
07de1ce3f6
Add hotkeys plugin
2014-09-08 22:42:04 -06:00
4800794ba6
Merge remote-tracking branch 'dfhack/develop'
2014-09-08 13:23:28 -04:00
f5039b37b8
Merge remote-tracking branch 'lethosor/osx-plug-dylib'
...
Conflicts:
NEWS
2014-09-08 13:14:28 -04:00
5152e1f13e
Merge pull request #316 from eswald/trade-search
...
Removing new trade hotkeys while a counteroffer is displayed.
2014-09-08 13:12:31 -04:00
52d0f1c3f6
Merge remote-tracking branch 'lethosor/autotrade-usage-newline'
2014-09-08 13:00:11 -04:00
0f311a7606
Removing dead duplicate code.
2014-09-07 15:11:11 -06:00
83b1317173
Switching stockflow to the internal getStockpileContents.
...
This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
2014-09-07 15:07:57 -06:00
1ce07c063d
Canonical way to find the stockpile by id.
2014-09-07 14:55:34 -06:00
3c58bd3948
Switching autotrade to use StockpileIterator.
...
This should speed it up a bit, and prevents it from marking a stream of empty bins.
2014-09-07 14:03:51 -06:00
a45438d172
Fix 3dveins crashing because of trees and malformed biome data.
...
The sky in the latest versions has uninitialized biome data, which
made the plugin crash on invalid vector index access. Also, trees
on ground may still have wrong geolayer inside them like obsidian.
2014-09-05 15:11:13 +04:00
7143479253
Moving trade screen search dimming to the proper row.
...
Unfortunately, this now means it hits one of the search clear lines when both are active.
2014-09-04 23:28:59 -06:00
aaa8a829d1
Removing new trade hotkeys while a counteroffer is displayed.
...
Fixes http://www.bay12forums.com/smf/index.php?topic=126076.1140
It's tempting to use has_offer for this effect, but that flag remains true after hitting Enter to consider the offer.
Relies on a structure update: https://github.com/DFHack/df-structures/pull/18
2014-09-04 21:08:46 -06:00
cf06dc3503
Update to 0.40.11, fix a few devel plugins to build again
2014-09-04 08:26:45 -05:00
92946e5fbc
Minor reveal fix - only preallocate unreveal data for existing map blocks
2014-08-31 11:43:19 -05:00
9aee476c6e
Make plugins use ".plug.dylib" extension on OS X
2014-08-30 09:21:19 -04:00
76ecc9b347
Add newline to autotrade usage
...
Fixes #304
2014-08-30 08:47:37 -04:00
e115a392f7
Added binary tarballs for ruby dependencies to work around cmake download failures against github ( http://cloud.github.com/downloads/jjyg/dfhack/ )
2014-08-29 19:52:23 -05:00
948fbb48f6
Updated stonesense
2014-08-29 18:45:25 +05:30
b98b6f61d2
Merge branch 'remote_reader' of github.com:JapaMala/dfhack into develop
2014-08-29 18:39:57 +05:30
96a0bd0de0
Added growth locations to the fake growth materials
2014-08-29 17:08:21 +05:30
79b572ba65
Update stonesense.
2014-08-29 05:26:07 -04:00
5c0588dd34
Merge pull request #299 from eswald/stockflow-40
...
Stockflow Repairs
2014-08-28 14:56:04 -05:00
f0c52a9a73
Merge pull request #289 from eswald/trade-search
...
Moving trade screen search lines
2014-08-28 14:54:00 -05:00
5ccd7dbb8f
Merge pull request #296 from lethosor/embark-tools-render
...
embark-tools fix
2014-08-28 14:53:22 -05:00
8bfc0e93ec
Merge pull request #298 from eswald/stockpile-lines
...
Stockpile lines
2014-08-28 14:53:09 -05:00
6d9d616fff
Prioritizing search hooks on the trade screen.
...
The autotrade plugin has been intercepting the m/u/M/U keys if enabled after enabling the search plugin. An explicit priority makes the search plugin always accept those keys while typing in a search line.
2014-08-25 21:18:52 -06:00
17a23796c8
Fix embark-tools render() behavior
2014-08-25 13:08:11 -04:00
632b0b85bd
Speeding up the stockpile item count.
...
kr0pper reports two orders of magnitude speed improvement for check_pile() by using the map tile item cache.
2014-08-23 17:49:03 -06:00
8495bddc2d
Removing an obsolete workaround
2014-08-23 17:46:35 -06:00
eb221e1165
Fix some blatant bugs in somebody else's additions to showmood
2014-08-21 15:23:05 -05:00
33f4f9fdcb
Update cleanmap to optionally also clean up item spatters such as leaves
2014-08-20 10:54:00 -05:00
ae80ca9ec9
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-08-20 10:32:59 -05:00
6f77372367
No longer overwrites stockpile links
...
The new lines added to the stockpile 'q' menu are usually drawn at the bottom, where the last few Give/Take links are written. Now, they notice when they would overwrite one of those links, and move somewhere else. The 'Done' line can now be overwritten by stockflow, but that hint isn't necessary for experienced players.
2014-08-19 14:19:13 -06:00
c95ad05a7e
Switching new stockpile menu keys from green to red.
2014-08-17 16:01:42 -06:00
71098b6108
Moving the stocks stockpile hotkey to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:45:30 -06:00
034e34f8b6
Moving the autotrade hotkey to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:54 -06:00
9f17966f87
Moving stockflow hotkeys to the bottom of the menu.
...
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:02 -06:00
2b59f0edca
Switching Mark/Unmark all hotkeys to red
...
Following the policy described in the Readme.
2014-08-17 12:38:13 -06:00
6060da5903
Moving Mark/Unmark all in the trade screen
...
These are in a different plugin, but affect the same interface.
2014-08-17 12:27:57 -06:00
6ee29bfa11
Moving trade screen search lines
...
Now that this screen uses the window's full height, the hard-coded line is no longer appropriate.
2014-08-17 10:59:33 -06:00
59e6607d8c
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2014-08-16 10:26:24 -04:00
f04b93210a
Bug fixing.
...
Fixes for "tab" in hacked buildings.
2014-08-16 16:58:09 +03:00
6868cab1fe
Exposed dfhack.jobs.linkIntoWorld. Simplified eventful and gui.dwarfmode for sidebar use/creation.
2014-08-16 16:58:01 +03:00
f5d50adf0d
Removing the leaves check for stockpile acceptability.
...
That item type no longer exists in DF 0.40; such items will now always be considered properly stored by any stockpile they're on.
2014-08-15 21:41:23 -06:00
287301b682
Update autolabor to work with 0.40
2014-08-15 14:12:57 -05:00
13bffed647
Update isoworld to a commit that actually exists
2014-08-15 09:44:52 -05:00
493dd47383
Updated df-structures and isoworld
2014-08-15 19:28:03 +05:30
5add8c433d
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
...
Conflicts:
plugins/remotefortressreader.cpp
2014-08-15 19:15:00 +05:30
ebda2d8472
Fix ageItem to work correctly, and update XML
2014-08-15 08:13:15 -05:00
ce4d1db5a0
More removing unneeded fixes.
2014-08-15 04:23:54 -04:00
820839fa8d
Remove stuff that doesn't exist anymore from dfhack.init-example and documentation.
2014-08-15 03:03:25 -04:00
b2dc4bd104
autolabor doesn't load properly in windows.
2014-08-15 02:19:24 -04:00
c1ed62ad64
Merge branch 'develop' of git://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/stockflow.cpp
2014-08-14 22:49:37 -05:00
28d89db1fd
Merge pull request #275 from eswald/stockflow-40
...
Stockflow Improvements
2014-08-14 16:33:46 -05:00
cfefc23e6a
Add new labors to Manipulator
2014-08-11 15:21:24 -05:00
8a9e3d1a72
Plugin cleanup - always do "using df::global::[foo]". Also, get rid of old 0.34.11 binpatches
2014-08-11 15:07:52 -05:00
2471c4a68e
Add a new API for converting between interface_key and string characters.
...
It's necessary now that the simple linear arrangement is broken.
2014-08-11 14:23:19 +04:00
002bd5240b
Bump version to v0.40.07 and update find-offsets to new pressure plate UI.
2014-08-11 14:14:42 +04:00
0f99ea0ccb
ruby: fix spawn_liquid for 40.06
2014-08-11 01:11:46 +02:00
9d460d506e
Probably a fix to rendermax for 0.40.xx
2014-08-09 22:14:55 +03:00
36435ca8cf
Merge branch 'develop' of https://github.com/quietust/dfhack into remote_reader
...
Conflicts:
library/modules/Items.cpp
library/modules/MapCache.cpp
library/modules/Maps.cpp
library/modules/Materials.cpp
library/modules/Translation.cpp
plugins/CMakeLists.txt
2014-08-08 20:54:44 +05:30
756485c4db
Added support for getting a list of plant growths with fake material names.
2014-08-08 20:35:57 +05:30
55ebca4a7a
Plant immolate/extirpate no longer work, but create/grow are still good
2014-08-06 10:03:34 -05:00
9956b4a5ef
Update getplants, plants, and prospector, and isolate autochop
2014-08-06 09:31:42 -05:00
0463021823
Merge branch '0.40-plugin-updates' of github.com:lethosor/dfhack into develop
2014-08-06 08:27:29 -05:00
f34d68e567
Actual correct fix here
2014-08-05 20:28:09 -05:00
86c036b7d3
Add an extra check that was missing
2014-08-05 20:19:31 -05:00
1bcfcd36f6
Avoid buffer overrun on mouse clicks
2014-08-05 19:59:53 -05:00
fa26aa79ea
Make some plugins compile for 0.40
...
dwarfmonitor: remove StoreItemInChest, StoreItemInCabinet, ProcessPlantsBag, and BrewDrink
dig/diggingInvaders/siege-engine: update special cases for trees to handle roots/branches/trunks
2014-08-04 12:28:22 -04:00
19133ff327
Documenting the new Stockflow option.
2014-08-03 16:40:03 -06:00
1aba6a6739
Faster stockflow mode, ignoring the bookkeeper.
2014-08-03 15:14:20 -06:00
2ebebaf62f
Deleting old stockflow records.
...
Once a stockpile has been removed or abandoned, its persistent configuration is obsolete.
2014-08-03 15:07:04 -06:00
1b1475fb94
Warning about mismatched stockflow entries.
...
For the most part, mismatches should only happen if the reaction list has changed between world loads, which means either the raw files or the plugin files have been changed. For now, such entries are ignored, though in some cases it might be possible to recover a new order number by searching through the reaction list.
2014-08-03 15:04:28 -06:00
2db1c9d722
Moving the global job_types cache into the two functions that use it.
...
It's mostly an artifact of a misunderstanding, anyway.
2014-08-03 14:57:20 -06:00
1aafa206bc
Localizing a few Lua variables.
...
It seems like the globals could be localized, too, but I'm not quite sure what that would accomplish.
2014-08-02 18:08:13 -06:00
ad4d545036
Ignoring the removed job types for DF 0.40+
...
The version check allows the plugin to work with DF 0.34, just in case.
2014-08-02 17:58:36 -06:00
2928f15629
Update fastdwarf to work properly in 0.40
2014-08-01 08:45:23 -05:00
1450298484
assumed_identity -> identity
2014-07-29 16:30:22 -05:00
88dfb1faef
criminal_case -> crime
2014-07-29 16:27:16 -05:00
d6162cd189
death_info -> incident
2014-07-29 16:26:14 -05:00
bc5e0f6ad6
Made DFHack buildable. Also added plant proto definitions
2014-07-23 19:57:47 +05:30
e711605413
Some minor corrections
2014-07-21 13:26:34 -05:00
97de21357c
First pass for 0.40 compatibility; still lots left to do, but this will at least build
2014-07-21 13:18:29 -05:00
b598cbb0dd
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-07-20 16:43:00 +05:30
216019e5af
Disconnected the RemoteReader values from the DF enums.
2014-07-17 17:46:00 +05:30
48e714b65b
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
2014-07-15 17:50:11 +05:30
2d5ec9e45d
remotefortressreader can send over more info over the sockets.
2014-07-15 17:48:12 +05:30
0a16bc2e12
Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
...
Conflicts:
plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
6652074644
Delete the syndromeTrigger plugin.
2014-07-03 09:03:26 -04:00
81c87d0921
EventManager: INTERACTION event for unit interactions.
2014-07-03 04:55:12 -04:00
829ad945ea
Added a function to do a hash check on the entire fortress. It's not overly useful yet, other than benching.
2014-07-03 08:35:45 +05:30
e04ab11659
Merge branch 'develop' of github.com:DFHack/dfhack into develop
...
Conflicts:
library/xml
plugins/stonesense
2014-07-02 23:18:55 +05:30
d765de4546
Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization
2014-07-01 02:05:14 -04:00
fe875f7c02
Cleaned up eventful.lua.eventType.
2014-06-30 03:16:45 -04:00
c7636ae442
Deleted devel/printArgs because there's a script for that.
2014-06-30 02:56:07 -04:00
2894b406ac
Sorted devel CMakeList.
2014-06-30 02:54:15 -04:00
deb755fd57
Sorted the plugins CMakeList.
2014-06-30 02:51:23 -04:00
0aa2dc149f
Converted outsideOnly plugin to Lua script.
2014-06-30 02:21:58 -04:00
961d033ade
EventManager: unload event for convenience.
2014-06-29 10:03:55 -04:00
f88c176dd3
Removed autoSyndrome.
2014-06-29 06:16:52 -04:00
5e2653998c
Added rendermax to supported
...
It's stable enough and quite nice. Also one person missed it in release.
2014-06-28 16:18:04 +04:00
8e7e87ac73
Added UNIT_ATTACK event to EventManager and exposed it to Lua.
2014-06-28 02:31:34 -04:00
fc7ac9b47f
Update XML and sync plugin
2014-06-27 13:01:46 -05:00
92c4514286
Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop
2014-06-26 17:22:56 +04:00
4f9479cce5
Fixed a bug where remotefortressreader was using min_x for min_z.
2014-06-25 18:49:00 +05:30
3c8ba091f2
Disable "stable position" when site finder is active
2014-06-24 10:08:50 -04:00
9625d56384
Update Manipulator to respect entity permitted_labor settings
...
This has the effect of locking out the Alchemy labor, which is how it's
supposed to work in-game (but doesn't due to bug #6511 )
2014-06-24 08:36:36 -05:00
7313c18a2a
EventManager/eventful: added ON_REPORT event and exposed it to Lua.
2014-06-23 09:15:46 -04:00
9afc861a2a
syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly.
2014-06-23 09:14:56 -04:00
247bd212f3
Update stonesense.
2014-06-21 13:28:59 -04:00
3f717af0b7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
library/xml
2014-06-21 16:43:44 +05:30
f94fc5846d
outsideOnly: allow checking periodically in case a building was made outside and then became inside.
2014-06-20 19:48:56 -04:00
c0e6e62cea
outsideOnly: registration of buildings is now required, and you can also register buildings as inside-only.
2014-06-20 18:49:11 -04:00
12d18ca64d
Fix compile issues on windows.
2014-06-19 22:32:02 -04:00
3357718d03
Merge remote-tracking branch 'origin/develop' into 0.34.11-r5
...
Conflicts:
Readme.rst
plugins/CMakeLists.txt
2014-06-19 19:59:20 -04:00
cca605d8b4
Prevent blank lines from being stored in history
2014-06-17 17:21:30 -04:00
0c144b821d
Reimplement command-prompt history
...
Also add shift-left/right for back/forward one word
2014-06-17 17:11:45 -04:00
1684eced8a
Remove (broken) command history
...
This reverts commit cc07a373f3
2014-06-17 12:45:57 -04:00
6f74d60521
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:33:04 -04:00
b8e7c8a946
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:28:46 -04:00
ce849312c7
remotefortressreader now can send over sets of MapBlocks
2014-06-17 21:47:16 +05:30
2db73a407d
Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop
2014-06-17 10:39:26 +04:00
86131781da
Merge branch 'dev-embarktools-pr' of git://github.com/lethosor/dfhack into develop
2014-06-16 14:03:28 +04:00
f9f865cb90
Fix a compile error and signed/unsigned mismatch warnings.
2014-06-16 14:02:48 +04:00
db2d59ac77
Started work on a generic visualizer socket client plugin. Currently only sends over inorganic and creature materials, nothing else.
2014-06-15 10:10:12 +05:30
befab343a1
Add ability to auto allocate rooms to noble positions.
2014-06-15 16:19:15 +12:00
a751df4219
Allow to toggle between Profession and Squad view instead of wasting screen space with a new column
2014-06-10 22:59:28 -04:00
5999dc63da
Use setupdwarfgame field names
2014-06-10 17:30:02 -04:00
f534c91fb8
Fix screen handling
2014-06-10 12:48:46 -04:00
69c9353196
Merge branch 'develop' into tweak-confirm-embark
2014-06-10 12:43:03 -04:00
b11673e9b0
Use this instead of getCurViewscreen
2014-06-10 12:38:40 -04:00
088eff05e5
Merge branch 'develop' into dev-embarktools-pr
2014-06-10 12:08:43 -04:00
044f958551
Squad column and squad info in Dwarf Manipulator (manipulator plugin)
2014-06-09 21:58:16 -04:00
cc07a373f3
Command-prompt history
...
Creates duplicate entries occasionally
Also disabled movies
2014-06-09 19:38:21 -04:00
aafcd6c43a
Fix 4/6 behavior
2014-06-09 17:00:26 -04:00
055afafedc
command-prompt: Basic line editing
...
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -04:00
b1f73b791c
DwarfMonitor: Show current date and weather in border.
2014-06-07 15:12:19 +12:00
a1f9b1d1c4
Sync with structures change
2014-06-06 14:24:57 -05:00
c29d61dca2
Use INTERPOSE_NEXT in key_conflict
...
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
0a1d87c09f
confirm-embark: Make esc work again
2014-06-04 23:18:19 -04:00
f29d1886ff
tweak confirm-embark fixes
...
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
5f611ec48b
Add automelt plugin
2014-06-04 22:18:40 +12:00
9ddbd49e28
Add stockpile autodump functionality
2014-06-04 22:01:17 +12:00
6ec0fd6589
New tweak: confirm-embark
...
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
a7fd6c4783
Add embark-tools settings interface
2014-06-03 15:03:03 -04:00
23acf276b4
Silence warning C4800 on Windows
2014-06-03 08:58:31 -05:00
7de0b2dd39
Merge pull request #255 from quietust/develop
...
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
df244aa7a4
Disable mouse query when linking levers.
...
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
4034df3560
Fix incorrect plugin name in version check
2014-06-03 12:59:55 +04:00
63254df6dd
Fix obvious issues in stockflow.
...
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
e7292379f7
Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop
2014-06-03 12:13:56 +04:00
4831fb8a8c
Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop
2014-06-03 12:11:31 +04:00
89269f76fd
Merge remote-tracking branch 'warmist/cmd-prompt' into develop
2014-06-03 12:10:06 +04:00
f07f2e1079
Fix autotrade plugin name in version string
2014-06-02 16:05:05 +12:00
99659e7e00
cmd-prompt needs to work on ANY screen. This fixes it.
2014-05-26 18:42:42 +03:00
e483e7439f
Fix problems with NONE for item types and subtypes
2014-05-22 08:18:01 -05:00
2d778be956
Fix embark sidebar updating
2014-05-20 15:51:26 -04:00
fcb62ac7dd
sticky: Fix handling of rapid input
2014-05-19 17:43:30 -04:00
da31bab419
Display embark label on all 5 map pages
2014-05-19 16:33:17 -04:00
bb5f7b475d
Add sticky (equivalent of tweak stable-cursor)
2014-05-19 16:11:42 -04:00
02811c773c
Fix crash with child screens (e.g. saving a macro)
2014-05-19 15:53:29 -04:00
96b70a93bc
Update readme
2014-05-18 21:21:17 -04:00
6519ac1bf8
Add sand indicator and allow enabling/disabling all tools
2014-05-18 20:03:59 -04:00
0f5802af9f
Add embark-tools
...
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04:00
d1aee89491
remove space before hyphen
2014-05-18 13:01:07 -05:00
76ec3ba58c
Fix English names containing the word "the"
...
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
8cc4bea0d4
Added petcapRemover plugin.
2014-05-17 17:59:41 -04:00
f852802270
Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins
2014-05-16 21:23:34 -04:00
293a535aa4
Fix crash with mouse input in search plugin
2014-05-16 20:53:36 -04:00
9b1d393c1c
Append newline to each section of output
2014-05-15 17:30:42 -04:00
2074f7e78b
Fix handling of newline characters in command-prompt output
2014-05-15 15:51:03 -04:00
d52a07ef76
Dismiss previous command prompt before creating a new one
2014-05-14 18:56:30 -04:00
a516811bb1
Only allow 3dveins to be run in fortress mode
...
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
dbe903b5b7
Re-enable melting in stocks plugin.
2014-05-13 22:15:37 +12:00
56903b9374
Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop
2014-05-12 21:44:31 +04:00
b166f51568
Handle missing arguments to filter/paint in tiletypes
2014-05-11 14:17:56 -04:00
e829b2eea4
Fix missing newline and update Readme.html
2014-05-11 16:05:00 +04:00
ae8d630cfa
Merge remote-tracking branch 'warmist/dev-rendermax' into develop
2014-05-11 15:44:29 +04:00
a088219b3e
Fixed ALL the bugs: zooming does not crash and fullscreening also does not crash now.
2014-05-11 14:19:02 +03:00
a3d7b54b9c
Merge remote-tracking branch 'falconne/develop' into develop
2014-05-11 13:22:13 +04:00
8989c06900
Merge branch 'tweak_changes' into develop
2014-05-11 13:19:44 +04:00
43064f41e3
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-05-11 09:34:05 +05:30
4b8f68dfa9
Add a few tweaks - fix wear on cloth/leather items, disable wear on adamantine clothes
2014-05-08 14:22:45 -05:00
b6b839c802
Fix for osx to build.
2014-05-06 21:59:11 +03:00
fef296110f
Fixed friend class bug.
2014-05-06 07:17:02 +03:00
f824e7f294
stocks plugin: added more filtering and display options.
2014-05-05 16:56:40 +12:00
144eff4cf2
Clearing the center column.
...
The official order selection screen has an extra space to the left of the orders on the right-hand side.
2014-05-04 15:36:42 -06:00
4fc850445d
Magic Number Reduction: Display placement constants
2014-05-04 15:28:53 -06:00
767badbfb9
Magic number reduction: Clothing flags
...
Bone and shell are used to construct BARRED and SCALED armor/clothing items, for some reason.
2014-05-04 15:13:25 -06:00
bdb22235af
Magic number reduction: Job types
2014-05-04 15:02:12 -06:00
2d5f7e4022
Magic number reduction: Persistent storage
...
Replaces explicit indices into the ints field of Stockflow persistent storage objects with enumerated values.
2014-05-04 12:55:00 -06:00
723cfcf28e
Attempting to repair an order object leak.
...
Now frees manager_order objects in the reaction_list when the plugin is disabled or the world unloaded. However, there may still be orders leaked elsewhere.
2014-05-04 12:35:10 -06:00
e29e29d537
Updated readme, NEWS and changed where rendermax looks for it's config.
2014-05-04 21:00:16 +03:00
13584f08c5
Merge remote-tracking branch 'warmist/dev-buildings' into develop
2014-05-04 19:52:01 +04:00
1f93b8e144
getplants: add autochop function to automate woodcutting.
2014-05-04 23:43:52 +12:00
e9c7d502e2
dwarfmonitor: add screen to summarise preferences of fortress dwarfs.
2014-05-04 22:45:48 +12:00
5a3065fa80
Use shifted keys for buildingplan so as not to interfere with QuickFort.
2014-05-04 22:23:10 +12:00
cba143c447
Add workshop profile search.
2014-05-04 22:04:03 +12:00
7fd7d3d48c
mousequery: several usability improvements.
...
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
de9140336f
autotrade: adds "(Un)mark All" options to both panes of trade screen.
2014-05-03 22:56:34 +12:00
5e52bb60f0
Update uicommon.h with new common display functions
2014-05-03 21:19:46 +12:00
a14f31fbfe
Show box select dimensions in Automaterial
2014-05-03 11:44:35 +12:00
415cdad489
Make using new for allocating DF objects with vtables a compile-time error.
...
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.
This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
e4641c506f
Replace a std::string method not implemented until C++11 with a C++0x-valid substitute
2014-04-21 09:34:42 +04:00
5fb87c2ea9
Now accepts the new enable/disable commands.
2014-04-18 21:58:45 -06:00
63d256c1e9
Adjust siege engine targeting weights.
...
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
c27c38e4c0
Remove tired or hungry siege operators from duty when at peace.
...
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
fc9826389b
Account for meandering movement when predicting unit path in siege engine.
...
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
55cea36c76
Use the new API to produce combat reports for aimed siege engine attacks.
...
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
0a99bb0cae
Now works when enabled is true by default.
2014-04-13 15:23:37 -06:00
b9ed7a5cc2
Stockflow plugin v1.0
2014-04-13 15:19:03 -06:00
7aecffe0cd
Update structures and fix broken things.
2014-04-04 22:34:39 +04:00
eac126c884
ruby: use placement-new instead of hack
2014-04-01 15:12:52 +02:00
837da8ae98
Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types
2014-03-25 13:30:45 -05:00
36b069e981
Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop
2014-03-24 20:10:58 +04:00
a01939fce6
Sync structures.
2014-03-24 19:45:27 +04:00
827dd121d8
Make createitem default to the controlled unit in adventure mode.
2014-03-24 19:35:34 +04:00
8963a49414
Forbid the items shot by siege engines if the forbid ammo order is set.
...
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
4cbab2b014
Small fix that got lost in rebase
2014-03-07 20:28:07 +02:00
50963c73fa
rendermax: added adv mode lights also more proc-expensive diffuse mode.
2014-03-07 20:08:48 +02:00
b5b01ea02b
rendermax: mainly organizing
...
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
372f861010
rendermax: fixed crashes (hopefully for real this time)
2014-03-07 20:08:10 +02:00
72259c8eba
Added creature lights and item lights.
2014-03-07 20:08:08 +02:00
830d9900fb
Fixed a bug that enabled rendermax even when it was supposed to be off.
2014-03-07 20:08:08 +02:00
a3d3c34671
Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode)
2014-03-07 20:08:07 +02:00
c2db761a1b
Rendermax: made it use unordered_map instead of map.
2014-03-07 20:07:21 +02:00
5ad3a7570f
Fixed a lot of disable lights bugs
2014-03-07 20:07:21 +02:00
f34a4ce34e
Renamed lightCell to rgbf
2014-03-07 20:07:20 +02:00
ee1bad84fc
Threading rewrite.
2014-03-07 20:07:20 +02:00
b248eb3e52
Fixed broken buildings, also added floodgate functionality.
...
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
0cf5eedc2a
Fixed potential error with building getting transparent on un-powering.
2014-03-07 20:07:17 +02:00
48f855c499
Added occlusionON|occlusionOFF commands
2014-03-07 20:06:50 +02:00
360b5d2e18
Fix for gems not getting right color.
2014-03-07 20:06:50 +02:00
28985167c9
Fixed bug with buildings and added gems to material definition.
2014-03-07 20:06:49 +02:00
b12fd5a4c5
Changed sun calculation direction.
2014-03-07 20:06:46 +02:00
d8b0b82122
Added antialiased lights. They kind of suck. So I disabled them.
2014-03-07 20:06:46 +02:00
b4091b5056
Added day colors and day speed parameters.
2014-03-07 20:06:45 +02:00
70880897f6
Added sun time manipulation, updated helpstring.
2014-03-07 20:06:45 +02:00
7c0a734c97
Added building size. Removed material flags (on by default)
2014-03-07 20:06:18 +02:00
70e1320e6f
removed something I had for testing.
2014-03-07 20:06:18 +02:00
740e3ebc51
Implemented building support.
2014-03-07 20:06:16 +02:00
3433eb15fb
fixed (?) ice and made dragon blood glow a little.
2014-03-07 20:06:16 +02:00
5b0cb86278
Made the lighting engine multithreaded.
2014-03-07 20:06:15 +02:00
354ec37046
MAXIMUM SPEED UPDATE!!!!!
2014-03-07 20:06:12 +02:00
048395a2cd
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2014-03-07 20:06:12 +02:00
13228855eb
added square light volume, and automatic light radius.
2014-03-07 20:05:52 +02:00
b015149ac1
Added cmake info for the config lua.
2014-03-07 20:05:51 +02:00
0551661db2
Added more advanced sun light calculation
2014-03-07 20:05:51 +02:00
dceec6c6c7
Plantfix, viewport height fix, and fov viewport fix.
2014-03-07 20:05:47 +02:00
4ccc95bc97
Major rewrite of opacity calculation.
2014-03-07 20:05:47 +02:00
74bed5529b
Made light plugin read configuration file (rendermax.lua)
2014-03-07 20:04:02 +02:00
20d4707b00
rendermax: lights off when sleeping
2014-03-07 20:03:59 +02:00
de8a76e37f
rendermax: sunlight travels down stairs
2014-03-07 20:03:59 +02:00
4d7a7425d0
Prelimenary work on advmode
2014-03-07 20:03:56 +02:00
4abff416d9
Some performance fixes and tweaks. Opaque blocks can now emit light.
2014-03-07 20:03:56 +02:00
9a8ee755f8
rendermax: basic daylight
2014-03-07 20:03:52 +02:00
2058a822a3
rendermax: make citizen glow
2014-03-07 20:03:17 +02:00
0a413e179e
Made the low water check actually use floats.
2014-03-07 20:03:17 +02:00
31de296f31
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2014-03-07 20:03:16 +02:00
f173810e2a
Fixed skylight
2014-03-07 20:03:14 +02:00
2195c4fe28
Small fixes
2014-03-07 20:03:12 +02:00
f745de3aff
Added transparency to ice walls
2014-03-07 20:03:10 +02:00
83265efaa8
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2014-03-07 20:03:06 +02:00
ee7902c529
Fixed unload/disable crash. Added glowing plants.
2014-03-07 20:02:08 +02:00
471eb9c02d
Torches for statues, candles on the tables.
2014-03-07 20:01:19 +02:00
1c4b5c2d38
Update water a bit.
2014-03-07 20:01:18 +02:00
b3ba3b9107
Fixed non-circular light. Do not show hidden tiles.
2014-03-07 20:01:10 +02:00
f92e4c91b8
Performance improvements, added flickering cursor light.
2014-03-07 20:00:39 +02:00
14c494dbfe
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2014-03-07 19:58:32 +02:00
2fef60708d
Added some more operators to the cell color class.
2014-03-07 19:58:32 +02:00
04f2d4ea58
Made windows transmit colored light.
2014-03-07 19:58:31 +02:00
a19200fbfe
C++ version of light engine.
2014-03-07 19:58:30 +02:00
446b4b9d50
New line algo for lights
2014-03-07 19:58:28 +02:00
eb999cd0ad
Another file forgotten
2014-03-07 19:58:27 +02:00
843237d1c9
Fixed bug.
2014-03-07 19:58:27 +02:00
39da5babee
Implemented lua interface.
2014-03-07 19:58:25 +02:00
584640f12c
Added help for truecolor light testing thing. Also added colors.
2014-03-07 19:58:24 +02:00
f68852b721
Forgot to add the plugin itself. Also some improvements
2014-03-07 19:58:24 +02:00
55d845992c
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2014-03-07 19:58:23 +02:00
dec0b202ee
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2014-03-07 19:58:22 +02:00
a52451a97a
eventful: added support for custom workshops and a convenience function to interpose side panel generation
2014-03-07 19:41:50 +02:00
834350012f
building-hacks: added lua convenience function, made impassible tile fix optional.
2014-03-07 19:41:50 +02:00
b1e7356e63
Added animation and on update callback.
2014-03-07 19:41:49 +02:00
94b5961372
New plugin: building-hacks. Allows workshops to block liquids and consume mechanical power, connect to machines.
2014-03-07 19:41:49 +02:00
cec4c8cd30
Added an output stream, now response is visible in same window. Also added a way to start prompt pre-filled.
...
It's nice to bind it to e.g. ctrl-shift-o "command-prompt :lua"
2014-03-07 18:52:06 +02:00
97ae857c38
Always shatter glass items within bins thrown by a catapult.
...
The glass materials have impact strength copied from compression
strength, so the items had 1/5 chance to survive without damage.
Since glass is infinite, it makes sense to make it single-use.
2014-03-07 17:42:49 +04:00
df22f25a69
Rewrite aiming error code to account for distance and engine quality.
...
Now the error is simulated by using an approximate normal distribution.
2014-03-07 17:35:04 +04:00
ef93f2ea4c
Compute quality of siege engines and use it to extend firing range.
...
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
9827184ef7
Switch to the new random number generator class.
2014-03-07 17:34:21 +04:00
983685de8d
Squash uninitialized variable warnings.
2014-03-07 17:34:21 +04:00
41bcd52c36
Make siege engine debug markings toggleable via lua.
...
Also check that the tile actually exists to avoid crashes.
2014-03-07 17:34:04 +04:00
9576c47e18
Cmake fix
2014-03-04 19:00:12 +02:00
904808b168
Command prompt plugin with docs and readme patch.
2014-03-04 18:51:23 +02:00
dd268d43d9
Merge branch 'master' of https://github.com/jjyg/dfhack
2014-02-27 15:49:18 -06:00
5a158b21cf
Update plugins to match fixed field names in cage/civzone
2014-02-27 14:51:45 -06:00
6d0e6cf7d5
remove old unused code from when dfhack was out of process
2014-02-26 12:44:10 +01:00
5ced804312
Merge branch 'master' of https://github.com/angavrilov/dfhack
2014-02-20 12:42:57 -06:00
73a112e06c
Update tubefill to skip hollow tubes by default, and update docs
2014-02-14 11:06:33 -06:00
67b7681ba6
Fix reaction errors, make quantities more consistent
2014-02-13 11:37:04 -06:00
387cc983f9
Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack
2014-02-02 23:50:21 +01:00
c0d3e9189d
showmood: fix item count for real
2014-01-27 12:40:21 +01:00
7f411e1cbf
Merge branch 'plant'
2014-01-27 10:45:30 +01:00
56f935aea6
Add bugfix for #6420
2014-01-26 18:55:52 -06:00
5c28d7eaf6
Not enough mood tickets given out
2014-01-25 09:15:43 -06:00
f0eeba93ce
DFHack compiles under OS X now.
2014-01-25 03:21:56 -05:00
7f14e109fa
Use DF-compatible RNG for better randomness
2014-01-19 20:31:15 -06:00
89b3c7bb67
Change syntax for specifying mood type, also allow overriding mood skill
2014-01-19 20:21:41 -06:00
baf377afba
Meant to move this, not copy it
2014-01-18 22:56:56 -06:00
24fbf570e6
Add "strangemood" plugin, lets you trigger a strange mood
2014-01-18 22:45:42 -06:00
04f88ef8fb
showmood: fix count of gotten items
2014-01-05 02:29:01 +01:00
7adb6b2ee9
ruby: codegen unit.caste_tg helper
2014-01-04 15:04:56 +01:00
91a7280ac3
Need to include tool_uses.h
2014-01-03 16:42:24 -06:00
69fc2bec6d
A bit of cleanup
2013-12-27 13:01:34 -06:00
540bcc1f46
Enhance createitem, can now place items into containers or buildings
2013-12-27 12:53:33 -06:00
8917892473
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/xml
plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
5c51f7dd2a
Merge branch 'master' of git://github.com/angavrilov/dfhack
2013-11-10 14:04:48 -06:00
7ce5831257
Get rid of the std exception.
2013-11-07 11:58:11 +04:00
4d2e5b80bf
Use df::allocate here for proper compatibility with 40d and earlier
2013-11-04 14:55:31 -06:00
883d89bb68
plants: move all commands as "plant" subcommands, update NEWS/Readme
2013-11-02 18:54:29 +01:00
463bb8d498
Update plugins to use CR_WRONG_USAGE where appropriate
2013-10-30 15:58:14 -05:00
ff939e36bb
Missed parameter in plugin command init
2013-10-30 14:25:35 -05:00
b97a13fa63
Update "plants" plugin
...
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
8ccb04236f
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
2013-10-25 11:47:03 -04:00
54b45349c5
Improve pre-embark prospect using new knowledge about soil depth.
2013-10-25 14:37:37 +04:00
e4978a1da7
Relax 3dveins preconditions to account for soil quirks and volcanoes.
2013-10-25 12:51:06 +04:00
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
c409289ee4
EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
...
- fixed unregister to allow unregistering individual TICK events
- make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
a0ee74b3a5
eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code
2013-10-20 19:56:48 -04:00
e81c060627
Added EVENT_MAX just in case someone wants it.
2013-10-20 15:24:31 -04:00
d4542b32fa
eventful: removed extra EventManager::unregisterAll.
2013-10-20 15:24:04 -04:00
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
d179812c22
Small bug fix for autolabor crashing on script created creatures.
2013-10-20 21:50:22 +03:00
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
39553cfb6d
EventManager: fixed a problem with constructionHandler.
2013-10-20 14:14:02 -04:00
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
b2d2a074c8
Validate vein types in the scan phase and leave unexpected ones alone.
2013-10-20 12:33:17 +04:00
6805656dd0
Added enable/disable functionality to diggingInvaders.
2013-10-19 21:42:24 -04:00
9d3ee11349
Merge branch 'diggingInvaders' into 0.34.11-r4
...
Conflicts:
scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
0bf427c689
Added enable/disable functionality to new plugins.
2013-10-19 21:19:39 -04:00
ef9d3b1521
Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4
2013-10-19 20:28:30 -04:00
57fc0f3e89
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
library/xml
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
1bd6d5f96d
ruby: add FEATURE/ice map tile materials
2013-10-14 01:58:55 +02:00
3d7661e7e9
ruby: fix map tile material reading
2013-10-14 00:01:26 +02:00
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
5bcae49249
Implement generation of 3D veins that match the existing mineral counts.
...
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
86d0022c58
Implement reading and writing the map for 3D veins plugin.
...
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
6852adbd91
Expose new MapCache features in probe and tiletypes.
2013-10-10 12:15:50 +04:00
4ba4f90147
ruby: add support for enable/disable plugin
2013-10-07 13:58:28 +02:00
a18347608a
ruby: vectors default to int32_t
2013-10-07 13:33:21 +02:00
32a6073dad
Remove lambdas from dwarfmonitor and resume.
2013-10-03 16:30:06 +04:00
f3be0ee187
Remove the use of lambdas in buildingplan.
2013-10-02 19:55:48 +04:00
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
a487ede2b9
autodump: typo in errmsg
2013-09-23 21:28:27 +02:00
b885123d4e
Fix a crash in beehive code if bees die with yet uncollected products.
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
896cd11fe9
Track readable names of vmethod hooks for diagnostic messages.
...
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
70a2ab9141
Fix crash due to incorrect loop bounds in add-spatter.
...
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
308e7b6820
fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste
2013-08-10 01:57:11 +02:00
279c4a48dc
Started work on ramp generation, still needs work.
2013-07-22 19:05:09 +05:30
0bd627a6f6
Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same.
2013-07-21 10:28:46 +05:30
297fa86c34
follow df-structures change to drawBuilding
2013-07-07 17:40:28 +02:00
34e5716cc0
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-28 23:52:51 +03:00
647b14b471
Fixed potential error with building getting transparent on un-powering.
2013-06-28 23:51:52 +03:00
269a2680c8
Added occlusionON|occlusionOFF commands
2013-06-28 23:34:47 +03:00
102b2ed450
Fixed broken buildings, also added floodgate functionality.
2013-06-28 23:47:54 +05:30
368a326b40
Fix for gems not getting right color.
2013-06-28 17:22:24 +03:00
26d557fc68
Fixed bug with buildings and added gems to material definition.
2013-06-27 18:11:50 +03:00
e2db468d3d
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-27 16:18:46 +03:00
7c190cd3f0
Added antialiased lights. They kind of suck. So I disabled them.
2013-06-27 16:11:29 +03:00
67859ada0a
Changed sun calculation direction.
2013-06-27 02:49:18 +05:30
7c9f0fd781
Added day colors and day speed parameters.
2013-06-27 00:14:03 +03:00
e1daa16d9e
Added sun time manipulation, updated helpstring.
2013-06-26 22:05:22 +03:00
b7f28877a2
Added building size. Removed material flags (on by default)
2013-06-26 20:19:30 +03:00
d90a7bfb88
removed something I had for testing.
2013-06-26 19:26:11 +05:30
dc42fa2fa3
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-26 19:14:55 +05:30
689caa5039
Made the lighting engine multithreaded.
2013-06-26 19:12:14 +05:30
c1fef35b52
Renamed digSmart to digFlood.
2013-06-25 19:57:17 -04:00
fbbae3e900
Implemented building support.
2013-06-26 01:18:26 +03:00
1d2accbe94
fixed (?) ice and made dragon blood glow a little.
2013-06-25 22:49:52 +03:00
539abff49a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
f4923d6974
added square light volume, and automatic light radius.
2013-06-25 23:13:55 +05:30
588ca8b8dd
MAXIMUM SPEED UPDATE!!!!!
2013-06-25 20:36:53 +03:00
3957fac531
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2013-06-25 19:34:38 +03:00
57e68aaee9
Added cmake info for the config lua.
2013-06-25 16:44:44 +05:30
5265f107b0
Added more advanced sun light calculation
2013-06-25 16:33:01 +05:30
ef7abaee14
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-25 01:25:56 +03:00
87f151f441
Plantfix, viewport height fix, and fov viewport fix.
2013-06-25 01:25:38 +03:00
4d9b7bd23d
Major rewrite of opacity calculation.
2013-06-25 00:59:32 +03:00
cb767531cf
Made light plugin read configuration file (rendermax.lua)
2013-06-24 18:18:57 +03:00
8271725320
Some performance fixes and tweaks. Opaque blocks can now emit light.
2013-06-24 14:20:22 +05:30
8dcff9bc5d
Merge branch 'rendermax' of git://github.com/jjyg/dfhack
2013-06-24 10:34:03 +03:00
5a82270aa6
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-24 10:19:10 +03:00
abc9dc300e
Prelimenary work on advmode
2013-06-24 03:47:42 +03:00
19952b9139
rendermax: lights off when sleeping
2013-06-24 02:27:43 +02:00
b95683adb2
rendermax: sunlight travels down stairs
2013-06-24 02:22:30 +02:00
ec913c2c5e
Merge branch 'rendermax' of https://github.com/jjyg/dfhack
2013-06-24 05:37:59 +05:30
b8d2ceb23b
Made the low water check actually use floats.
2013-06-24 05:35:16 +05:30
1a5169c70c
Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax
2013-06-24 01:56:32 +02:00
fb5d248720
rendermax: basic daylight
2013-06-24 01:54:09 +02:00
2da136116d
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2013-06-24 05:10:01 +05:30
50073ae406
rendermax: make citizen glow
2013-06-24 00:45:45 +02:00
30697ee115
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-24 03:58:23 +05:30
a2cef2d86a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
736f9e85fc
Fixed skylight
2013-06-24 01:26:25 +03:00
8c9de79812
Small fixes
2013-06-24 00:53:39 +03:00
f5f1328678
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
fe41504952
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
3d6f4d3478
Added transparency to ice walls
2013-06-24 00:36:43 +03:00
6cd926b67e
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2013-06-24 00:10:52 +03:00
c675ca467a
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2013-06-24 02:35:03 +05:30
06915aeded
Fixed unload/disable crash. Added glowing plants.
2013-06-23 23:56:01 +03:00
82deeafe89
Torches for statues, candles on the tables.
2013-06-23 22:28:26 +03:00
0473f89fa2
Update water a bit.
2013-06-23 21:49:17 +03:00
84ed3797d4
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-23 21:46:58 +03:00
fd0c053a80
Added some more operators to the cell color class.
2013-06-24 00:14:06 +05:30
1361b38f27
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-23 21:35:13 +03:00
4f7df238ea
Fixed non-circular light. Do not show hidden tiles.
2013-06-23 21:29:03 +03:00
f415ea2100
Made windows transmit colored light.
2013-06-23 23:51:25 +05:30
cb6130066d
Performance improvements, added flickering cursor light.
2013-06-23 20:45:05 +03:00
140371a0c7
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 22:05:02 +05:30
2c49c9e83c
C++ version of light engine.
2013-06-23 19:25:42 +03:00
25ab75137b
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 15:27:04 +05:30
e3ee876a11
New line algo for lights
2013-06-23 12:20:35 +03:00
be953ba4ab
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 12:07:14 +05:30
76f4c51a29
Another file forgotten
2013-06-23 09:36:04 +03:00
bea2cd74d6
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 11:50:09 +05:30
b35ea4d10c
Fixed bug.
2013-06-23 09:19:29 +03:00
77a301db27
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 02:45:14 +05:30
4cc14641ac
Implemented lua interface.
2013-06-22 17:40:52 +03:00
906864feaa
Added help for truecolor light testing thing. Also added colors.
2013-06-22 14:14:35 +03:00
c273377284
Forgot to add the plugin itself. Also some improvements
2013-06-22 13:29:58 +03:00
ea6a264fe2
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2013-06-22 03:45:42 +03:00
ebc51f1bd3
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2013-06-21 22:47:23 +03:00
lethosor
Japa
Lethosor
Fukken-Saved
Adam Watkins
Ross Morgan-Linial
expwnent
James Logsdon
Ben Lubar
Eric Wald
Daniil Guzanov
Warmist
PeridexisErrant
scamtank
Chris Dombroski
Timothy Collett
Casey Link
expwnent
Patrick Dawson
Quietust
Yoann Guillot
expwnent
Alexander "Ace" Olofsson
expwnent
Alexander Gavrilov
hobotron-df
Anuradha Dissanayake
JapaMala
Pierre-David Bélanger
expwnent
Tareq A Khandaker