MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,889 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

3947 Commits (23b230495ede8b2a3e02ac40ba5d84b9d961c2de)

Author SHA1 Message Date
lethosor de0521e618 title-version: add to options screen 2018-06-12 16:38:53 -04:00
lethosor 40d0d946a4 autogems: avoid crash with non-workshop links, add some logging 
Also update changelog, including revflood change

Fixes #1303
 2018-06-12 12:17:04 -04:00
Pauli 8f2cf3ad26 Fix printf format warnings 2018-06-11 19:57:06 +03:00
Pauli 01abcb756e Request c++14 support from compilers 
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
 2018-06-10 23:15:33 +03:00
Quietust 8717144f14 Fix revflood bug, was revealing some tiles from below inappropriately 
When scanning floor tiles from below, don't just leave them hidden, but
skip checking neighbors as well
 2018-06-09 14:19:52 -06:00
lethosor 7e57450e78 Change buildingplan quality adjustment keys per #1284 comment, for consistency 2018-06-08 22:25:56 -04:00
lethosor c4692b1c8d Merge remote-tracking branch 'TotallyGatsby/buildingplanmax' into develop 2018-06-08 22:07:54 -04:00
PatrikLundell 0ec3df6022 dead/killed flags 2018-06-08 11:09:11 +02:00
PatrikLundell 654f798b83 dead/killed flags 2018-06-08 11:08:35 +02:00
lethosor 03968db344 Fix GCC warnings in 'tweak kitchen-prefs-all' and dev plugins 2018-06-01 10:02:38 -04:00
lethosor f57327e7c8 Fix periodic events in several plugins 
Also stop running buildingplan/fortplan while loading a world, and stop running
autogems while paused

Fixes #1286
 2018-05-29 23:24:02 -04:00
Vitaly Pronkin 06b9dc0c1c remove trailing spaces 2018-05-25 12:43:30 +12:00
Vitaly Pronkin a44f5b57cb don't need this 2018-05-25 01:34:57 +12:00
Vitaly Pronkin 0217916568 mousequery plugin with TWBT modifications 2018-05-25 01:07:12 +12:00
lethosor e206a6d88b mousequery: leave menus safely, without looping 
Fixes #1285
 2018-05-22 16:37:44 -04:00
lethosor 5f81cac3b7 dwarfmonitor.lua: use dmerror() consistently 2018-05-21 21:23:52 -04:00
Phillip Spiess 3e54a136fd Use two keys for min/max 2018-05-20 20:50:42 -07:00
Phillip Spiess 385ac3f9f5 Add 'Max Quality' setting to buildingplan 2018-05-20 14:36:50 -07:00
lethosor 50a863a48e Fix Kitchen.h include (case-sensitive) 2018-05-17 20:11:46 -04:00
lethosor b551e70ffa prospector: Avoid crashing due to invalid vein materials 
Fixes #1276, ref #1277
 2018-05-17 19:56:48 -04:00
lethosor 759ba5c420 New tweak: kitchen-prefs-all 
Options to toggle brew/cook for all listed items

Also fixed kitchen lua docs and moved kitchen search option
 2018-05-17 19:47:56 -04:00
lethosor 17ba492992 Add some exclusion functions to Kitchen module, expose to Lua, fix build 2018-05-17 19:34:03 -04:00
lethosor fa8a2fa670 Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-05-17 00:12:59 -04:00
lethosor 79a0794658 Add kitchen preferences search 2018-05-17 00:11:52 -04:00
Japa b6c6b4a8a0
Merge pull request #1252 from JapaMala/remote_reader 
Bump RFR version number.
 2018-05-17 07:48:18 +05:30
lethosor c85274eb01 tweak max-wheelbarrow: fix conflict with building renaming 
Reported by xordae on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7762438#msg7762438
 2018-05-16 16:51:45 -04:00
lethosor 0be16d4422 New tweak: stone-status-all 
Adds an option to toggle the economic status of all stones

Also suggested by xq on IRC
 2018-05-14 22:54:20 -04:00
lethosor 914b376082 Add stone status search 
Suggested by xq on IRC
 2018-05-14 22:30:21 -04:00
Ben Lubar ee85ed4011
Remove $(NOINHERIT) from Stonesense 2018-05-14 00:56:18 -05:00
Ben Lubar f838b5695d
Remove $(NOINHERIT) which was inexplicably included in a bunch of plugins. 2018-05-14 00:12:22 -05:00
lethosor 06031bdd0e Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-05-13 13:11:29 -04:00
lethosor e2cd1fca58 Reorder dfhack-md5 GCC flags, fix another embark-assistant warning 2018-05-13 13:09:51 -04:00
Ben Lubar 586051510c
Update stonesense. 2018-05-13 10:38:59 -05:00
lethosor 016dab3990 Fix more warnings, including stonesense 2018-05-12 22:10:07 -04:00
lethosor e9ec08f419 Add Buildings::getRoomDescription(), moved from search plugin, +cleanup 2018-05-12 17:00:21 -04:00
lethosor 7d0df117ee dwarfmonitor: fix typo in function name 2018-05-12 14:59:26 -04:00
lethosor ad518faeec cursecheck: Replace setUnitNickname (older) with Units::setNickname 2018-05-12 14:59:04 -04:00
lethosor c15571caa0 Move isRouteVehicle, isSquadEquipment from workflow to Items module 2018-05-12 14:49:30 -04:00
lethosor abb903d28f command-prompt: support getSelectedPlant() 2018-05-12 13:02:52 -04:00
lethosor a34b34d3cb Move a few item functions from autotrade/stocks into DFHack::Items 2018-05-12 12:04:46 -04:00
Lethosor fbe652d7a0
Merge pull request #1265 from db48x/allow-calling-blueprint-from-lua 
this allows the blueprint plugin to be called from lua
 2018-05-11 23:52:16 -04:00
lethosor 018deec912 Fix another occasional segfault in block-labors 
Fixes #1057
 2018-05-11 22:18:26 -04:00
lethosor 9d353c1ea7 tweak block-labors: fix crash if unit is null 
Fixes #1057
 2018-05-11 10:21:05 -04:00
Ben Lubar 58636f5a27
Make 32-bit Linux builds also check for undefined symbols. 2018-05-10 11:20:19 -05:00
lethosor 8e76c612f6 Add SDL to RFR libs on Linux 2018-05-09 21:48:27 -04:00
lethosor 77ee74be50 Only require symbols to be defined in plugins 
Core uses some unresolved symbols on Linux
 2018-05-09 21:36:51 -04:00
Daniel Brooks a550c81628 update the CMakeList to link the blueprint plugin against the lua library 2018-05-09 18:25:26 -07:00
Daniel Brooks b127522992 Merge branch 'develop' into allow-calling-blueprint-from-lua 2018-05-09 12:55:17 -07:00
lethosor 2ada907420 Move stockpiles option (load/save) below stocks/autodump/etc 
Fixes #1161
 2018-05-09 10:33:41 -04:00
lethosor ead0092765 Ignore added stockpile keys when renaming stockpiles 
Fixes #1267
 2018-05-09 10:25:55 -04:00
lethosor 2a52582c1f Add Gui::inRenameBuilding 2018-05-09 10:23:05 -04:00
Daniel Brooks d15f87715e update comments 2018-05-08 13:04:14 -07:00
Daniel Brooks 554814920b this allows the blueprint plugin to be called from lua 2018-05-08 11:42:41 -07:00
lethosor 9d7feaf39d autogems: load blacklist from autogems.json 
Closes #1027
 2018-05-05 12:49:06 -04:00
lethosor 60d1c270c2 Display autogems config option 2018-05-04 23:07:21 -04:00
Josh Cooper bc32d15bea [Release] cxxrandom v2.0 
Major Revision
update v2.0
=-=-=-=-=
Native functions(exported to lua):
-GenerateEngine:  returns engine id              (args: seed)
-DestroyEngine:   destroys corresponding engine  (args: rngID)
-NewSeed          re-seeds engine                (args: rngID, seed)
-rollInt          generates random integer       (args: rngID, min, max)
-rollDouble       generates random double        (args: rngID, min, max)
-rollNormal       generates random normal[gaus.] (args: rngID, avg, stddev)
-rollBool         generates random boolean       (args: rngID, chance)
-MakeNumSequence  returns sequence id            (args: start, end)
-AddToSequence    adds a number to the sequence  (args: seqID, num)
-ShuffleSequence  shuffles the number sequence   (args: rngID, seqID)
-NextInSequence   returns the next number in seq.(args: seqID)

Lua plugin functions:
-MakeNewEngine    returns engine id              (args: seed)

Lua plugin classes:
-crng
    methods:
        -init(id, df, dist)     :: constructor
            id                           - Reference ID of engine to use in RNGenerations
            df (optional)                - bool indicating whether to destroy the Engine when the crng object is garbage collected
            dist (optional)              - lua number distribution to use
        -__gc()                 :: destructor
        -changeSeed(seed)       :: alters engine's seed value
        -setNumDistrib(distrib) :: set's the number distribution crng object should use
            distrib                      - number distribution object to use in RNGenerations
        -next()                 :: returns the next number in the distribution
        -shuffle()              :: effectively shuffles the number distribution
-normal_distribution
    methods:
        -init(avg, stddev)      :: constructor
        -next(id)               :: returns next number in the distribution
            id                           - engine ID to pass to native function
-real_distribution
    methods:
        -init(min, max)         :: constructor
        -next(id)               :: returns next number in the distribution
            id                           - engine ID to pass to native function
-int_distribution
    methods:
        -init(min, max)         :: constructor
        -next(id)               :: returns next number in the distribution
            id                           - engine ID to pass to native function
-bool_distribution
    methods:
        -init(min, max)         :: constructor
        -next(id)               :: returns next boolean in the distribution
            id                           - engine ID to pass to native function
-num_sequence
    methods:
        -init(a, b)             :: constructor
        -add(num)               :: adds num to the end of the number sequence
        -shuffle()              :: shuffles the sequence of numbers
        -next()                 :: returns next number in the sequence

Adds missing function exports.

Fixes numerous problems I won't go into
 2018-04-29 21:08:44 -07:00
Josh Cooper 23b2d5eba5 Merge branch cxxrandom 
Implements helper functions for random number generation.
Implemented using C++11 <random> library.

Exported Lua Functions:
- seedRNG(seed)
- rollInt(min, max)
- rollDouble(min, max)
- rollNormal(mean, std_deviation)
- rollBool(chance_for_true)
- resetIndexRolls(string, array_length)  --String identifies the instance of SimpleNumDistribution to reset
- rollIndex(string, array_length)        --String identifies the instance of SimpleNumDistribution to use
                                         --(Shuffles a vector of indices, Next() increments through then reshuffles when end() is reached)

 On branch cxxrandom-rel
 Changes to be committed:
   modified:   plugins/CMakeLists.txt
   new file:   plugins/cxxrandom.cpp
   new file:   plugins/lua/cxxrandom.lua

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Squashed commit of the following:

