ba0ae9e487
Merge remote-tracking branch 'PeridexisErrant/init-flags' into develop
2015-11-07 15:23:17 -05:00
0bb203e7c9
Replace initflags plugin with scripts
...
Progress towards #722
2015-11-07 23:42:14 +11:00
3ebe59859b
box-select: Fix "tiles to fill" count
2015-11-06 20:04:54 -05:00
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05:00
e9be1aa657
Fix for construction over existing construction & on top of walls
...
Fix to allow constructions on top of (natural) down stairs
2015-11-06 19:00:43 +01:00
5c4e28dbff
Fix initial cursor position with initial entry
2015-11-05 19:09:35 -05:00
ac8038fa79
Update stonesense
2015-11-04 20:06:35 -05:00
cbf31dcb37
Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop
2015-11-04 19:54:13 -05:00
ea38404727
Added bridge direction.
2015-11-03 22:38:07 +05:30
3fd4b01829
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-03 18:50:00 +05:30
f5ca3f9e7b
Made the direction info more meaningful.
2015-11-03 18:49:17 +05:30
d692458038
Formatting
2015-11-03 10:07:27 +01:00
f7a5574e9a
Merge pull request #726 from DoctorVanGogh/zone-typo
...
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
923ce36323
zone: Fix typo in help text
2015-11-03 03:55:04 +01:00
b4b90465c2
Added building direction to remotefortressreader.cpp for those buildings that have it in a meaningful way.
2015-11-02 23:22:58 +05:30
a7fe1d9d73
Formatting
2015-11-02 05:05:17 +01:00
092979f362
Prevent building floor on top of constructed floor (mostly)
2015-11-02 02:51:52 +01:00
e11ce3bff4
Merge develop
2015-10-31 15:46:41 +11:00
ac71fa8070
Add isValidLabor() to Units module
...
Closes #711 and could avoid potential issues when editing units from
other civs with manipulator.
2015-10-30 18:41:09 -04:00
ff4f7203c5
Update stonesense
2015-10-30 17:08:39 -04:00
daf20c16bd
Indicate development builds
2015-10-24 14:52:00 -04:00
8de710f1c1
Add Renderer module - safer way to install custom renderers
2015-10-21 17:18:39 -04:00
757c05db86
buildingplan-lib: depend on dfhack
2015-10-18 17:46:37 -04:00
dd32954cce
Make buildingplan-lib a static library
...
This avoids building buildingplan-lib.cpp multiple times
2015-10-18 13:08:48 -04:00
c44ac8ec6e
Improve handling of fatal errors and errors in dfhack.lua
...
* Several fatal errors that occurred during core initialization didn't
stop initialization or set 'errorstate' properly, which caused
update hooks and other code to crash later. This has been fixed and
should address crashes like the one mentioned in #470 .
* Errors when loading dfhack.lua now cause Lua::Open() to fail, which
triggers a fatal error in Core::Init()
* Failure to initialize the console no longer results in a call to
fatal() (since it didn't actually stop initialization previously)
2015-10-17 21:18:04 -04:00
38be023d5d
Fix TiletypeMaterial/tiletype_material comparison
2015-10-10 13:06:14 -04:00
46f6afada7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-10-09 23:35:39 +05:30
30c14ed914
send stockpile and civzone extents in remotefortressreader.cpp
2015-10-09 23:35:12 +05:30
5580a255f5
Update stonesense
2015-10-03 14:42:52 -04:00
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
d343dfd8a0
Add a function to find viewscreens (or parents) of a given type
...
This makes it possible for some plugins to detect the game state more
reliably - for example, prospector would previously fail when
embarking if the viewscreen_choose_start_sitest instance had any
children.
2015-10-02 21:50:55 -04:00
449e0c7578
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-28 10:07:23 +05:30
5e43b6b2a6
Add buildigs to remotefortressreader.cpp
2015-09-28 10:06:04 +05:30
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
62c903b7be
search: Fix crash when disabling a stockpile category
...
Closes #678
2015-09-21 19:25:20 -04:00
b532a56790
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-21 17:48:34 -04:00
47378d4b85
Merge branch 'luasocket' into develop
2015-09-21 17:46:47 -04:00
fabcfcd921
Fixed trailing whitespace.
2015-09-21 17:42:30 -04:00
129218d5f8
fix whitespace.
2015-09-16 23:29:21 +05:30
ed07a8478b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-16 23:27:04 +05:30
e49272854c
Add basic army info to RemoteFortressReader.proto
2015-09-16 23:26:52 +05:30
5ce6fceacc
Send the center with the world map, based off current embark if available, otherwise adventurer position.
2015-09-16 23:25:23 +05:30
80fd4b1365
Some additions and fixes.
...
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
f9fce7e6a1
Convert tab to spaces in RemoteFortressReader.proto.
2015-09-15 03:21:09 -04:00
b58ccc9e55
Fix embark-tools title alignment
2015-09-12 20:28:42 -04:00
a852ca10d7
Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop
2015-09-12 19:59:53 -04:00
3b36a23404
Add soldier state to remotefortressreader.cpp
2015-09-07 22:41:24 +05:30
07c601be99
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
1a78cabd7c
Add profession color and unit flags to remotefortressreader
2015-09-05 14:54:12 +05:30
1ea2da511b
Fix whitespace
2015-09-02 15:53:13 -04:00
lethosor
PeridexisErrant
DoctorVanGogh
Japa
Lethosor
expwnent
Warmist