5db34339a5 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2018-07-03 18:17:04 -05:00  
				
					
						
							
							
								 
						
							
							
								4a0682133e 
								
									
								
							
								 
							
						 
						
							
							
								
								Annotate plugin proto files with the name of the plugin they are associated with.  
							
							
							
						 
						
							2018-07-03 15:54:30 -05:00  
				
					
						
							
							
								 
						
							
							
								df9150f302 
								
									
								
							
								 
							
						 
						
							
							
								
								Add documentation for RPC functions supported by RemoteFortressReader and ISOWorldRemote.  
							
							
							
						 
						
							2018-07-03 15:37:16 -05:00  
				
					
						
							
							
								 
						
							
							
								6839fde555 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove execute permission on files that are not executables.  
							
							
							
						 
						
							2018-07-03 15:37:16 -05:00  
				
					
						
							
							
								 
						
							
							
								616675f0ce 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/kittens_data_race_fix' into develop  
							
							
							
						 
						
							2018-07-03 00:30:36 -04:00  
				
					
						
							
							
								 
						
							
							
								81a7ddcf92 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/screen_show_memory_leak' into develop  
							
							
							
						 
						
							2018-07-02 22:58:11 -04:00  
				
					
						
							
							
								 
						
							
							
								7e91173289 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop-cf-autofix' into develop  
							
							
							
						 
						
							2018-07-02 13:44:20 -04:00  
				
					
						
							
							
								 
						
							
							
								f0ff96f614 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/multibyte_console' into develop  
							
							
							
						 
						
							2018-07-02 10:55:03 -04:00  
				
					
						
							
							
								 
						
							
							
								a08f08ae5f 
								
							
								 
							
						 
						
							
							
								
								[CodeFactor] Apply fixes  
							
							
							
						 
						
							2018-07-01 15:25:53 +00:00  
				
					
						
							
							
								 
						
							
							
								645ec0d591 
								
							
								 
							
						 
						
							
							
								
								Improve kittens thread safety and shutdown with core  
							
							... 
							
							
							
							The bools could use acquire&release memory order or even relaxed but I
didn't think code was worth auditing for such low level optimizations.
Sequantial consistent is fast enough but much harder to use incorrectly.
The timeLast is protected by CoreSuspender lock. plugin_update is only
called when CoreSuspender lock is held.
The last_menu is protected by trackmenu_flg loads and stores. 
							
						 
						
							2018-06-30 21:53:12 +03:00  
				
					
						
							
							
								 
						
							
							
								0727403ac1 
								
							
								 
							
						 
						
							
							
								
								Fix devel plugins linking in linux  
							
							
							
						 
						
							2018-06-30 21:12:42 +03:00  
				
					
						
							
							
								 
						
							
							
								105ddd86d8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/jsoncpp_upgrade_to_submodule' into develop  
							
							
							
						 
						
							2018-06-29 22:33:00 -04:00  
				
					
						
							
							
								 
						
							
							
								afd942a94b 
								
							
								 
							
						 
						
							
							
								
								ruby: Support automatic array size from index-enum  
							
							
							
						 
						
							2018-06-26 23:48:54 +03:00  
				
					
						
							
							
								 
						
							
							
								1fc37f8ddc 
								
							
								 
							
						 
						
							
							
								
								Checke Console::lineedit error return values  
							
							... 
							
							
							
							Console::lineedit can return -1 to indicate input error and -2 to