commit 3a7ef70d45f3e0c2fe367141dd0349dddaaff60d
Merge: fd9f1982 7aa0608c
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Fri Dec 22 22:17:27 2017 -0800

    Merge remote-tracking branch 'origin/temp' into cxxrandom

commit 7aa0608cb85dcf82686193db7a6e9d1318f5f2a5
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Thu Dec 21 21:43:35 2017 -0800

    Revises cxxrandom plugin

    New functions:
    - seedRNG(ushort seed)
        --lua exported
    - GetDistribContainer()
        --internal singleton
    - RNG()
        --internal singleton

    Summary:
    - Removed class CXXRNG
        --Refactored functions that used CXXRNG

     Changes to be committed:
            modified:   plugins/cxxrandom.cpp

commit b42979818a01c1121eace7b1ac14676f5ad5d8b2
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Wed Dec 20 13:21:49 2017 -0800

    Fixes plugin_init()

    Misread the lines indicated by lethosor to be excluded, had broken the plugin in the process.
     Changes to be committed:
    	modified:   plugins/cxxrandom.cpp

commit 753a00a14d9e6519d299638e014abf30509940af
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Wed Dec 20 12:36:17 2017 -0800

    Cleans up cxxrandom.cpp

    DFHack contributions specifies:
    -spaces instead of tabs, so tabs were converted.
    -C++ headers before dfhack stuff, so it was done

    *Also added author name, creation date, and last updated date.

     Changes to be committed:
    	modified:   plugins/cxxrandom.cpp

commit 498ebe4b8fdccc01ac1f169269f3093c830a8a10
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Tue Dec 19 22:51:58 2017 -0800

    Updates cxxrandom, fixes instance leak

    deleted header
    moved definition to cpp file #lethosor

    fixed singleton instance, no longer a pointer
    commented out dfhack commands, now only init/shutdown and exported lua functions

    	modified:   cxxrandom.cpp
    	deleted:    cxxrandom.h

