099ae66be8
Merge branch 'develop' into remote_reader
2019-09-08 15:30:14 -05:00
0a42fe0e38
Delete trailing whitespace
2019-09-02 19:50:00 +03:00
62aff6edee
Whitespace fix
2019-09-02 18:40:50 +03:00
df756f22f8
Change dwarfmonitor to use global lua state.
...
This needs more CoreSuspends but they are needed either way. This way
you can access other script environments and access this plugin enviroment
from lua.
2019-09-02 18:35:46 +03:00
7a5902418e
Abbreviate label on narrow screens
2019-08-25 21:49:41 -04:00
417212814d
embark-assistant: add in-game key to activate
...
Closes #1384
2019-08-25 21:33:43 -04:00
ac5a54c8db
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
library/CMakeLists.txt
plugins/CMakeLists.txt
2019-08-23 23:58:00 -04:00
0f4162acc9
Merge pull request #1402 from BenLubar/persist
...
Add Persistence module.
2019-08-23 23:37:06 -04:00
01ce954c29
changelog: update with scripts changes since 0.44.12-r2 and clean up
2019-08-23 22:17:09 -04:00
222b88063c
Update submodules
2019-08-23 21:37:50 -04:00
2ef46562c8
Avoid calling doSaveData twice when unloading a world
...
This was happening because of a switch to viewscreen_game_cleanerst and back to
viewscreen_savegamest when saving
2019-08-23 20:45:35 -04:00
100e584c34
Fix saving persistent data on regular save
2019-08-23 20:30:06 -04:00
07575095fd
Merge branch 'develop' into persist
2019-08-22 22:00:50 -04:00
0b8eba7d23
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
...
Conflicts:
docs/changelog.txt
2019-08-22 21:50:54 -04:00
d17820a596
Made RemoteFortressReader pulll from the active units list, not from the full units list.
2019-08-22 19:26:19 -06:00
b19a04fa88
Revert newline change
2019-08-22 21:24:48 -04:00
2344e60101
Merge pull request #1181 from warmist/twbt_experiments
...
map-render plugin
2019-08-21 09:33:45 -04:00
a07b568597
Changed the serialization to use the actual enum item names instead of converting them to numbers.
2019-08-13 17:15:06 -05:00
47b43e6dd7
Merge branch 'develop' into auto_clothing
2019-08-06 20:12:26 -05:00
e1661d8404
Merge remote-tracking branch 'remotes/dfhack/develop' into auto_clothing
2019-08-06 20:07:20 -05:00
88757d5c27
Merge branch 'develop' into cmake-cleanup
2019-07-20 19:22:33 -04:00
e86e20717e
Merge remote-tracking branch 'JapaMala/remote_reader' into develop
2019-07-20 19:05:32 -04:00
aee7b6b24d
Note about pthread/cmake <3.8 issue (from ragundo)
2019-07-20 17:11:11 -04:00
99038c395a
Merge remote-tracking branch 'ab9rf/biometype' into develop
2019-07-20 16:32:46 -04:00
ab9ad6f93e
Clean up *.cmake style
2019-07-20 16:17:44 -04:00
8a07426643
Merge branch 'develop' into cmake-cleanup
2019-07-20 15:15:39 -04:00
b6678d72ae
Move custom lualimit.h to lua dir and rename to dfhack_llimits.h
2019-07-20 14:26:30 -04:00
ea0105fa66
Add CMake option to provide custom libstdc++ on macOS ( #1344 )
2019-07-20 11:21:44 -04:00
49f3de979f
Make ServerMain and ServerConnection data race free
...
RemoteServer and PluginManager side would need complete redesign to be
data race free and concurrent. But as that would be unlikely to be
required from DFHack I decided simpler solution that is fixing data
ownership to a thread and all ServerConnection share a single lock which
allows access to PluginManager and Core.
2019-07-18 23:05:11 -04:00
0605b9601c
Make Core::started thread safe
2019-07-18 23:05:11 -04:00
0ed5c8db39
Fix data race between threaded init and EventManager
...
The initial run_dfhack_init loads shared state information that is used
by EventManager when state changes. There is a small risk that
EventManager can handle events while run_dfhack_init is still running.
2019-07-18 23:04:40 -04:00
a90a6b2a7b
Make lua data race free
...
Fixes tsan trace report between lua viewscreen and other threads running
lua without CoreSuspender lock. But I would assume similar races exists
when using lua from console thread, remote thread and vmethods same time.
2019-07-18 23:04:40 -04:00
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
ea37eecfb1
Document and warn about old CMake versions with Ninja
...
Resolves #1369
2019-07-16 19:33:33 -04:00
f7f937e4d3
Merge remote-tracking branch 'janxious/patch-2' into develop
...
Closes #1441
2019-07-15 23:22:43 -04:00
af26f7dc6e
Added intrusion calculations for world edges
2019-07-14 16:11:51 +02:00
b60faa8021
dfhack-run: add note about installation when called with no arguments
2019-07-13 15:51:46 -04:00
6f5abc79e9
Restored install-debug contents and removed offensive white space
2019-07-12 22:38:12 +02:00
8248832cbc
Added detection and use of incursions into embark tiles
2019-07-12 22:09:03 +02:00
c125926727
Update submodules and Authors.rst
...
Ref #1432
Ref dfhack/stonesense#54
Ref dfhack/scripts#93
2019-07-10 19:21:23 -04:00
52e128a939
Merge pull request #1432 from LordGolias/feature/improve_readme_fedora
...
Improve readme, dependencies, and gitignore
2019-07-09 12:18:40 -04:00
53cf1136fb
Waterfall detection changed
2019-07-01 13:30:16 +02:00
134bcf09a9
Waterfall detection changed. Aquifer display changed
2019-07-01 13:29:53 +02:00
bcb62697c9
Waterfall detection changed
2019-07-01 13:29:19 +02:00
fae5e894ae
Waterfall detection changed
2019-07-01 13:29:07 +02:00
242f6fbc38
Waterfall detection changed
2019-07-01 13:28:54 +02:00
092c9f965b
Waterfall detection changed
2019-07-01 13:28:40 +02:00
fd722332f8
Embark-Assistant Waterfall detection change added
2019-07-01 13:27:39 +02:00
716fe90312
Modified Flat detection options
2019-06-23 18:36:18 +02:00
3139d0d3c7
Modified Flat detection options
2019-06-23 18:36:10 +02:00
JapaMala
Warmist
lethosor
Alan
Pauli
PatrikLundell