ce0eb1aa48 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							scripts: master 
							
						 
						
							2023-09-02 11:18:15 +00:00  
				
					
						
							
							
								 
						
							
							
								c7b84a4b10 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3723  from myk002/myk_terminal  
							
							... 
							
							
							
							clarify error message about the terminal 
							
						 
						
							2023-09-02 03:30:28 -07:00  
				
					
						
							
							
								 
						
							
							
								b489fceaea 
								
									
								
							
								 
							
						 
						
							
							
								
								clarify error message about the terminal  
							
							
							
						 
						
							2023-09-02 03:22:10 -07:00  
				
					
						
							
							
								 
						
							
							
								9e744de218 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3722  from myk002/myk_dialog  
							
							... 
							
							
							
							[dialogs.MessageBox] fix spacing around text when a scrollbar is involved 
							
						 
						
							2023-09-02 03:21:13 -07:00  
				
					
						
							
							
								 
						
							
							
								874fb5535b 
								
									
								
							
								 
							
						 
						
							
							
								
								fix spacing around messagebox text when a scrollbar is involved  
							
							
							
						 
						
							2023-09-02 02:41:26 -07:00  
				
					
						
							
							
								 
						
							
							
								e685e238de 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3721  from myk002/myk_autobutcher  
							
							... 
							
							
							
							[autobutcher] fix handling of ticks parameter 
							
						 
						
							2023-09-02 02:36:27 -07:00  
				
					
						
							
							
								 
						
							
							
								6096165eee 
								
									
								
							
								 
							
						 
						
							
							
								
								fix handling of ticks parameter  
							
							
							
						 
						
							2023-09-02 02:03:03 -07:00  
				
					
						
							
							
								 
						
							
							
								946e68ae30 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3720  from myk002/myk_stock_doc  
							
							... 
							
							
							
							[stockpiles] document stockpiles/logistics overlay 
							
						 
						
							2023-09-02 01:00:43 -07:00  
				
					
						
							
							
								 
						
							
							
								251fb0bf4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3719  from myk002/myk_win64  
							
							... 
							
							
							
							unclutter build command 
							
						 
						
							2023-09-02 00:55:45 -07:00  
				
					
						
							
							
								 
						
							
							
								d9c9c7c53b 
								
									
								
							
								 
							
						 
						
							
							
								
								update libzip ref  
							
							
							
						 
						
							2023-09-02 00:32:51 -07:00  
				
					
						
							
							
								 
						
							
							
								2349c6f1de 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							scripts: master 
							
						 
						
							2023-09-02 07:11:38 +00:00  
				
					
						
							
							
								 
						
							
							
								0bdba60ede 
								
									
								
							
								 
							
						 
						
							
							
								
								fix build command  
							
							
							
						 
						
							2023-09-01 23:43:49 -07:00  
				
					
						
							
							
								 
						
							
							
								15da5f235d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3718  from myk002/myk_sort_wording  
							
							... 
							
							
							
							[sort] label updates for squad sort options 
							
						 
						
							2023-09-01 21:31:50 -07:00  
				
					
						
							
							
								 
						
							
							
								8e6775a053 
								
									
								
							
								 
							
						 
						
							
							
								
								document stockpiles/logistics overlay  
							
							
							
						 
						
							2023-09-01 18:45:50 -07:00  
				
					
						
							
							
								 
						
							
							
								c791560be3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3717  from myk002/myk_ccache  
							
							... 
							
							
							
							zero ccache stats between runs 
							
						 
						
							2023-09-01 18:18:17 -07:00  
				
					
						
							
							
								 
						
							
							
								426099f82b 
								
									
								
							
								 
							
						 
						
							
							
								
								label updates for squad sort options  
							
							
							
						 
						
							2023-09-01 14:35:55 -07:00  
				
					
						
							
							
								 
						
							
							
								a3f6447aab 
								
									
								
							
								 
							
						 
						
							
							
								
								light help wording update for Dreamfort blueprints  
							
							
							
						 
						
							2023-09-01 12:45:36 -07:00  
				
					
						
							
							
								 
						
							
							
								7abb82d7e9 
								
									
								
							
								 
							
						 
						
							
							
								
								zero ccache stats between runs  
							
							... 
							
							
							
							and allow the cache to expand past the persisted max size during the build 
							
						 
						
							2023-09-01 12:20:52 -07:00  
				
					
						
							
							
								 
						
							
							
								0550562859 
								
									
								
							
								 
							
						 
						
							
							
								
								bump to 50.09-r3rc3  
							
							
							
						 
						
							2023-09-01 11:44:51 -07:00  
				
					
						
							
							
								 
						
							
							
								951c0b530f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3715  from myk002/myk_hide_logo_load_game  
							
							... 
							
							
							
							[hotkeys] hide the DFHack logo while loading a game 
							
						 
						
							2023-09-01 11:28:31 -07:00  
				
					
						
							
							
								 
						
							
							
								702992b6f5 
								
									
								
							
								 
							
						 
						
							
							
								
								hide the DFHack logo while loading a game  
							
							... 
							
							
							
							so the textures don't visibly flicker