commit 821044bef2a0201d0d74192e445c7b29766b42a1
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Sun Dec 17 04:01:11 2017 -0800

    Fixes RollIndex and Renames RollNormal

    Renamed the Normal Distribution RNG function to fit the standard.
    Now named RollNormal(m,s)

    Fixed some wonky white space in the lua macro export block.

    Fixed a stupid mistake with the RollIndex output. (it was outputting 0's)

    Updated usage details.

     Changes to be committed:
    	modified:   plugins/cxxrandom.cpp

commit 1536f43d137b6bc55d55759b43bdccf6ff429b33
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Fri Dec 15 08:50:08 2017 -0800

    Fixes/Improves cxxrandom

    Modified return types
    Corrected index distribution code

commit 8629c7e1509522cb0cc4b649914b90d033cb4763
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Thu Dec 14 19:02:29 2017 -0800

    Implements SimpleNumDistribution

    Exported additional functions to lua.
    Functions allow the generation of random 0-N index values.
    Generation promises all unique values [0,N] will be returned once each when generation is run N times.

     On branch cxxrandom
     Changes to be committed:
    	modified:   plugins/cxxrandom.cpp
    	modified:   plugins/cxxrandom.h

commit f035f3d20415790542cf83e5e696261661d911f3
Author: Josh Cooper <cooper.s.josh@gmail.com>
Date:   Wed Dec 13 23:55:39 2017 -0800

    Implements cxxrandom

    cxxrandom was implemented using a singleton.
    This singleton provides an interface for generating uniform numbers, or numbers in a normal distribution, and also booleans(given the probability for the true outcome)
    The singleton interface is wrapped in functions which are exposed for lua usage.

    Integrated into plugins/CMakeLists.txt

     On branch dev
     Changes to be committed:
    	modified:   CMakeLists.txt
    	new file:   cxxrandom.cpp
    	new file:   cxxrandom.h
    	new file:   lua/cxxrandom.lua
 2018-04-29 21:08:44 -07:00
lethosor 5cd8aa0458 Update downloads to 0.44.09 2018-04-19 12:35:00 -04:00
Japa 0ea35a6e93 Merge remote-tracking branch 'lethsor/master' into remote_reader 2018-04-11 18:28:41 +05:30
Ben Lubar f9ad71f682
Fix fencepost error in autolabor/autohauler/labormanager. 
https://github.com/DFHack/dfhack/pull/1253#pullrequestreview-110903215
 2018-04-10 13:29:00 -05:00
Ben Lubar afc2c476bb
Fix remaining warnings on Windows. 2018-04-06 21:22:48 -05:00
Ben Lubar 67de61a1fe
Fix GCC warnings in stonesense. 2018-04-06 18:18:48 -05:00
Ben Lubar 1dd6625270
Fix remaining warnings in supported plugins 2018-04-06 14:17:34 -05:00
Ben Lubar a7dfacd1c5
Fix warnings in supported plugins. 2018-04-06 01:25:21 -05:00
Ben Lubar f3038fef09
Mark static functions in uicommon as "static inline" to remove the warning if they are not used. 2018-04-05 16:51:10 -05:00
Ben Lubar 7aee061258
Ignore warnings in plugin protobufs. 2018-04-05 16:50:28 -05:00
Ben Lubar a37df92656
[labormanager] fix warning about non-virtual destructor in jlfunc 2018-04-05 16:04:14 -05:00
Ben Lubar 91930a618f
[dwarfvet] Fix infinite loop if an animal is not accepted at a hospital. 2018-04-05 15:01:50 -05:00
lethosor 1badadf535 search: fix 4/6 keys in unit screen 2018-04-05 10:08:07 -04:00
lethosor 868c032578 liquids: initialize range dimensions 2018-04-05 02:19:04 -04:00
lethosor e9457b9f65 liquids: use unique_ptr properly 2018-04-05 02:15:32 -04:00
lethosor 996306560b Merge remote-tracking branches 'ab9rf/digtype-1243' and 'ab9rf/labormanager-map-check-bug' into develop 2018-04-02 00:56:33 -04:00
Japa d369f8be67 Bump version number. 2018-03-26 19:07:04 +05:30
Kelly Kinkade b8de7d4cf8 check for tile material == MINERAL in digtype (#1243) 2018-03-20 01:44:10 -05:00
Kelly Kinkade 81c9c8cdfe Avoid crashing labormanager if map square on lowest level is designated+hidden (#1240) 2018-03-20 00:55:17 -05:00
lethosor 3a2fc6f65f Update stonesense 2018-03-14 09:40:21 -04:00
Lethosor 9b6b73b1d2
Merge pull request #1232 from JapaMala/remote_reader 
Remote reader
 2018-03-14 09:31:56 -04:00
lethosor 02569b1dac Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-03-14 09:29:35 -04:00
lethosor 40d3b9b782 embark-assistant: fix copy-paste error, update docs (#1231) 2018-03-14 09:28:24 -04:00
lethosor 1e7a38f0b1 Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2018-03-14 09:24:47 -04:00
Japa 4d74f66b64 Merge remote-tracking branch 'DFHack/develop' into remote_reader 2018-03-14 16:18:03 +05:30
Japa 09bc1c3169 add ocean waves to RFR 2018-03-14 16:08:37 +05:30
Ben Lubar 40654954a1
Partial preparation for 0.44.07-alpha1. 
Still need to write release notes and add tags.
 2018-03-13 15:49:42 -05:00
lethosor ad57037711 Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop 2018-03-10 17:02:34 -05:00
lethosor db95796d4c Many build fixes 2018-03-10 16:53:45 -05:00
Japa a810960bde Support spiderwebs and add a fake flow type for campfires. 2018-03-10 21:02:28 +05:30
Ben Lubar acd4adc7cc
Fix CMake warning about CMP0022 policy being set as "OLD". 2018-03-08 02:28:28 -06:00
Japa 3e7da4d5f2 FIx wrong material being sent with item flows. 2018-03-06 22:37:26 +05:30
Japa c3f931652d Send item cloud info properly. 2018-03-06 09:44:21 +05:30
Japa c765e12254 Store tool names in RFR 2018-03-05 19:00:18 +05:30
Japa Mala Illo ebf9651896 Include Materials in flows. 2018-03-04 02:41:40 +05:30
Japa Mala Illo 894f6c232b actually copy flows with the block this time. 2018-03-03 12:48:09 +05:30
Japa Mala Illo 3f26d4fe09 Add flows to RFR 2018-03-03 11:41:58 +05:30
PatrikLundell ef24da0cd3 Key references on overlay as well 2018-02-27 21:06:07 +01:00
Japa 490fbd8b26 send instrument description using UTF8 2018-02-27 21:18:15 +05:30
Japa 65e549848d fix some crashes in the new instrument reader code. 2018-02-27 21:01:38 +05:30
Japa d758104f5e update stonesense for RFR protos 2018-02-27 20:24:32 +05:30
Japa 265e229d61 Send all relavent generated instruement information over RFR 2018-02-27 19:58:07 +05:30
PatrikLundell 578d6666eb Addressed request. Improved profile saving 2018-02-27 10:46:06 +01:00
PatrikLundell 7705eada5a Added magma/candy search + profile save/load. 2018-02-26 18:31:33 +01:00
PatrikLundell 2277c4ee4e Corrected reanimation detection 2018-02-25 10:28:38 +01:00
Lethosor 800dde360d
Merge pull request #1223 from JapaMala/remote_control 
Remote control
 2018-02-21 23:04:53 -05:00
Ben Lubar 9f9d90c2ef
Fix labormanager never assigning dwarves to fill ponds, making irrigation very difficult. 2018-02-21 18:46:21 -06:00
Japa 778a1667dc ...also do it for images. 2018-02-21 22:31:39 +05:30
Japa 8c20d178b5 Include plant type with plant items. 2018-02-21 22:27:04 +05:30
Japa 1c97f58340 Merge remote-tracking branch 'DFHack/develop' into remote_control 2018-02-21 21:29:58 +05:30
lethosor 6e3b29930d Avoid crash in dwarfvet due to negative width/height 
Partial fix for #1227
 2018-02-16 15:12:46 -05:00
lethosor 7758fb6df5 dwarfvet: fix another log message, misc readability improvements 2018-02-16 02:32:53 -05:00
lethosor 36f4954182 Update Stonesense and build docs (fixed Allegro download) 2018-02-16 02:16:06 -05:00
lethosor 94b2ca68d8 dwarfvet: fix extra % in log message 
Mentioned in #1227
 2018-02-13 11:19:10 -05:00
Japa 60e9839f63 Merge remote-tracking branch 'DFHack/develop' into remote_control 2018-02-13 21:29:09 +05:30
Japa 18cf70a543 Update Stonesense. 2018-02-13 12:37:45 +05:30
Japa 7b19c9b8f0 Merge remote-tracking branch 'remotes/DFHack/develop' into RemoteServerUnsafe 
# Conflicts:
#	plugins/proto/RemoteFortressReader.proto
#	plugins/remotefortressreader/remotefortressreader.cpp
#	scripts
 2018-02-12 20:19:40 +05:30
lethosor 3a122d7391 Merge remote-tracking branch 'danamlund/better-fps-counter' into develop 2018-02-12 01:21:14 -05:00
lethosor 6260062d05 Add basic embark-assistant docs (closes #1226) 2018-02-11 03:08:02 -05:00
lethosor ca29cb8e6f embark-assistant: update field names, now compiles 2018-02-10 17:51:02 -05:00
lethosor ef3adbe816 Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2018-02-10 17:27:13 -05:00
lethosor 9a0befa4cb Show number of trees skipped 2018-02-10 03:03:07 -05:00
lethosor 342f193409 autochop: store skip settings in one field, fix double colon and initial load 
language_name fields default to -1, so the new settings could have been enabled
on all worlds by default.
 2018-02-10 02:07:36 -05:00
lethosor 6a758c70a8 Merge remote-tracking branch 'dtimm/develop' into develop 2018-02-10 01:47:06 -05:00
lethosor 55f5439ddf dwarfmonitor: remove unused hook, use CoreSuspendClaimer 2018-02-09 02:07:08 -05:00
Lethosor 6d33069fe9
Fix more copy-paste errors 2018-02-05 10:41:36 -05:00
Japa 7f8ea9e82c Merge remote-tracking branch 'DFHack/develop' into remote_control 2018-02-05 20:11:55 +05:30
Japa 9a032ac447 I'm a moron. 2018-02-05 20:11:47 +05:30
lethosor b2a19dedeb load-art-image-chunk: safety check 2018-02-04 22:56:24 -05:00
Japa 78061085c6 Add art image properties to RFR 2018-02-04 16:02:02 +05:30
Japa 60c1bd3c66 Merge remote-tracking branch 'refs/remotes/DFHack/develop' 
Conflicts:
	library/xml
 2018-02-04 10:26:39 +05:30
Japa ed406e0e3d fix naming and return statement. 2018-02-04 10:24:51 +05:30
Japa c621a29fe3 Fix global name. 2018-02-04 10:21:28 +05:30
Japa 38140fb450 Copy engravings in RFR, and update the art image function. 2018-02-04 10:12:15 +05:30
lethosor bdba95f90c memview: check for tags from sizecheck 2018-02-03 18:10:16 -05:00
Dan Amlund 6181b2bce3 Add tweak that replaces dwarf mode FPS counter with one that does not count when paused 2018-02-03 17:58:24 +01:00
Japa 8665600574 Send tiles for shape descriptors, and art image ids. 2018-02-03 10:38:17 +05:30
Japa e63a871363 use the vmethod for getting improvement images. 2018-01-31 10:11:43 +05:30
Japa 9aaeecb4d6 Merge remote-tracking branch 'DFHack/develop' into remote_control 2018-01-28 13:41:52 +05:30
lethosor 788a48144b dig: fix issues with priority parameters and digvx/diglx 2018-01-28 02:16:57 -05:00
Japa b78b2feed2 Remove extra whitespace. 2018-01-28 10:12:50 +05:30
Japa ca3b2b30b3 fix compiling on gcc. 2018-01-27 19:26:30 +05:30
Japa 341c0dacf3 updated function definition for win64. 2018-01-27 12:44:51 +05:30
Japa aff9c22875 update submodules. 2018-01-26 08:27:03 +05:30
Japa e3d95daf45 Don't use globals 2018-01-26 08:19:41 +05:30
lethosor 5e0e674580 Update submodules 2018-01-25 10:56:08 -05:00
Japa ef451a2f2d Got the image reader function working. 2018-01-25 20:24:12 +05:30
Japa f1b8fa305b try using the new function pointer. 2018-01-25 11:55:46 +05:30
Japa 68324dfe0b Send statue images. 2018-01-25 07:53:19 +05:30
Japa ee7ad348f0 add item images 2018-01-24 12:09:05 +05:30
Japa 42bbe124b7 Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control 2018-01-24 10:24:23 +05:30
Japa f75b116ae2 Added the rest of the relavent improvement headers. 2018-01-24 10:22:45 +05:30
Japa Mala Illo f33c42a49e Merge remote-tracking branch 'DFHack/develop' into remote_control 
# Conflicts:
#	scripts
 2018-01-24 10:04:51 +05:30
lethosor 1ba5477b63 Add designation priority support to MapCache and dig plugin 
Fixes #481
 2018-01-21 19:27:16 -05:00
Japa 7439f7fba7 Merge remote-tracking branch 'DFHack/develop' into remote_control 
# Conflicts:
#	scripts
 2018-01-19 22:11:48 +05:30
Japa 58bef276de send item imrpovements 2018-01-19 08:25:16 +05:30
lethosor 1ed6c70663 dwarfmonitor: Add "view unit" option to prefs screen 2018-01-18 10:17:54 -05:00
lethosor 74aefddd75 dwarfmonitor: Use a reasonable default for unhandled item types 2018-01-18 10:17:40 -05:00
lethosor b035d9e53a ListColumn: only change items' foreground color in selected columns 2018-01-18 10:05:31 -05:00
lethosor 7b16cf1619 dwarfmonitor: actually display creature names 2018-01-18 09:54:33 -05:00
lethosor 9515a9e4f5 dwarfmonitor: use interface_key overload of OutputHotkeyString, grey out unit option 2018-01-18 01:14:30 -05:00
lethosor 5f588b376a dwarfmonitor: make handling of unrecognized preferences more obvious 2018-01-18 01:07:20 -05:00
lethosor 4e2c6194ca dwarfmonitor: support poetic/musical/dance forms 2018-01-18 01:06:55 -05:00
lethosor 909776571e dwarfmonitor: support getSelectedUnit 2018-01-18 01:06:03 -05:00
lethosor f2890620d1 Remove tweak kitchen-keys - DF bug 614 was fixed 2018-01-18 01:05:33 -05:00
Japa a63347cf7a Move item reader to a separate file. 2018-01-17 19:10:19 +05:30
Japa ea6757377e add item volume to RFR 2018-01-16 17:04:26 +05:30
Japa Mala Illo 9ba0b00580 Remove the stupid big warning comment. 2018-01-12 11:59:02 +05:30
Japa Mala Illo 8d6e30ef0e Fix whitespace issues 2018-01-12 11:50:40 +05:30
Japa Mala Illo 56c76d5abc Merge remote-tracking branch 'DFHack/develop' into remote_control 
# Conflicts:
#	scripts
 2018-01-12 11:17:22 +05:30
lethosor 2782008b42 Update tweak condition-material with new field names 
dfhack/df-structures#236
 2018-01-10 19:53:25 -05:00
Japa Mala Illo 724fb00b73 Use an inteligenter method of setting the gem shapes. 2018-01-08 09:58:37 +05:30
Japa 29426111f7 Send shapes for small gems too. 2018-01-07 01:14:15 +05:30
Japa d80d16ddc3 Actually send gem shape. 2018-01-07 00:50:32 +05:30
Japa d0a924a207 Send shape ids through RFR 2018-01-06 23:48:06 +05:30
Japa bd8a6c31ba Send vehicles over remoteFortressReader, and don't send every block like a retard. 2018-01-06 22:07:34 +05:30
Warmist d6df9cd257 tidying up 2017-12-31 13:57:37 +02:00
Warmist 04465f59f5 Fix spaces and fix linux (again) 2017-12-31 13:57:37 +02:00
Warmist 6a65ad2fcb add more functions (not used yet) and fix linux 2017-12-31 13:57:37 +02:00
Warmist e48e2e6534 A twbt utils plugin for misc stuff used in twbt by mifki. 
Currently only render map function.
 2017-12-31 13:57:37 +02:00
Japa 546841d194 Merge remote-tracking branch 'DFHack/develop' into remote_control 
# Conflicts:
#	scripts
 2017-12-31 14:33:03 +05:30
Japa fa39220777 add projectiles, complete with velocity. 2017-12-31 14:31:58 +05:30
lethosor e72474613f Add new PutItemOnDisplay job to labor management plugins 
Also add building_type::DisplayFurniture to labormanager

Fixes #1208
 2017-12-27 13:48:53 -05:00
Japa cdfe1cf1c7 add a few more hotkeys to adventure control 2017-12-26 22:21:36 +05:30
Japa Mala Illo e9e5113ff7 Add careful movement type to proto. Not used yet. 2017-12-26 12:34:46 +05:30
Japa f5fc7fe1a1 Report the current adventure mode menu back to Armok Vision, currently including careful movement options. 2017-12-26 00:08:05 +05:30
Japa e8ccfb4e4d Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control 2017-12-25 22:00:54 +05:30
Japa 5d32253b6e added jumping ability to adventure control. 2017-12-25 22:00:45 +05:30
Japa Mala Illo 9b562aac73 Merge remote-tracking branch 'DFHack/develop' into remote_control 2017-12-25 10:45:37 +05:30
lethosor d6a6bf008e Update xml, stonesense 
Ref #1206
 2017-12-24 23:17:39 -05:00
Japa 1408f7bfb3 Add a command to remotely send simple movement commands to an adventurer. 2017-12-24 18:33:25 +05:30
Japa 79467df263 Merge branch 'remote_reader' of https://github.com/JapaMala/dfhack.git 2017-12-20 17:21:46 +05:30
Japa 04b1a80654 Don't re-send all reports all the time. 2017-12-20 17:11:01 +05:30
Japa e478c00ce5
Replace tab with space. 2017-12-19 11:20:12 +05:30
Japa c4f9f6edb2 Add item stack size. 2017-12-17 18:42:03 +05:30
Japa 29282a238b Bring in changes from the remoteServerUnsafe branch. 2017-12-17 18:05:38 +05:30
Quietust bbd823f5b0 Simplify logic in createitem, to avoid similar errors in the future 2017-12-16 15:40:39 -06:00
lethosor b1e77fa260 createitem: fix an issue with items teleporting to the location of another unit 
This was due to moveToGround() being called twice, first with the location of
world.units.active[0], which caused the item to teleport to that location later.

Fixes #1198
 2017-12-16 16:09:43 -05:00
lethosor 23bb8c4f3d Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor 2017-12-07 14:37:15 -05:00
Quietust 88c7e493b8 Merge ui_area_map_width into ui_menu_width, now a 2-byte array 2017-12-03 20:34:59 -06:00
Japa Mala Illo a0634f9ee0 Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe 2017-11-25 11:50:56 +05:30
Japa Mala Illo 7fd2586f62 Remove trailing whitespace 2017-11-25 11:39:15 +05:30
Japa Mala Illo 4a52f322c3 Remove tabs. 2017-11-25 11:37:54 +05:30
lethosor 2c95ac411e Update xml and all uses of job_handler 2017-11-25 00:59:59 -05:00
Japa Mala Illo 272f51ef4b Merge remote-tracking branch 'remotes/DFHack/master' into RemoteServerUnsafe 2017-11-25 10:24:51 +05:30
Lethosor c8cd2f40bc
Merge pull request #1188 from BenLubar/labormanager-culture-crash 
Fix labormanager crash when a dwarf doesn't have a cultural identity
 2017-11-23 16:22:44 -05:00
Lethosor 1d679e713e
Merge pull request #1156 from ViTuRaS/patch-1 
max_barrels was serialized on max_bins position
 2017-11-23 11:58:08 -05:00
Lethosor 9259cb22d2
Merge pull request #1184 from quietust/develop 
update structures
 2017-11-23 11:57:41 -05:00
Ben Lubar e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity 2017-11-23 10:55:37 -06:00
Japa e3a41a323d Update Units 2017-11-05 16:06:51 +05:30
Japa 53b5a5cc6f Added a function to only get details for units within the area of interest. 2017-11-04 20:14:24 +05:30
Quietust 33a43c5bfd update structures 2017-11-04 07:50:47 -06:00
Japa b449446526 Send announcements in Unicode. 2017-10-30 19:23:17 +05:30
Japa 117b6e0427 Send reports over RFR. 2017-10-30 19:00:03 +05:30
Japa e51ae78a46 Always follow the current adventure in adventure mode. 2017-10-22 13:37:23 +05:30
Japa b480cd6b38 Mark RFR functions as being safe for network use. 2017-10-20 19:07:47 +05:30
David Timm 322964f0e6 Switch to explicit `interface_key` values instead of char. 2017-10-17 16:06:33 -06:00
David Timm 3c564c64ba Fix tabs. 2017-10-17 15:17:35 -06:00
David Timm d009022311 Add tree product exclusions to autochop 2017-10-17 13:43:20 -06:00
Ben Lubar cc595d7a4e
Fix fencepost error in orders import. Fixes #1177. 2017-10-16 14:01:23 -05:00
Quietust c080da3750 listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux 2017-10-08 19:54:51 -06:00
PatrikLundell c2b36f0979 Removed extra qualification to make Travis happy. 2017-09-01 17:29:55 +02:00
PatrikLundell 8a81f6b5f7 Removed extra qualification to make Travis happy. 2017-09-01 17:14:21 +02:00
PatrikLundell 596296358f Moved all externally visible operation implementations out of name spaces to satisfy both Travis and Visual Studio. 2017-09-01 17:00:14 +02:00
PatrikLundell 84eaf04148 Removed function qualifications to make Travis happy and Visual Studio unhappy. 2017-09-01 16:22:10 +02:00
PatrikLundell 83061cffca Replaced include of dfhack.h with <utility> and DataDefs.h 2017-09-01 15:37:40 +02:00
PatrikLundell 831fa07fb2 Removed path from dfhack.h include. 2017-09-01 15:10:53 +02:00
PatrikLundell 80fe49b339 Add embark-assistant plugin 2017-09-01 14:13:34 +02:00
ViTuRaS ca481fc69f max_barrels was serialized on max_bins position 
When I save and load stockpile settings with stockpile management plugin, then saved barrels count will be loaded in bins and barrels are zero. So I think this change should correct it.
 2017-08-28 22:33:24 +02:00
Lethosor 54b0d2fcb6 Merge pull request #1154 from JapaMala/master 
RemoteFortressReader updates.
 2017-08-22 10:48:47 -04:00
Japa a7b837f2d0 Increment version number 2017-08-20 20:44:55 +05:30
Japa 8e71cf9def Send Unit inventories with RFR 2017-08-19 17:48:18 +05:30
Japa 737aefefea send over beard styles 2017-08-19 09:38:56 +05:30
Japa 5b5ac7088d correct spelling 2017-08-12 19:12:14 +05:30
Japa b7783ba8b9 Added unkept hair to style list 2017-08-12 19:10:35 +05:30
Warmist 620cfcc8bd Fix luasocket receive with byte count 
Did not correctly detect when you typed in a number instead of pattern.
 2017-08-12 15:42:56 +03:00
Japa 6c5e25db13 Add hair style to units in proto 2017-08-11 13:50:30 +05:30
Japa 55d22855a0 Add styling enums to RFR 2017-08-11 10:21:40 +05:30
lethosor 95aa5bbb47 zoom: fix MSVC warning 2017-08-07 15:06:00 -04:00
lethosor 1bf64ddfd8 Merge remote-tracking branch 'ab9rf/labormanager-1115' into develop 2017-08-07 14:04:05 -04:00
lethosor 14867c36cc Merge remote-tracking branch 'ab9rf/labormanager-1106' into develop 2017-08-07 14:00:37 -04:00
lethosor eb7e9dcf1f Merge remote-tracking branch 'ab9rf/labormanager-1103' into develop 2017-08-07 14:00:15 -04:00
lethosor 05b238c879 Fix another diggingInvaders compiler error 
Windows-specific, for some strange reason

Ref #1145
 2017-08-07 09:30:27 -04:00
lethosor a383cc9a30 Fix diggingInvaders compilation errors (#1145, GCC 4.8) 2017-08-06 21:01:36 -04:00
Kelly Kinkade ab8fb9f44e whitespace 2017-08-05 21:48:41 -05:00
Kelly Kinkade b61859a55e labormanager/#1103: fix NPE in meeting test 2017-08-04 11:29:48 -05:00
Kelly Kinkade 04733827a0 Favor/disfavor RECOVER_WOUNDED based on ALTRUISM (fixes #1106) 2017-07-29 19:54:51 -05:00
Kelly Kinkade d98fd02048 Weight CUTWOOD jobs by KILL_PLANT ethic; fix #1115 2017-07-29 18:46:45 -05:00
Kelly Kinkade 682d4b3144 whitespace 2017-07-29 12:26:32 -05:00
Kelly Kinkade fe9454ff1c Fix #1103: do not idle for a meeting if the other participant is dead, asleep, resting, or on military duty 2017-07-29 09:26:19 -05:00
Kelly Kinkade c5c80d5dc0 Rename labormanager_joblabormapper to joblabormapper 2017-07-28 23:03:23 -05:00
Kelly Kinkade d810faa4a3 whitespace 2017-07-28 02:43:32 -05:00
Kelly Kinkade a7d21fd627 move labormanager into a subdirectory 2017-07-28 02:28:16 -05:00
Japa 8ae7a1235d Add rider ID to creatures 2017-07-27 18:41:46 +05:30
Japa 92a962a9c0 Send grass levels over RemoteFortressReader 2017-07-25 08:31:02 +05:30
Kelly Kinkade fd19935fe9 labormanager: remove stupid 2017-07-22 04:54:05 -05:00
Kelly Kinkade 15ae72edec labormanager: Refactor source, separating the job labor mapper into a separate source file. 2017-07-22 04:31:30 -05:00
Kelly Kinkade 90dd9e932e exclude on-duty military personnel from health labor check 2017-07-20 03:54:00 -05:00
Japa Illo 1ee5debfba Send the existence of all buildings on the map. 2017-07-17 15:29:23 +05:30
lethosor c5fad31a4c Fix indentation 2017-07-12 16:55:50 -04:00
lethosor bdc746f3f1 Replace broken include guard 2017-07-12 16:53:09 -04:00
lethosor 018f3be70a Merge remote-tracking branch 'JapaMala/master' into develop 2017-07-12 16:52:30 -04:00
Ben Lubar f963d89e12 Merge branch 'develop' into plugin-orders 2017-07-11 15:12:40 -05:00
lethosor 070dfa1865 Merge branch 'develop' of dfhack/dfhack into develop 2017-07-05 23:57:35 -04:00
lethosor 2d07e5edea Add new "pathable" plugin 2017-07-05 23:54:55 -04:00
Japa 03772a6899 Don't support windmill direction on old DF 2017-07-04 21:10:59 +05:30
Japa 8a0777bb1e Add stdint.h to the buildingreader header. 2017-07-04 20:51:25 +05:30
Ben Lubar 069cea675c
Split import and clear into two commands. Use for-each loops for clarity. Closes #965. 2017-07-02 16:00:45 -05:00
Ben Lubar 7b3ce20167
Add orders plugin for managing manager orders. 2017-07-02 14:02:55 -05:00
Quietust fd68971ac5 Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches 2017-07-02 07:31:31 -06:00
Japa 96dd5799f7 Add compatibility defines for 0.34.11 2017-06-30 01:00:31 +05:30
Ben Lubar 967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active. 2017-06-27 13:47:33 -05:00
lethosor fe8be90992 Add "tweak burrow-name-cancel" to fix bug 1518 
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1518

Closes #526
 2017-06-25 16:42:30 -04:00
lethosor 10e13c532a Add "tweak cage-butcher" and some extra Building module functions 
* Buildings::markedForRemoval()
* Buildings::getCageOccupants()

Closes #906
 2017-06-25 15:27:21 -04:00
Japa Illo c9b5df8989 Merge develop 2017-06-24 11:00:14 +05:30
Japa Illo 52b9a8f4ad Added a function to get a subset of the plant raws. 2017-06-24 10:52:09 +05:30
lethosor bf8e65311b Update submodules 2017-06-23 12:43:38 -04:00
Japa 31dbb792ca Added a function to get a partial creature raw list. 2017-06-23 19:54:22 +05:30
Japa Illo a2f6c80298 Add compatibility defines to remotefortressreader.cpp 2017-06-23 16:02:30 +05:30
lethosor ae809afde7 Add Gui::refreshSidebar() 
This handles feeding CURSOR_DOWN_Z and CURSOR_UP_Z properly, avoiding issues
when on the lowest z-level.
 2017-06-23 00:02:21 -04:00
Japa ac0134568e Don't read empty rooms, and update version 2017-06-22 23:57:04 +05:30
Japa 34f55cec29 Merge remote-tracking branch 'origin/master' 2017-06-22 20:29:21 +05:30
Japa 0348de4880 Add a command to get the current RemoteFortressReader version 2017-06-22 20:29:10 +05:30
Japa Illo 9ae50279a1 Moved the version define into a header file, and fixed removing designations that are alreaddy converted to jobs. 2017-06-20 15:46:03 +05:30
Japa Illo 48f5fd7a39 Fix missing room info on sent buildings. 2017-06-20 11:06:37 +05:30
Japa Illo 96f9faea28 Merge remote-tracking branch 'DFHack/develop' 2017-06-20 10:51:52 +05:30
Japa Illo 3da9176c76 Update submodules 2017-06-20 10:51:41 +05:30
lethosor 65382473f7 Ruby: stop cpp_new from truncating vtable pointers 
This fixes a crash in levers.rb, for instance.
 2017-06-10 17:22:52 -04:00
lethosor 1321a64613 Remove lots of old/unused functions from the Units module 2017-06-10 17:21:34 -04:00
lethosor acf50b755f tweak hotkey-clear: fix label position 2017-06-08 11:20:56 -04:00
lethosor a19e268923 Make re-invoking command-prompt hide the current prompt 2017-06-07 15:00:30 -04:00
lethosor c3d5663320 Ruby: use Gui module to get selected unit 
This allows "exterminate it" to work from command-prompt, among other things.

Fixes #1100
 2017-06-06 23:34:34 -04:00
lethosor b2f05834d9 buildingplan: fix an issue preventing some numbers from being used in names 2017-06-03 18:25:49 -04:00
lethosor 9f18cb5bdc resume: use map y dimension and fix off-by-one error 2017-06-03 11:24:23 -04:00
lethosor 5278856b37 mousequery: Fix parameters to getDepthAt() 2017-06-02 15:39:23 -04:00
lethosor 62c9f2695a automaterial: use uicommon.h, draw to map 2017-06-02 15:00:51 -04:00
lethosor 43c4a88068 Move some checks in paintTile/readTile after hooks are called 2017-06-02 00:40:14 -04:00
lethosor 044b3a0789 resume: use uicommon and draw to map 2017-06-01 16:19:11 -04:00
lethosor 2681392e27 siege-engine: use map tiles 2017-05-31 12:12:52 -04:00
Japa 9f2eaf35f1 Merge remote-tracking branch 'DFHack/develop' 2017-05-31 19:52:53 +05:30
lethosor 2905376042 Fix multiple issues with the confirm plugin 
- Only allow one confirmation to be open at once. This avoids situations where
  pressing "s" would open another confirmation instead of the settings screen
  (e.g. in the trade screen), and allows all confirmations to be implemented
  without priorities specified.
- Fix #821: close any active confirmations when they are disabled.
- Some misc. cleanup, C++11 features
- Fixed a memory leak
 2017-05-27 00:26:14 -04:00
lethosor 49ea61562f uicommon: remove nullptr definition 
This is available in GCC 4.8+ and MSVC 2015
 2017-05-25 18:06:51 -04:00
Japa Illo addbb1a94f (Hopefully) send active-state wil all applicable buildings. 2017-05-25 15:38:31 +05:30
Japa 2d6dab0f24 Add a special case for retraction bridge direction 2017-05-23 21:41:34 +05:30
Japa 3f98cd3da0 Add active state to some building types. 2017-05-22 22:03:12 +05:30
lethosor 22de28c3ed embark-tools sand: hide indicator when it overlaps with confirmation window 2017-05-19 11:49:25 -04:00
lethosor b92095190f Update stonesense, scripts, xml 2017-05-18 20:52:41 -04:00
Japa 5831665231 Fix wrong units used between two bounding boxes. 2017-05-14 16:07:05 +05:30
Japa 4ec42f7994 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2017-05-14 11:17:09 +05:30
Japa 236561ff43 get the full building list in the requested area in one go, rather than several overlapping chunks. 2017-05-14 11:12:41 +05:30
lethosor d083b92e9c probe: display tiletype enum names as well 2017-05-10 12:40:57 -04:00
lethosor d42bfd7a1d Merge remote-tracking branch 'quietust/develop' into develop 2017-05-10 10:28:49 -04:00
lethosor 5d9a3cdc99 Merge branch 'develop' of dfhack/dfhack into develop 2017-05-09 13:51:38 -04:00
lethosor 88f9eaeebb stonesense: Disable overlay in STANDARD-based modes 
Closes dfhack/dfhack#1078
 2017-05-09 13:50:08 -04:00
lethosor 4dff218976 ruby: fix crash when unloading plugin on Windows 2017-05-09 13:49:07 -04:00
Quietust 67e60fdaa1 Fix issue #874 (revflood doesn't always see past constructed downstairs) 2017-05-07 13:23:33 -06:00
Japa de7ef79d76 Merge remote-tracking branch 'DFHack/develop' into develop 2017-05-07 19:24:39 +05:30
Japa a1f692686a Use forward slashes instead of underscored to separate building subtypes 2017-05-07 19:24:30 +05:30
lethosor d309839b74 Update stonesense - fix #1083 2017-05-06 15:15:32 -04:00
lethosor 3dc2c2259b Update getplants to use Designations module 
Fixes #531
Fixes #1014
Fixes #1018
 2017-05-06 00:11:07 -04:00
lethosor adaccceba7 autochop: fix display of unnamed burrows 2017-05-05 17:36:02 -04:00
lethosor 5c784f4ba3 autochop: Avoid moving menu options around when toggling burrows 2017-05-05 17:31:54 -04:00
lethosor a527091172 autochop: Fix marking/unmarking trees (use Designations module) 
Fixes #656
Fixes #1076
Closes #1030
 2017-05-04 21:51:16 -04:00
lethosor 690fec9d81 manipulator: show social activities in job column 2017-04-28 17:26:20 -04:00
lethosor 3cfbd735dc Update xml, stonesense, scripts 2017-04-23 17:14:22 -04:00
lethosor 098481c60d Merge branch 'develop' of dfhack/dfhack into develop 2017-04-19 13:45:45 -04:00
lethosor 06737644cd new tweak: hotkey-clear 2017-04-19 13:31:25 -04:00
Japa Illo e36e4fa1c1 Support archery target rotation in RemoteFortressReader 2017-04-05 15:35:48 +05:30
Japa Illo 06225dd896 Send building items and items kept in buildings separately. 2017-03-30 16:23:14 +05:30
Japa 7c626ba3c2 Actually add the versionInfo function to the RPC list. 2017-03-29 22:05:49 +05:30
Japa bbaf3210f1 Send DF version info over remoteFortressReader 2017-03-29 21:58:12 +05:30
Japa c244901c16 Removed end of line space. (Sorry, travis) 2017-03-29 20:22:09 +05:30
Japa 19a253c132 Merge remote-tracking branch 'DFHack/develop' into develop 2017-03-29 19:46:55 +05:30
lethosor 78cb4a31b9 New tweak: condition-material (fixes bug 9905) 
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9905
 2017-03-28 09:50:38 -04:00
Japa 5ea964b9cf Send building items with buildings. 2017-03-25 22:23:40 +05:30
lethosor aea76b7ef3 stockflow: make sure that manager order amounts are integers 
Fixes #1044
 2017-03-18 17:56:06 -04:00
lethosor 815bdb2e57 Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop 2017-03-18 00:51:37 -04:00
lethosor f7f05724aa Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-03-18 00:36:43 -04:00
lethosor 85e0daf15e stonesense: basic 64-bit OS X support 2017-03-18 00:34:07 -04:00
lethosor f17e9d3662 title-folder: fix SDL path on OS X 
The Stonesense install script appears to do strange things which cause DF to
load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former
is loaded, loading the latter and calling SDL_WM_* functions from it will fail.

A better solution would be to remove parts of the Stonesense fix-libs-*.sh
script(s) that are causing this, since they don't appear to be needed, or
use dlsym() to find the already-opened library/symbols.
 2017-03-18 00:31:25 -04:00
Japa 61c2fb0a11 Merged branch develop into develop 2017-03-18 00:26:01 +05:30
Japa e60d8de5fe Fix array out of bounds errors in remotefortressreader that were crashing linux. 2017-03-18 00:25:46 +05:30
lethosor 19695b4ee7 EventManager/eventful: Pass building ID pointers to event handlers 
Previously, there was some disagreement over whether event handlers such as
Buildings::updateBuildings() took building pointers or building IDs shoved
into pointers. It turned out to be the latter, which, unfortunately, did not
compile on x64. Passing building IDs isn't possible in all cases, because
building event handlers can be called for recently-deleted buildings too.
Pointers to building IDs do work reliably, though.

Fixes #1003
 2017-02-17 22:53:48 -05:00
lethosor ae92ae7948 Merge remote-tracking branch 'JapaMala/creatureRenamer' into develop 2017-02-09 23:25:55 -05:00
Japa Illo 0d8decd7ec Remove trailing whitespaces. 2017-02-08 10:54:42 +05:30
Japa Illo 2c19f6b237 remove rsize_t 2017-02-08 10:34:11 +05:30
Japa Illo 873feaee2b Added a function to the creature renamer to save a graphics pack file to set graphics for all the generated creatures. 2017-02-07 15:57:35 +05:30
Japa Illo 10bbd3cb39 Added a function to spit out a generated graphics pack file. Not done yet. 2017-02-07 11:19:45 +05:30
Japa Illo b151ad7c75 always make sure the name prefix has an underscore at the end of it. 2017-02-07 11:09:39 +05:30
Japa Illo f9b296884c Made the creature renamer work more than once on the same save, and changed the format of the resulting names. 2017-02-07 11:01:42 +05:30
Japa Illo 68faca09ee Added missing base types given by toady, and reorganized the list to look better. 2017-02-07 10:27:57 +05:30
Japa Illo 64e217132e Don't offset the raplacement by 1 since there's no space now. 2017-02-06 10:50:18 +05:30
Japa Illo 5b83c6fe68 Add spaces to search string programmatically. 2017-02-06 10:49:22 +05:30
Japa Illo 1aef1d1b98 use STD::Vector instead of a C array, and set version properly. 2017-02-06 10:42:10 +05:30
Japa Illo b18bd72c05 Replace tab with spaces. 2017-02-06 10:12:20 +05:30
lethosor 7823d78cd9 Update xml and embark-tools field name 2017-02-04 14:49:21 -05:00
lethosor f65a981099 Fix indentation 2017-02-04 14:46:38 -05:00
Japa Illo c8e6845a7f Send noble positions and professions along with Units. 2017-02-03 10:08:35 +05:30
Japa Illo d97b0497b3 Add prosession and noble position info to units. 2017-02-02 12:12:28 +05:30
Japa Illo c3c3f37b06 Added more descriptor types, and made it run on world load. 2017-01-26 15:58:43 +05:30
Japa Illo 24a653f77b added ants and apes to the list. 2017-01-26 12:50:37 +05:30
Japa Illo 365624453e Finish up the generated-creature-renamer plugin. 2017-01-26 12:45:40 +05:30
Japa 934d5b32bc Fix creature listing and plugin name 2017-01-26 10:00:38 +05:30
Japa c659b885b6 Start a plugin to rename generated creatures to have sensible IDs 2017-01-25 23:06:03 +05:30
Ben Rosser f0d4a1f563 Add DOWNLOAD_RUBY option to Ruby plugin cmake, defaulting to ON 
If DOWNLOAD_RUBY is set to OFF, the build will not attempt to download
a prebuilt libruby.so and not fire a warning that one is not present.
This may be desired if one wants to link dfhack against a newer system
libruby.so, now that dfhack supports ruby 2.x and also supports linking
against system libruby (at least, on Linux), as per the following commit:

df9b5bca73

This also allows the dfhack build to proceed without network access
(once all submodules have been fetched), which at least some Linux
distributions, like Fedora, require.

By default DOWNLOAD_RUBY is set to ON, so this should not change
the behavior of default builds.

I tested that when DOWNLOAD_RUBY is set to OFF, dfhack still launches
and that the Ruby plugin still functions, e.g. by running
```rb_eval puts('Hello world.')``` in the dfhack console.
 2017-01-20 17:40:14 -05:00
lethosor affcd658dc title-version: Hide when loading a game (e.g. arena) 2017-01-04 12:30:59 -05:00
lethosor cda4e7a300 title-version: add prerelease indicator 2016-12-30 18:03:28 -05:00
Kelly Kinkade c99780aafd Add support for shell crafts. 2016-12-27 23:40:53 -05:00
lethosor cd0d9fed18 stocks: Support getSelectedItem() 2016-12-27 17:41:32 -05:00
Kelly Kinkade 3c7d2626e2 df::dfhack_material_category has no constructor, must be manually initialized 
see #1047
 2016-12-18 17:58:24 -06:00
Lethosor ba48afe908 stockflow: Simplify calculation 
See #1046

Use math.floor() for now until we can get Lua 5.3 working on Travis
 2016-12-16 14:22:00 -05:00
Kelly Kinkade 1419d58b9a stockflow: Use "floor division" 
Per suggestion by @dscorbett
 2016-12-16 13:04:51 -06:00
Kelly Kinkade 5be77fa63d stockflow: Fix "integer expected" problem in stockflow 2016-12-16 08:09:53 -06:00
lethosor a5eb5d2502 manipulator: Sort custom professions 
Also use == instead of string::compare()
 2016-12-15 19:18:07 -05:00
Kelly Kinkade 439e13643c better hack to make ruby work on win64 2016-12-13 23:55:20 -06:00
lethosor c8b7dbd255 Fix manipulator crash when selecting profession from empty list 
Also add ListColumn::hasSelection()

Fixes #1040
 2016-12-11 21:16:21 -05:00
lethosor 9e0221a44e Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop 2016-12-11 17:52:00 -05:00
lethosor e8c8953cbb Re-add and update misery plugin 
Closes #1037
Ref #1011
 2016-12-10 18:22:32 -05:00
David Corbett acdb369aa8 Avoid non-trivial bitfield constructors 2016-12-09 13:41:14 -05:00
lethosor 0c6c94b310 Merge branch 'develop' of gh:dfhack/dfhack into develop 2016-12-09 11:28:09 -05:00
lethosor d6fda58ca0 Remove treefarm (PR #1011) 
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'

advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
 2016-12-09 11:20:35 -05:00
Lethosor 1545a4106b Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1 
labormanager: fix StoreItemInVehicle labor inference
 2016-12-09 11:07:00 -05:00
Kelly Kinkade 1a9d8629c5 labormanager: fix StoreItemInVehicle labor inference (#8) 
* labormanager: add deconstruct labor for constructed instruments

* labormanager: fix StoreItemInVehicle labor inference

StoreItemInVehicle requires the labor appropriate to the item being
stashed
 2016-12-09 09:54:20 -06:00
Lethosor 8012c5686b Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1 
labormanager: add deconstruct labor for constructed instruments
 2016-12-08 17:15:04 -05:00
Kelly Kinkade 50ce9942f4 labormanager: add deconstruct labor for constructed instruments (#7) 2016-12-08 16:01:14 -06:00
jj 8488b1a953 ruby: use correct raw string length with encodings 2016-12-05 10:29:16 +01:00
Lethosor eaf9b75a18 Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1 
labormanager: fix deconstruction of buildings containing items
 2016-12-01 18:41:10 -05:00
Kelly Kinkade 1eaa2033dc Merge pull request #6 from ab9rf/labormanager-0.43.03-working 
further tweak building construction labor identification
 2016-12-01 14:38:21 -06:00
Kelly Kinkade ad6d6fbaa6 further tweak building construction labor identification 
It's always more complicated than you expect....
 2016-12-01 14:36:46 -06:00
Kelly Kinkade 1fa997612f Merge pull request #5 from ab9rf/labormanager-0.43.03-working 
Mysteriously disappearing code reinserted
 2016-12-01 11:12:39 -06:00
Kelly Kinkade 1d97638579 Mysteriously disappearing code reinserted 2016-12-01 11:10:52 -06:00
Kelly Kinkade 6856a7ebe0 Merge pull request #4 from ab9rf/labormanager-0.43.03-working 
Fix deconstruction of buildings containing items
 2016-12-01 11:07:36 -06:00
Kelly Kinkade 77a1264a94 Fix deconstruction of buildings containing items 2016-12-01 11:06:40 -06:00
Lethosor ddf447d3de Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1 
Use attributes in calculating assignment weight
 2016-11-29 01:51:56 -05:00
Kelly Kinkade 0ab3005a89 Merge pull request #3 from ab9rf/labormanager-0.43.03-working 
Incorporate more updates cherrypicked from nocico
 2016-11-29 00:24:31 -06:00
Kelly Kinkade d5d0775f1a Remove redundant cast 2016-11-29 00:22:34 -06:00
nocico 5c16b5a2b7 labormanager: multimaterial constructions 2016-11-28 23:53:40 -06:00
nocico d626990ac8 labormanager: trap components 2016-11-28 23:53:39 -06:00
Kelly Kinkade 7c0fecec14 Merge pull request #2 from ab9rf/labormanager-0.43.03-working 
Pull working changes forward to 0.43.05
 2016-11-27 22:53:29 -06:00
nocico ae48612ebd labormanager: support for jobs in bowyer's shop 2016-11-27 22:47:53 -06:00
nocico 5405c76746 labormanager: support for jobs in bowyer's shop 2016-11-28 05:40:03 +02:00
nocico 0acd1c9059 make labormanager know building instruments is furniture hauling 2016-11-26 21:09:31 -06:00
nocico 10384fe720 make labormanager know building instruments is furniture hauling 2016-11-26 21:07:02 -06:00
Kelly Kinkade ad84217687 fix white space to make travis happy 2016-11-26 20:55:10 -06:00
Kelly Kinkade 47426e3e00 Use attributes in calculating assignment weight 2016-11-26 20:55:10 -06:00
Kelly Kinkade cbcb148182 Better job assignment algorithm for labormanager. 2016-11-26 20:55:09 -06:00
Kelly Kinkade 491d53b76f fix white space to make travis happy 2016-11-26 18:08:48 -06:00
Kelly Kinkade 8eb4f17b23 Use attributes in calculating assignment weight 2016-11-26 17:37:26 -06:00
nocico f71d19578c make labormanager know building instruments is furniture hauling 2016-11-26 13:39:20 +02:00
lethosor dd28079f30 Fix ruby.cpp compilation on win64 2016-11-22 22:43:48 -05:00
lethosor c7a35d7ece fix remotefortressreader protobuf error in clean builds 2016-11-22 17:24:36 -05:00
lethosor 647ef4d556 Fix labormanager whitespace 2016-11-22 17:17:56 -05:00
lethosor 45d138191e Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop 2016-11-17 23:02:05 -05:00
lethosor df9b5bca73 Allow ruby plugin to try more than one library path, including libruby.so on Linux 2016-11-17 10:31:48 -05:00
lethosor dce00a5034 Partial compilation fixes for advtools, misery 2016-11-16 15:21:13 -05:00
lethosor 8d9b888410 Revert "fixed MD5 hash of win64 ruby lib." 
Unable to get anything other than 8a856 for the extracted library on my end

This reverts commit fbaf2697cb.
 2016-11-14 14:16:43 -05:00
Kelly Kinkade 80ff369059 Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1 2016-11-08 12:07:30 -06:00
Kelly Kinkade 8fec45696d Better job assignment algorithm for labormanager. 2016-11-08 12:01:24 -06:00
Japa Illo 6895f3fbed remove tabs 2016-11-08 15:13:43 +05:30
Japa Illo 5e204069ce update stonesense 2016-11-08 15:13:06 +05:30
Japa Illo 20b9aab8db moved remotefortressreader.cpp to its own directory. 2016-11-08 15:11:27 +05:30
Japa Illo fbaf2697cb fixed MD5 hash of win64 ruby lib. 2016-11-08 15:10:43 +05:30
Japa Illo 2935032a1e Add .proto files to plugin sources when used, to make it conventient to open it from the IDE. 2016-11-08 15:10:01 +05:30
Japa ebc1a6d85e Add functions to get and set the pause state in DF 2016-11-08 13:40:08 +05:30
Japa Illo 99051f176b Add a single bool dfproto message, to pausing and checking pause state 2016-11-06 10:08:28 +05:30
lethosor 939b177673 Merge branch 'develop' of dfhack/dfhack into develop 2016-11-02 16:26:33 -04:00
lethosor 04ad7a0a42 Replace some instances of "cmake -E copy_if_different" with a standalone script 
@JapaMala reported that CMake < 3.5 doesn't support copy_if_different with
multiple source files.

https://cmake.org/cmake/help/v3.5/release/3.5.html#command-line
 2016-11-02 16:23:32 -04:00
Japa e769041983 Fix crash bug in remotefortressreader, that happened every time the user resumed. 2016-11-01 23:34:56 +05:30
Japa a50af3e96c Update stonesense 2016-10-31 22:52:45 +05:30
Japa d8f3d7d8f9 Send dye color with items in remotefortressreader.cpp 2016-10-31 22:52:17 +05:30
Japa 8a66e22522 Merged branch develop into develop 2016-10-31 17:39:02 +05:30
Japa 335607d1f8 Update Stonesense. 2016-10-31 17:38:43 +05:30
lethosor 2e6c7a90be fix whitespace 2016-10-31 01:58:40 -04:00
lethosor 30f4617abf Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop 2016-10-31 01:56:49 -04:00
lethosor 9e97ccbb50 Use system libruby on osx64 (since ruby 1.8 and 2 are supported now) 2016-10-29 19:08:54 -04:00
lethosor 8b7af8ba09 Merge branch 'develop' of dfhack/dfhack into develop 2016-10-29 19:00:58 -04:00
lethosor 4e7f2b9579 win64 ruby 2 2016-10-29 19:00:28 -04:00
Jon Pamala Illo 82f42addcb Merged branch develop into develop 2016-10-29 13:32:38 +05:30
Jon Pamala Illo ea9992239b Send building items, and send fake item types for boxes and bags. 2016-10-29 13:31:51 +05:30
lethosor a84958a390 Merge branch 'develop' of dfhack/dfhack into develop 2016-10-29 02:40:14 -04:00
lethosor ec222c0b24 Catch exceptions in stockpile (un)serialization 
From #964, protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).

Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
 2016-10-29 02:35:27 -04:00
Japa 148202bcba Use Binsearch for finding items. 2016-10-29 08:54:27 +05:30
Japa 0edce2b3ae Merged branch develop into develop 2016-10-29 00:28:51 +05:30
Japa 30801697d9 Send items sitting on the floor through remoteFortressReader 2016-10-29 00:28:37 +05:30
jj c640006069 ruby: some more updates for x64, fix df_flagarray size 2016-10-28 16:40:14 +02:00
PeridexisErrant cdf24efe43 Remove plugins - all broken since 34.11 
This changes nothing at all as far as any DFHack user is concerned, as
these plugins have not been possible to build since DF 34.11 - and would
have to be rewritten for compatiblity with new native-DF systems.
"treefarm" is additionally replaced by "autochop".

In the unlikely event that a developer wants the source code for
something... that's what version control is for!
 2016-10-27 23:35:29 +11:00
lethosor d62d263793 ruby: Fix potential onupdate crash when cur_year is missing 2016-10-26 20:55:16 -04:00
lethosor cf329c7ceb Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x 
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
 2016-10-26 20:44:35 -04:00
lethosor defedb351e Fix raw_vcall crash on Linux/OS X x64 2016-10-26 09:34:14 -04:00
Kelly Kinkade 4e933316ca Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1 2016-10-25 17:06:01 -05:00
Kelly Kinkade a04ed641b7 SPACES not TABS 2016-10-25 17:03:45 -05:00
Kelly Kinkade 9aa6b84e24 alphabetical order 2016-10-25 16:55:37 -05:00
Kelly Kinkade 18235da9d6 add a misisng labor rule for leather crafts 2016-10-25 16:45:25 -05:00
Kelly Kinkade cffd3be591 Move labormanager out of dev 2016-10-25 16:34:20 -05:00
lethosor 2c230f0d3e Improve protobuf file regeneration (no longer uses a dummy status.txt file) 2016-10-24 22:51:27 -04:00
lethosor 4fdbba0207 Only touch protobuf generated files if they actually changed 2016-10-24 22:28:51 -04:00
lethosor 5c83c16a99 Fix memview x64 address display 2016-10-24 10:06:41 -04:00
Japa 25a64a2102 Merged branch develop into develop 2016-10-21 22:55:38 +05:30
Japa a0b0c16a8b Actually apply the designation changes in RemoteFortressReader 2016-10-21 22:55:28 +05:30
lethosor 3df74de021 Fix rb_dfget_vtable_ptr on x64 
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
 2016-10-21 11:46:53 -04:00
jj 97f29229cd ruby: fix weird freeze when printing large strings to the console on linux64 2016-10-21 17:00:02 +02:00
jj f586692ed6 plugins/ruby: update for 64bits 2016-10-21 14:52:26 +02:00
lethosor e3ff89ba03 Fix compile error 2016-10-19 16:21:38 -04:00
Japa 701adc12b3 Add ability for remotefortressreader.cpp to accept dig designations. 2016-10-19 22:21:50 +05:30
Japa 919507d9a0 Send over dig designations from un-taken job postings in remotefortressreader.cpp. 2016-10-19 20:00:30 +05:30
lethosor 16c77efb43 Fix whitespace issues 2016-10-15 16:05:33 -04:00
lethosor 4c21bbd5ae Add Lua::TableInsert() helper 2016-10-15 14:55:48 -04:00
lethosor 8a138fcc4c Avoid polluting global namespace in MapCache.h 2016-10-15 14:53:10 -04:00
Japa 8d84b0d968 Merged branch v0.43.03 into develop 2016-10-13 19:27:06 +05:30
lethosor 1c20ebe62c Make title-folder work without SDL_WM_GetCaption 2016-10-08 17:02:45 -04:00
lethosor 2806fe73a9 ruby: Support for loading Ruby 2.x libruby 
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
 2016-10-08 17:01:52 -04:00
Japa 58ed20b25b Send world map snow coverage over remotefortressreader. 2016-10-06 22:16:40 +05:30
lethosor 714ba1a030 Warn if ruby library is missing instead of breaking installation 2016-09-26 18:28:59 -04:00
lethosor caa6a81669 Add ruby library for linux x64 
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989

Closes dfhack/dfhack#989
 2016-09-26 17:46:50 -04:00
lethosor 7abb82b6d1 Switch to downloading 32-bit libruby on Linux and Windows 2016-09-26 17:36:57 -04:00
lethosor 888a09bed5 Switch to downloading OS X libruby 2016-09-26 17:24:35 -04:00
lethosor 8f2cc5bc4d Fix and reorganize remotefortressreader includes 2016-09-04 16:06:26 -04:00
Japa e205dc82a5 Merge pull request #991 from JapaMala/v0.43.03 
Removed the other foreach.
 2016-08-29 22:30:43 +05:30
Japa 1862106fd1 Removed the other foreach. 2016-08-29 22:29:40 +05:30
Japa b09ee3407c Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop 
Conflicts:
	library/xml
	plugins/remotefortressreader.cpp
 2016-08-29 22:06:37 +05:30
Japa af5d4ec5a8 removed foreach. 2016-08-29 21:43:20 +05:30
lethosor bbaf129adf Fix ruby codegen for bitfields/enums with long base-type 2016-08-27 15:24:53 -04:00
Japa 7d145de4a7 Translate histfig mats into creature mats, rather than sending the entire histfig population. 2016-08-26 23:48:32 +05:30
Japa 91cb734a25 Send histfig materials over remotefortressreader.cpp, using unique ids. 2016-08-26 12:23:50 +05:30
Japa 5c3260c382 Actually check spatter amounts properly 2016-08-26 08:49:54 +05:30
Japa db7be082ef Only copy spatters if they actually have any amount. 2016-08-25 23:56:30 +05:30
Japa a3ab757642 Add spatters to remotefortressreader.cpp 2016-08-25 21:14:23 +05:30
lethosor 6ce470ad57 Add basic lua expression support to memview 
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.

Closes #976
 2016-08-24 16:26:34 -04:00
lethosor f4b0c2fcfc color-dfhack-text: Fix potential overflow issue 2016-08-22 23:18:58 -04:00
lethosor 93ac937cb9 Add new job types to autohauler 2016-08-21 22:24:41 -04:00
lethosor 9171149afb Update submodule refs 2016-08-18 23:42:17 -04:00
lethosor de731b0299 Move save_dir back into cur_savegame and update submodules 2016-08-14 12:41:09 -04:00
lethosor e965f5318f Replace many includes with forward declarations in modules/Maps.h 2016-08-13 21:44:01 -04:00
lethosor a1c25570df Move labormanager to plugins/, per request 2016-08-11 23:49:15 -04:00
lethosor 99813038e9 Update labormanager for unit.relations removal and fix warnings 2016-08-11 23:42:58 -04:00
lethosor bceeea39ba Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop 2016-08-11 23:37:22 -04:00
Kelly Kinkade a55ce5f1d9 labormanager: whitespace 2016-08-11 16:58:35 -05:00
Kelly Kinkade 5ab930ba4d labormanager: small tweaks 
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
 2016-08-11 16:56:34 -05:00
lethosor 215afa34f3 Update for 64-bit unit changes 
Includes xml, stonesense, scripts

Ref DFHack/df-structures@25cb373
 2016-08-10 23:50:00 -04:00
lethosor 1b11c46a98 ruby.cpp: uint32_t -> uintptr_t 2016-08-10 15:24:07 -04:00
Lethosor 6e741b1a80 Merge pull request #969 from Qartar/win64 
Minor fixes/updates for Visual Studio 2015 Win64
 2016-08-10 15:15:44 -04:00
lethosor 53a0d73d23 Add new title-folder plugin 2016-08-09 20:09:50 -04:00
Carter Bray 5fef2ad075 Add windows container sizes to ruby codegen 2016-08-07 10:11:17 -07:00
lethosor ddbb1b5bb8 ruby: Update sizes for some types 
Many are still incomplete on x64, especially on Windows
 2016-08-05 17:29:24 -04:00
lethosor dbd2e71920 Ruby codegen integer improvements 
- Add uint64_t
- Add special case for long on different platforms
- Require OS and architecture to be specified

NOTE: integer alignment on x64 is probably still incorrect
 2016-08-05 17:12:07 -04:00
lethosor ef569dc5a1 Pass OS and architecture to ruby codegen explicitly 
- Passing the architecture is needed to determine sizeof(long)
- Passing the OS prevents potential issues when cross-compiling between Windows
  and non-Windows (although this is unlikely)
 2016-08-05 17:09:25 -04:00
Japa 697aa54fa6 Sent tree and stone layers through remotefortressreader.cpp, and correct town placement. 2016-08-05 00:40:10 +05:30
Japa 8a97b54bcd Send wall info 2016-08-03 16:32:51 +05:30
Japa 2fda01d90b Add support for site towers. 2016-08-03 10:22:30 +05:30
Japa 9189e3dc7e Send world buildings through remotefortressreader.cpp 2016-08-02 10:30:17 +05:30
Carter Bray 9da2dcb8a2 Fix raw_vcall on Win64 builds 
MSVC's call conventions on x64 are the same for normal function calls and
member function calls (with the addition of the implicit 'this'
parameter).
 2016-07-31 17:01:57 -07:00
lethosor 79377669a1 Merge remote-tracking branch 'NCommander/dwarfvet' into develop 2016-07-29 16:25:53 -04:00
lethosor afde73a673 memview: Fix pointer size on x64 2016-07-28 11:45:35 -04:00
lethosor eeb7f05483 vectors: Fix pointer parsing and display 2016-07-28 11:44:54 -04:00
lethosor 71e4f4ec62 Fix pointer-size-related compile errors in dev plugins 2016-07-28 11:40:17 -04:00
Japa 98230e9078 Send surface material with the worldmap in remotefortressreader.cpp 2016-07-28 20:52:14 +05:30
Vitaly Pronkin 8916aba3bf win64 fixes (partial) 
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
 2016-07-27 19:46:49 -04:00
Vitaly Pronkin fe18f176f7 More 64-bit fixes 
Cherry-picked from 7eb3ba6
- Lua update already done in e2c6350, 4dd411e
- Excluded library/modules/Buildings.cpp
 2016-07-26 23:47:53 -04:00
Kelly Kinkade 74f6f3d416 labormanager: add labors for bookcase (de)construct 2016-07-11 22:39:41 -05:00
Kelly Kinkade 874a97ed9f labormanager: fix several job-to-labor mappings 2016-07-11 22:39:41 -05:00
Kelly Kinkade 808afca9f0 labormanager: add StoreItemInLocation labor, reduce tool churn 
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
 2016-07-11 22:39:41 -05:00
Kelly Kinkade 0509c455dd labormanager: significant restructuring to use job posting list 
Updated here to get potential jobs off the job posting lists, which is
apparently where certain map-designated live after being designated but
before they move to the actual job list. Also changes to how tools are
handled, and lever pulling is assigned by default to all idle dwarfs.
 2016-07-11 22:39:41 -05:00
Kelly Kinkade 3a0ba332d9 labormanager: rework for better behavior with 43.03 
The main thing here is that the process loop exits if the DF process_job
or process_dig flags are set since if these are set the job list is
going to change soon anyway. The plugin also sets these flags when it
changes any labors, which has the side effect of effectively disabling
the process loop while DF is paused, which prevents flapping  while
editing job preferences in-game, and also allows changing job
preferences in game (although such changes may not last when the clock
starts up again).
 2016-07-11 22:39:41 -05:00
Kelly Kinkade dbc46c510f labormanager: fix stupid 2016-07-11 22:39:41 -05:00
Kelly Kinkade 705134975d labormanager: whitespace 
MSVC is evil.
 2016-07-11 22:39:41 -05:00
Kelly Kinkade f095e139aa labormanager: more tweaks to bring up to date 
This update fixes some labors and attempts to address changes in the way
DF maintains the job list.
 2016-07-11 22:39:41 -05:00
Kelly Kinkade 07e1c81969 labormanager improvements 
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
 2016-07-11 22:39:41 -05:00
Kelly Kinkade 824275b23b Rename autolabor2 to labormanager and bring up to date with current 2016-07-11 22:39:41 -05:00
lethosor 2455e36510 Initial 64-bit support 2016-07-03 23:32:43 -04:00
Japa 13b328beeb Remove tabs 2016-06-30 15:14:20 +05:30
Japa b37afa4591 Remove tabs 2016-06-30 15:12:28 +05:30
Japa b196ecf351 Send over material tissues through RemoteFortressReader 2016-06-30 14:33:15 +05:30
Lethosor 421e7949e0 Merge pull request #951 from eswald/stockflow-43 
Stockflow reaction updates
 2016-06-26 21:37:15 -04:00
Eric Wald 060331de37 Stockflow reaction updates 
SpinThread jobs now get the proper material category flag, and metal mechanisms can be ordered.
 2016-06-26 19:22:53 -06:00
Japa 036c0f787c Send creature adult size through remotefortressreader.cpp 2016-06-23 21:26:00 +05:30
Japa 74c9abcb47 Send color modifier raws through remotefortressreader.cpp 2016-06-22 13:36:36 +05:30
Japa 069d6b67d6 Send all size modifiers through remotefortressreader. 2016-06-21 22:42:47 +05:30
Japa 5fff0efec5 Send appearance info over remotefortressreader.cpp 2016-06-20 22:59:59 +05:30
Japa 9ef9a6b519 Send bodypart raws from RemoteFortressReader 2016-06-20 13:21:11 +05:30
Japa 980be6e2af Added a cleaner format for sending over region info. 2016-06-16 21:36:35 +05:30
Michael Casadevall 39c96c474a Fix ordering, news, and indentation 
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
 2016-06-14 16:13:26 -04:00
lethosor f07bc03c69 Update clsocket and Open()/Listen() usage 2016-06-14 13:21:51 -04:00
Lethosor 9021fcab2e Merge pull request #946 from NCommander/fix-produce-structure 
Modify DFHack to handle new produce() prototype. Major thanks to leth…
 2016-06-13 17:24:22 -04:00
Michael Casadevall a03b32846a Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this 
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
 2016-06-13 16:57:45 -04:00
lethosor f908a1d1b6 Replace catsplosion plugin with a script 
Closes #938, #722
 2016-06-11 21:44:15 -04:00
Michael Casadevall fead8a80ff Fix tabs to spaces 
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
 2016-06-08 04:15:03 -04:00
Michael Casadevall e45fbfc61d Modified dwaftvet plugin to work with latest DFHack 
Initial commit of the dwarfvet plugin

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
 2016-06-08 04:14:59 -04:00
Japa 8543121ece add fog of war and traffic to probe.cpp 2016-06-03 00:32:11 +05:30
Japa 44b8433282 Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer 2016-06-03 00:31:02 +05:30
Japa b1072b65e4 Don't send designations in adventure mode 2016-05-31 22:53:48 +05:30
Japa 3dcd3e14f0 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-05-28 21:24:02 +05:30
Japa 569325823d Send world name and time with world center in remotefortressreader.cpp 2016-05-28 21:23:26 +05:30
Japa 0867f3d311 Add dig designations to probe.cpp 2016-05-28 08:29:12 +05:30
Japa c0419d919e Add lake levels to remotefortressreader.cpp 2016-05-28 08:28:17 +05:30
carbohydratesn 9be928541c Include math.h 
3dveins.cpp won't build for me without math.h as a dependency - errors about 'fabsf' and other math functions

arch linux, gcc-multilib 6.1.1-1
 2016-05-22 16:45:58 -04:00
lethosor dabf443260 Merge remote-tracking branch 'eswald/stockflow-43' into develop 2016-05-17 23:29:01 -04:00
lethosor d198bf547a Unit list search: reset cursor position to 0 before switching pages 
On empty lists, pressing "up" sets the cursor position to -1. This results in a
crash if the list is populated, which the search plugin does before switching
pages.

Fixes #928
 2016-05-17 23:23:54 -04:00
Eric Wald 3f0857bff3 Incrementing the manager order id properly. 
There's a chance that not doing so could lead to a crash, somehow.
 2016-05-16 19:48:52 -06:00
lethosor a8f9f912c9 Merge remote-tracking branch 'eswald/stockflow-43' into develop 2016-05-16 20:40:50 -04:00
Eric Wald 11a0bea002 Moving a search option to the bottom of the screen. 
The list of workers in the workshop profile page can take nearly the full height of the screen.
 2016-05-15 22:49:35 -06:00
Eric Wald 2df41e6bad Clearing the active flag for new stockflow orders. 
It's not entirely clear what this flag does when there aren't any conditions on the order, but new manual orders start as Ready instead of Active.
 2016-05-15 22:06:20 -06:00
Eric Wald 0b1004f2b8 Notice resizing immediately, instead of on next key press 2016-05-15 09:14:30 -06:00
Eric Wald 6add87b358 Simplifying key strings 2016-05-15 08:58:45 -06:00
Eric Wald 6575f5f412 Removing the quantity limit on stockflow orders. 2016-05-14 23:40:01 -06:00
Eric Wald 3e8d4f9257 New command for clearing the stockpile order. 
Shift-Space by default, using the SETUPGAME_SAVE_PROFILE_ABORT key.
 2016-05-14 23:35:07 -06:00
Eric Wald 8c7d5366c9 Switching to the new manager order flags 2016-05-14 23:33:38 -06:00
Eric Wald 02e0b9e721 Manager interface now uses the full height. 
Its navigation behavior has also changed, and it now has key hints for navigation.
 2016-05-14 22:42:49 -06:00
Ben Lubar 3af24507a3 adjust autogems to work with the workshop profile changes 2016-05-14 20:15:49 -05:00
lethosor 55e58e5f06 Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins 2016-05-14 11:43:37 -04:00
lethosor 74898a5424 createitem: move all created items to cursor if applicable 2016-05-11 17:54:37 -04:00
lethosor 38051a5a48 remove tweak manager-quantity 2016-05-11 17:51:57 -04:00
lethosor e0a0a26739 ANY_GENERIC35 -> 36 2016-05-10 17:57:15 -04:00
lethosor d93cbd709e Merge remote-tracking branches 'warmist/fixpositions', 'warmist/gm_editor_changes', 'rubybrowncoat/feature/fix-multiquality-gui-create-item' and 'AtomicChicken/item-trigger-fix' into develop 2016-05-09 20:55:14 -04:00
Japa 56f2603097 Send over rivers through remotefortressreader.cpp 2016-05-02 20:58:36 +05:30
Japa b8f5496b24 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-25 22:39:18 +05:30
Japa 572d38e3db Made remotefortressreader.cpp return the correct area of interest in the world when on the embark screen. 2016-04-25 22:38:47 +05:30
lethosor f66dd77a72 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-04-23 20:33:25 -04:00
lethosor 5418233117 to_string -> int_to_string 2016-04-22 20:27:53 -04:00
lethosor fd54003384 More make_pair replacements 2016-04-22 20:26:07 -04:00
lethosor ec42967996 Use std::make_pair instead of initializer lists 2016-04-22 19:43:05 -04:00
lethosor 8784a133e8 Initialize maps in a MSVC 2010-compatible way 2016-04-22 18:45:32 -04:00
lethosor 52728babd4 Merge branch 'develop' into zone-unassign 2016-04-22 18:41:15 -04:00
PeridexisErrant acac839371 Replace fixdiplomats, fixmerchants with scripts 2016-04-20 11:12:06 +10:00
Japa 856c3b06f4 Added dig designations to remotefortressreader.cpp 2016-04-19 19:15:33 +05:30
Japa 1317792cde Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-19 18:17:39 +05:30
Lethosor 50f2851772 Merge pull request #742 from PeridexisErrant/ls-cleanup 
Ls cleanup
 2016-04-17 17:59:22 -04:00
lethosor 8226134f67 Make can_trade() return true if at least one caravan can trade 
Fixes #900
 2016-04-16 17:13:00 -04:00
PeridexisErrant ae81454786 Minor fixes, space no longer required 
Thanks to 2882422
 2016-04-15 16:28:41 +10:00
PeridexisErrant 273c22f606 Shorten "ls" help for plugins 
I think that's all of them.
 2016-04-15 16:28:41 +10:00
lethosor 0d37209063 use trade_state enum 2016-04-13 09:44:57 -04:00
lethosor a92b67c80d Add ability to edit min/max logs and remove cap 
Closes #893
 2016-04-12 19:52:51 -04:00
lethosor 999d89c5af Fix tile background colors in CopyScreen 2016-04-12 17:10:54 -04:00
lethosor daadc2ef85 Update stonesense 2016-04-10 20:11:52 -04:00
lethosor 2399539990 Merge remote-tracking branches 'warmist/patch-7', 'warmist/patch-8' and 'warmist/patch-9' into develop 2016-04-10 11:58:48 -04:00
Warmist 812f6df272 Fix building-hacks color for auto_gears option 
Now it should select the gear color correctly
 2016-04-10 16:55:08 +03:00
Warmist c4c452c288 Show sidebar when moving from screen to screen 
When both are from lua the old logic failed.
 2016-04-10 16:51:58 +03:00
Warmist 29f08cd20d Fix eventful trying to show sidebar 
It should not try to do that if e.g. showing buildingitems. Maybe later we will have more valid focus strings (e.g. custom item view for some buildings) but for now just use vanilla (or callback function not a class)
 2016-04-10 14:58:03 +03:00
Warmist 9c9f710d5b Fix eventful not showing sidebar sometimes 
E.g. when destroying buildings
 2016-04-10 14:47:33 +03:00
lethosor 4c4b727a2e Update stonesense 2016-04-09 20:09:41 -04:00
lethosor 33472b823b createitem: fall back to units.active[0] if a cursor is available but no unit 2016-04-05 11:49:38 -04:00
lethosor f5d10ecf61 vectors: attempt to identify instances of virtual classes 
Also:
- don't restrict to heap ranges (e.g. allow globals)
- stylistic cleanup
 2016-04-03 20:47:21 -04:00
Japa 39bcee11d8 fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving. 2016-04-03 11:09:16 +05:30
Japa 4d95395afc added a function to remotefortressreader.cpp to insert keyboard events 2016-03-21 22:56:48 +05:30
Japa 2f4a5e8449 Fix missing return 2016-03-20 22:04:21 +05:30