Alan
0292b32446
Merge pull request #1461 from lethosor/fix-eventful-building-id
...
Fix EventManager building ID type
2019-10-09 18:28:17 -04:00
jimcarreer
cffc30b433
Output Castes on Error
2019-10-06 14:25:33 -04:00
lethosor
582169e0a5
eventExample: make unitAttack a bit safer
2019-10-05 21:05:26 -04:00
lethosor
08aeb6faeb
Fix EventManager building ID type
...
The pointer to the building ID was sometimes not dereferenced properly.
Addressed by switching to an ID cast to a pointer type for consistency with
other types of events.
Fixes #1434
Ref #1003 (19695b4ee7
)
Broken in #1253 (a7dfacd1c5
)
2019-10-05 20:26:31 -04:00
lethosor
8675ff660c
Windows+Ninja: Fix build error due to trying to include " dfhack_llimits.h"
...
Ref #1455
2019-10-04 13:15:58 -04:00
lethosor
dcce9ae599
Add quotes around dfhack_llimits.h include for MSVC
...
Fixes #1455
2019-10-04 13:07:26 -04:00
Alan
e8fcc8d5c0
Merge pull request #1460 from JapaMala/remote_reader
...
Smal RFR change
2019-10-04 01:16:05 -04:00
lethosor
7d5970303f
Update xml ( dfhack/df-structures#286 )
2019-10-04 00:14:08 -04:00
lethosor
a26ed764f2
Merge remote-tracking branch 'suokko/avoid_rebuilding_df_statics_if_core_h_changes' into develop
2019-10-04 00:06:25 -04:00
lethosor
ca7d0f1cac
Add algorithm include for MSVC
2019-10-03 23:26:57 -04:00
lethosor
f3658db85f
Merge branch 'develop' into avoid_rebuilding_df_statics_if_core_h_changes
2019-10-03 23:23:36 -04:00
Warmist
a2b5c1ddd9
lua/widgets filtered list input fix
...
FilteredList was not consuming input events.
2019-09-30 22:00:06 +03:00
PatrikLundell
7979150566
Removed trailing blank
2019-09-24 11:14:50 +02:00
PatrikLundell
5eceab2794
Added 'fileresult' optional parameter, improved world traversal
2019-09-23 13:13:04 +02:00
JapaMala
f00a7f9b39
Bump RFR Version number.
2019-09-08 15:33:39 -05:00
JapaMala
099ae66be8
Merge branch 'develop' into remote_reader
2019-09-08 15:30:14 -05:00
Warmist
0a42fe0e38
Delete trailing whitespace
2019-09-02 19:50:00 +03:00
Warmist
62aff6edee
Whitespace fix
2019-09-02 18:40:50 +03:00
Warmist
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
lethosor
7a5902418e
Abbreviate label on narrow screens
2019-08-25 21:49:41 -04:00
lethosor
417212814d
embark-assistant: add in-game key to activate
...
Closes #1384
2019-08-25 21:33:43 -04:00
lethosor
ac5a54c8db
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
library/CMakeLists.txt
plugins/CMakeLists.txt
2019-08-23 23:58:00 -04:00
Alan
0f4162acc9
Merge pull request #1402 from BenLubar/persist
...
Add Persistence module.
2019-08-23 23:37:06 -04:00
lethosor
01ce954c29
changelog: update with scripts changes since 0.44.12-r2 and clean up
2019-08-23 22:17:09 -04:00
lethosor
222b88063c
Update submodules
2019-08-23 21:37:50 -04:00
lethosor
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
lethosor
100e584c34
Fix saving persistent data on regular save
2019-08-23 20:30:06 -04:00
lethosor
07575095fd
Merge branch 'develop' into persist
2019-08-22 22:00:50 -04:00
lethosor
0b8eba7d23
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
...
Conflicts:
docs/changelog.txt
2019-08-22 21:50:54 -04:00
japamala
d17820a596
Made RemoteFortressReader pulll from the active units list, not from the full units list.
2019-08-22 19:26:19 -06:00
Alan
b19a04fa88
Revert newline change
2019-08-22 21:24:48 -04:00
Alan
2344e60101
Merge pull request #1181 from warmist/twbt_experiments
...
map-render plugin
2019-08-21 09:33:45 -04:00
JapaMala
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
JapaMala
47b43e6dd7
Merge branch 'develop' into auto_clothing
2019-08-06 20:12:26 -05:00
JapaMala
e1661d8404
Merge remote-tracking branch 'remotes/dfhack/develop' into auto_clothing
2019-08-06 20:07:20 -05:00
lethosor
88757d5c27
Merge branch 'develop' into cmake-cleanup
2019-07-20 19:22:33 -04:00
lethosor
e86e20717e
Merge remote-tracking branch 'JapaMala/remote_reader' into develop
2019-07-20 19:05:32 -04:00
lethosor
aee7b6b24d
Note about pthread/cmake <3.8 issue (from ragundo)
2019-07-20 17:11:11 -04:00
lethosor
99038c395a
Merge remote-tracking branch 'ab9rf/biometype' into develop
2019-07-20 16:32:46 -04:00
lethosor
ab9ad6f93e
Clean up *.cmake style
2019-07-20 16:17:44 -04:00
lethosor
8a07426643
Merge branch 'develop' into cmake-cleanup
2019-07-20 15:15:39 -04:00
lethosor
b6678d72ae
Move custom lualimit.h to lua dir and rename to dfhack_llimits.h
2019-07-20 14:26:30 -04:00
lethosor
ea0105fa66
Add CMake option to provide custom libstdc++ on macOS ( #1344 )
2019-07-20 11:21:44 -04:00
Pauli
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
Pauli
0605b9601c
Make Core::started thread safe
2019-07-18 23:05:11 -04:00
Pauli
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
Pauli
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
lethosor
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
lethosor
ea37eecfb1
Document and warn about old CMake versions with Ninja
...
Resolves #1369
2019-07-16 19:33:33 -04:00
lethosor
f7f937e4d3
Merge remote-tracking branch 'janxious/patch-2' into develop
...
Closes #1441
2019-07-15 23:22:43 -04:00