revert this once textures are flicker free 
							
						 
						
							2023-08-31 23:06:05 -07:00  
				
					
						
							
							
								 
						
							
							
								8791825ccc 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							scripts: master 
							
						 
						
							2023-09-01 03:26:52 +00:00  
				
					
						
							
							
								 
						
							
							
								a0cdee7901 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3714  from myk002/myk_squadv2  
							
							... 
							
							
							
							[sort] implement suggestions from squad assignment screen feedback 
							
						 
						
							2023-08-31 20:25:56 -07:00  
				
					
						
							
							
								 
						
							
							
								ffc884d69d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix migrant wave ordering  
							
							... 
							
							
							
							use active index instead of unit id 
							
						 
						
							2023-08-31 19:42:02 -07:00  
				
					
						
							
							
								 
						
							
							
								52543f9fc0 
								
									
								
							
								 
							
						 
						
							
							
								
								clean out unused code/vars  
							
							
							
						 
						
							2023-08-31 19:14:47 -07:00  
				
					
						
							
							
								 
						
							
							
								afb26b9ddd 
								
									
								
							
								 
							
						 
						
							
							
								
								add requested filters for squad assignment screen  
							
							... 
							
							
							
							and redo layout as a vertical panel since there's not enough space
otherwise 
							
						 
						
							2023-08-31 19:10:18 -07:00  
				
					
						
							
							
								 
						
							
							
								c5e5b29a25 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3710  from myk002/myk_tailor  
							
							... 
							
							
							
							[tailor] fix status output character encoding 
							
						 
						
							2023-08-31 18:14:38 -07:00  
				
					
						
							
							
								 
						
							
							
								940d25accb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3711  from myk002/myk_instrument_textures  
							
							... 
							
							
							
							[Textures] instrument textures module 
							
						 
						
							2023-08-31 18:14:18 -07:00  
				
					
						
							
							
								 
						
							
							
								75df1c0426 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3713  from lethosor/fix-removejob-gcc-optimization  
							
							... 
							
							
							
							Hack to force GCC to invoke cancel_job() through DF's vtable 
							
						 
						
							2023-08-31 15:27:56 -07:00  
				
					
						
							
							
								 
						
							
							
								8cffe3bc87 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3712  from myk002/myk_relwithdebinfo  
							
							... 
							
							
							
							remove unneeded modification of CMAKE_CXX_FLAGS_RELWITHDEBINFO 
							
						 
						
							2023-08-31 14:53:06 -07:00  
				
					
						
							
							
								 
						
							
							
								bb79755efd 
								
									
								
							
								 
							
						 
						
							
							
								
								Add test that removeJob() actually removes jobs  
							
							
							
						 
						
							2023-08-31 17:42:17 -04:00  
				
					
						
							
							
								 
						
							
							
								40bfb6b8ff 
								
									
								
							
								 
							
						 
						
							
							
								
								Hack to force GCC to invoke cancel_job() through DF's vtable  
							
							... 
							
							
							
							GCC appears to be optimizing the call to `cancel_job()` to use the stub in