indicate the program is closing. But most users don't check possible
unusual return values which can lead to exit hang. 
							
						 
						
							2018-06-22 17:57:37 +03:00  
				
					
						
							
							
								 
						
							
							
								9c7bd562d4 
								
							
								 
							
						 
						
							
							
								
								fix-unit-occupancy, autogems: stop running while embarking  
							
							... 
							
							
							
							Related to #1286  fix 
							
						 
						
							2018-06-21 16:16:54 -04:00  
				
					
						
							
							
								 
						
							
							
								46e31305a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop  
							
							
							
						 
						
							2018-06-21 15:54:03 -04:00  
				
					
						
							
							
								 
						
							
							
								f20dae5a4c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/fix_dramp_to_check_jobs_1228' into develop  
							
							
							
						 
						
							2018-06-21 15:20:41 -04:00  
				
					
						
							
							
								 
						
							
							
								8e1a1851be 
								
							
								 
							
						 
						
							
							
								
								Removed temporary comments  
							
							
							
						 
						
							2018-06-21 21:00:59 +02:00  
				
					
						
							
							
								 
						
							
							
								9a8e251853 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:51:36 +02:00  
				
					
						
							
							
								 
						
							
							
								f02f4b8bcc 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:51:05 +02:00  
				
					
						
							
							
								 
						
							
							
								91aa16216b 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:50:30 +02:00  
				
					
						
							
							
								 
						
							
							
								1382c04696 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:49:49 +02:00  
				
					
						
							
							
								 
						
							
							
								14b0ea5b98 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:49:08 +02:00  
				
					
						
							
							
								 
						
							
							
								ad5328e119 
								
							
								 
							
						 
						
							
							
								
								Updated evil weather  
							
							
							
						 
						
							2018-06-21 20:48:35 +02:00  
				
					
						
							
							
								 
						
							
							
								42eadf97b0 
								
							
								 
							
						 
						
							
							
								
								Update stonesense ( #1302 ,  dfhack/df-structures#247 )  
							
							
							
						 
						
							2018-06-21 12:00:12 -04:00  
				
					
						
							
							
								 
						
							
							
								d9917e9a1d 
								
							
								 
							
						 
						
							
							
								
								cxxrandom: remove pragmas, fix format warnings, misc. cleanup  
							
							
							
						 
						
							2018-06-21 12:00:04 -04:00  
				
					
						
							
							
								 
						
							
							
								7a5e7c7c86 
								
							
								 
							
						 
						
							
							
								
								Rename unit_flags1.dead to killed, update submodules/changelog  
							
							... 
							
							
							
							Follow-up for dfhack/df-structures#247  
							
						 
						
							2018-06-21 11:17:09 -04:00  
				
					
						
							
							
								 
						
							
							
								46b6bfd3f7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/fix_stocks_to_filter_military_items_1288' into develop  
							
							
							
						 
						
							2018-06-21 00:04:06 -04:00  
				
					
						
							
							
								 
						
							
							
								b2fd0b062b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'PatrikLundell/dead_plugins' into develop  
							
							
							
						 
						
							2018-06-20 16:18:07 -04:00  
				
					
						
							
							
								 
						
							
							
								cdca28ddfa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of gh:dfhack/dfhack into develop  
							
							
							
						 
						
							2018-06-20 12:10:52 -04:00  
				
					
						
							
							
								 
						
							
							
								7036cc376b 
								
							
								 
							
						 
						
							
							
								
								Fix warnings in devel plugins introduced by  #1302  
							
							
							
						 
						
							2018-06-20 12:03:14 -04:00  
				
					
						
							
							
								 
						
							
							
								6077a8ce4c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/printf_warnings' into develop  
							
							
							
						 
						
							2018-06-20 11:25:14 -04:00  
				
					
						
							
							
								 
						
							
							
								862fa08ba6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop  
							
							
							
						 
						
							2018-06-20 11:00:43 -04:00  
				
					
						
							
							
								 
						
							
							
								f90eebdd2d 
								
							
								 
							
						 
						
							
							
								
								Add designation job check to deramp  
							
							... 
							
							
							
							Fixes  #1228  
						
							2018-06-20 15:54:31 +03:00  
				
					
						
							
							
								 
						
							
							
								bd0d36ec82 
								
							
								 
							
						 
						
							
							
								
								Fix stockpile inventory not to include inventory items  
							
							... 
							
							
							
							Inventory items have stale position information. The coordinates can be
very old if item is owned and continuesly carried for long time. The fix
checks if item is carried. To avoid filtering carried items that are
assigned (containers) to the stockpile the assignment needs to be
checked.
Fixes  #1288  
							
						 
						
							2018-06-19 18:06:28 +03:00  
				
					
						
							
							
								 
						
							
							
								9c59b7ff48 
								
							
								 
							
						 
						
							
							
								
								Fix unlikely memory leaks if Screen::show fails  
							
							... 
							
							
							
							The Screen::show takes ownership of the screen pointer. I decided to
switch the parameter to std::unique_ptr to make the pointer ownership
explicit. The unique_ptr then provides automatic screen destruction in
Screen::show unless pointer is inserted or is already in the linked list
that is managed by df. 
							
						 
						
							2018-06-19 16:41:31 +03:00  
				
					
						
							
							
								 
						
							
							
								6f7ace1f6d 
								
							
								 
							
						 
						
							
							
								
								stockpiles: Fix unusable and usable loading for weapon and armor  
							
							... 
							
							
							
							Fixes  #1294  
						
							2018-06-14 22:22:51 +03:00  
				
					
						
							
							
								 
						
							
							
								2b79b4cce7 
								
							
								 
							
						 
						
							
							
								
								Use jsoncpp 1.8.4 as a submodule  
							
							... 
							
							
							
							This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.
jsoncpp library name changes to jsoncpp_lib_static.
jsoncpp version is the latest tagged release. 
							
						 
						
							2018-06-14 21:20:46 +03:00  
				
					
						
							
							
								 
						
							
							
								aac892c560 
								
							
								 
							
						 
						
							
							
								
								Adapted to changed Units functions  
							
							... 
							
							
							
							Squashed version of #1307 
Closes  #1307  
							
						 
						
							2018-06-14 10:30:35 -04:00  
				
					
						
							
							
								 
						
							
							
								cf780ce035 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:35:17 +02:00  
				
					
						
							
							
								 
						
							
							
								cac749429a 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:34:41 +02:00  
				
					
						
							
							
								 
						
							
							
								3be27a49b5 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isInactive  
							
							
							
						 
						
							2018-06-14 12:33:18 +02:00  
				
					
						
							
							
								 
						
							
							
								f076d00ede 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:32:38 +02:00  
				
					
						
							
							
								 
						
							
							
								b38dfe2e43 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:31:52 +02:00  
				
					
						
							
							
								 
						
							
							
								da0aa85b05 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:31:15 +02:00  
				
					
						
							
							
								 
						
							
							
								aa361f3a0d 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:30:41 +02:00  
				
					
						
							
							
								 
						
							
							
								6901c53bd5 
								
							
								 
							
						 
						
							
							
								
								dead flag -> !isActive  
							
							
							
						 
						
							2018-06-14 12:29:48 +02:00  
				
					
						
							
							
								 
						
							
							
								897a818f4c 
								
							
								 
							
						 
						
							
							
								
								Switch to Units functions  
							
							
							
						 
						
							2018-06-14 09:42:45 +02:00  
				
					
						
							
							
								 
						
							
							
								39194e5e38 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11)  
							
							
							
						 
						
							2018-06-13 16:08:41 -04:00  
				
					
						
							
							
								 
						
							
							
								cddb1b59e1 
								
							
								 
							
						 
						
							
							
								
								title-version: move to bottom of options screen  
							
							... 
							
							
							
							This avoids overlapping the window border when a world is loaded 
							
						 
						
							2018-06-13 15:57:13 -04:00