*DFHack's* job_handler vtable, which is a no-op. Lua was unaffected because it
invokes vmethods through method pointers (without knowing the target instance at
compile time), so use a similar approach here for now.
As mentioned by @ab9rf on Discord, we should pursue an alternative like asking
Bay12 to expose the relevant code through a global `std::function` instead of a
vmethod. 
							
						 
						
							2023-08-31 17:42:16 -04:00  
				
					
						
							
							
								 
						
							
							
								cf53283f33 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unneeded modification of CMAKE_CXX_FLAGS_RELWITHDEBINFO  
							
							... 
							
							
							
							-g is already in the flags, we just end up adding it a second time 
							
						 
						
							2023-08-31 14:14:45 -07:00  
				
					
						
							
							
								 
						
							
							
								088fa9a35c 
								
									
								
							
								 
							
						 
						
							
							
								
								instrument textures module and clean up gui  
							
							
							
						 
						
							2023-08-31 10:53:43 -07:00  
				
					
						
							
							
								 
						
							
							
								38ece5aa93 
								
									
								
							
								 
							
						 
						
							
							
								
								fix status output character encoding  
							
							... 
							
							
							
							so dwarf and item names and item descriptions are printed correctly 
							
						 
						
							2023-08-31 06:03:52 -07:00  
				
					
						
							
							
								 
						
							
							
								07e8e83837 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3698  from Halifay/advanced_military_sorting  
							
							... 
							
							
							
							Enhancing Military Candidate Selection 
							
						 
						
							2023-08-30 23:52:18 -07:00  
				
					
						
							
							
								 
						
							
							
								742c8bbfb8 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							scripts: master 
							
						 
						
							2023-08-31 06:32:03 +00:00  
				
					
						
							
							
								 
						
							
							
								4a788e79c3 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply suggestions from code review  
							
							
							
						 
						
							2023-08-30 23:26:03 -07:00  
				
					
						
							
							
								 
						
							
							
								2c97ab9c8d 
								
							
								 
							
						 
						
							
							
								
								Tidying up melee skill and ranged skill funcitons in sort.lua.  
							
							
							
						 
						
							2023-08-30 17:16:59 +03:00  
				
					
						
							
							
								 
						
							
							
								5d7649837c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3704  from shevernitskiy/create-delete-textures  
							
							... 
							
							
							
							create and delete textures 
							
						 
						
							2023-08-30 03:42:27 -07:00  
				
					
						
							
							
								 
						
							
							
								47a22025a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:48 +03:00  
				
					
						
							
							
								 
						
							
							
								02d33e532d 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:40 +03:00  
				
					
						
							
							
								 
						
							
							
								63913567cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:28 +03:00  
				
					
						
							
							
								 
						
							
							
								72a985c3b0 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:17 +03:00  
				
					
						
							
							
								 
						
							
							
								a2d1d416c4 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:09 +03:00  
				
					
						
							
							
								 
						
							
							
								14c4e948ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:49:01 +03:00  
				
					
						
							
							
								 
						
							
							
								72dbb68a5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:48:54 +03:00  
				
					
						
							
							
								 
						
							
							
								c0ac7ad8a2 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:48:47 +03:00  
				
					
						
							
							
								 
						
							
							
								13e0a49eef 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:48:36 +03:00  
				
					
						
							
							
								 
						
							
							
								b3d423b8a4 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/Lua API.rst  
							
							... 
							
							
							
							Co-authored-by: Myk <myk.taylor@gmail.com> 
							
						 
						
							2023-08-30 12:48:26 +03:00