cc4a42a901 
								
							
								 
							
						 
						
							
							
								
								Re-comment out the UI stuff.  
							
							
							
						 
						
							2023-01-06 19:43:54 -08:00  
				
					
						
							
							
								 
						
							
							
								e62fa8fe0d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'DFHack/develop' into develop  
							
							... 
							
							
							
							# Conflicts:
#	library/xml
#	plugins/remotefortressreader/adventure_control.cpp
#	plugins/remotefortressreader/dwarf_control.cpp 
							
						 
						
							2023-01-06 19:25:19 -08:00  
				
					
						
							
							
								 
						
							
							
								3e4861b54b 
								
							
								 
							
						 
						
							
							
								
								fix persistence for changed file structure  
							
							... 
							
							
							
							`data/save` -> `save` 
							
						 
						
							2023-01-06 21:24:01 -06:00  
				
					
						
							
							
								 
						
							
							
								fe9d1e186e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2562  from myk002/myk_greenify  
							
							... 
							
							
							
							allow color options for CycleHotkeyLabel 
							
						 
						
							2023-01-06 19:10:39 -08:00  
				
					
						
							
							
								 
						
							
							
								e24d81cb4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2558  from myk002/myk_z  
							
							... 
							
							
							
							refine and document ZScreen 
							
						 
						
							2023-01-06 19:09:14 -08:00  
				
					
						
							
							
								 
						
							
							
								093eac3eb2 
								
									
								
							
								 
							
						 
						
							
							
								
								use a black background for non-top ZScreen titles  
							
							
							
						 
						
							2023-01-06 18:58:08 -08:00  
				
					
						
							
							
								 
						
							
							
								810430f1a2 
								
									
								
							
								 
							
						 
						
							
							
								
								make windows lockable (can ignore r-click and esc)  
							
							
							
						 
						
							2023-01-06 18:48:53 -08:00  
				
					
						
							
							
								 
						
							
							
								1f5ae4165f 
								
									
								
							
								 
							
						 
						
							
							
								
								return self from raise, update docs  
							
							
							
						 
						
							2023-01-06 15:43:08 -08:00  
				
					
						
							
							
								 
						
							
							
								fccefd1155 
								
									
								
							
								 
							
						 
						
							
							
								
								don't pass through handled r-clicks  
							
							
							
						 
						
							2023-01-06 15:43:08 -08:00  
				
					
						
							
							
								 
						
							
							
								f43358002d 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow dialogs to close on r-click  
							
							
							
						 
						
							2023-01-06 15:43:08 -08:00  
				
					
						
							
							
								 
						
							
							
								96f19621c9 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2023-01-06 15:43:06 -08:00  
				
					
						
							
							
								 
						
							
							
								fbf895fe0c 
								
									
								
							
								 
							
						 
						
							
							
								
								document ZScreen (and view:getMouseFramePos())  
							
							
							
						 
						
							2023-01-06 15:42:41 -08:00  
				
					
						
							
							
								 
						
							
							
								574be3fe73 
								
									
								
							
								 
							
						 
						
							
							
								
								provide a useful default impl of isMouseOver  
							
							
							
						 
						
							2023-01-06 15:42:40 -08:00  
				
					
						
							
							
								 
						
							
							
								f15e9e3577 
								
									
								
							
								 
							
						 
						
							
							
								
								don't revert to plain strings for pens  
							
							
							
						 
						
							2023-01-06 15:42:30 -08:00  
				
					
						
							
							
								 
						
							
							
								e111a73763 
								
									
								
							
								 
							
						 
						
							
							
								
								allow color options for CycleHotkeyLabel  
							
							... 
							
							
							
							and use the option to render `On` in green for ToggleHotkeyLabel 
							
						 
						
							2023-01-06 15:42:27 -08:00  
				
					
						
							
							
								 
						
							
							
								18e17e4e36 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2565  from myk002/myk_docs  
							
							... 
							
							
							
							Amalgamation of docs PRs 
							
						 
						
							2023-01-06 15:40:32 -08:00  
				
					
						
							
							
								 
						
							
							
								1a8f60c03b 
								
									
								
							
								 
							
						 
						
							
							
								
								implement remaining review comments from  #2517  
							
							
							
						 
						
							2023-01-06 15:31:50 -08:00  
				
					
						
							
							
								 
						
							
							
								91df585bf8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into myk_docs  
							
							
							
						 
						
							2023-01-06 15:22:03 -08:00  
				
					
						
							
							
								 
						
							
							
								8264415720 
								
									
								
							
								 
							
						 
						
							
							
								
								Update docs/dev/building/Compile.rst  
							
							
							
						 
						
							2023-01-06 15:11:10 -08:00  
				
					
						
							
							
								 
						
							
							
								5825a26ffb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2564  from myk002/myk_get_df_screen  
							
							... 
							
							
							
							add Gui::getDFViewscreen and Lua binding 
							
						 
						
							2023-01-06 15:09:42 -08:00  
				
					
						
							
							
								 
						
							
							
								394cc1a193 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2563  from ab9rf/5005-reveal  
							
							... 
							
							
							
							enable reveal for v50 
							
						 
						
							2023-01-06 12:48:26 -08:00  
				
					
						
							
							
								 
						
							
							
								5e9ddd9a36 
								
							
								 
							
						 
						
							
							
								
								reveal: vertical whitespaec  
							
							
							
						 
						
							2023-01-06 14:34:59 -06:00  
				
					
						
							
							
								 
						
							
							
								6f46ae672e 
								
									
								
							
								 
							
						 
						
							
							
								
								add Gui::getDFViewscreen and Lua binding  
							
							
							
						 
						
							2023-01-06 12:17:36 -08:00  
				
					
						
							
							
								 
						
							
							
								779e159512 
								
							
								 
							
						 
						
							
							
								
								enable reveal  
							
							... 
							
							
							
							`reveal demon` is disabled due to double popup bug
`reveal` also has guidance text that appears if the player is in graphics mode explaining the limitations of the new renderer 
							
						 
						
							2023-01-06 13:56:19 -06:00  
				
					
						
							
							
								 
						
							
							
								83e5bc120a 
								
							
								 
							
						 
						
							
							
								
								set_df_path: handle cancel correctly  
							
							
							
						 
						
							2023-01-06 12:02:56 -06:00  
				
					
						
							
							
								 
						
							
							
								9de09ac779 
								
									
								
							
								 
							
						 
						
							
							
								
								bump version to 50.05  
							
							
							
						 
						
							2023-01-06 08:50:10 -06:00  
				
					
						
							
							
								 
						
							
							
								42d572cd03 
								
							
								 
							
						 
						
							
							
								
								set-df-path: accept path on command line  
							
							
							
						 
						
							2023-01-06 08:31:54 -06:00  
				
					
						
							
							
								 
						
							
							
								79206c92a7 
								
							
								 
							
						 
						
							
							
								
								modern windows terminal + powershell is, (un?)fortunately superior to cygwin's, so cut this for simplification  
							
							
							
						 
						
							2023-01-06 21:26:57 +11:00  
				
					
						
							
							
								 
						
							
							
								d7495bfdf8 
								
							
								 
							
						 
						
							
							
								
								update the install documentation to mention VS2022 properly  
							
							
							
						 
						
							2023-01-06 21:26:57 +11:00  
				
					
						
							
							
								 
						
							
							
								1540e7c294 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							library/xml: master
scripts: master 
							
						 
						
							2023-01-06 07:13:54 +00:00  
				
					
						
							
							
								 
						
							
							
								f4d059ea3d 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							library/xml: master
scripts: master 
							
						 
						
							2023-01-06 02:43:42 +00:00  
				
					
						
							
							
								 
						
							
							
								a59f1518c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2556  from myk002/myk_zscreen  
							
							... 
							
							
							
							framework for passthru, z-order swapping windows 
							
						 
						
							2023-01-05 18:41:57 -08:00  
				
					
						
							
							
								 
						
							
							
								9eb5165ebe 
								
							
								 
							
						 
						
							
							
								
								Auto-update submodules  
							
							... 
							
							
							
							library/xml: master 
							
						 
						
							2023-01-06 02:11:27 +00:00  
				
					
						
							
							
								 
						
							
							
								1934014659 
								
									
								
							
								 
							
						 
						
							
							
								
								framework for passthru, z-order swapping windows  
							
							
							
						 
						
							2023-01-05 18:07:38 -08:00  
				
					
						
							
							
								 
						
							
							
								8479023dd8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2557  from myk002/myk_rename2  
							
							... 
							
							
							
							Rename renamed global names 
							
						 
						
							2023-01-05 18:04:57 -08:00  
				
					
						
							
							
								 
						
							
							
								3969262e44 
								
									
								
							
								 
							
						 
						
							
							
								
								update submodule refs  
							
							
							
						 
						
							2023-01-05 17:50:49 -08:00  
				
					
						
							
							
								 
						
							
							
								845391f4e6 
								
									
								
							
								 
							
						 
						
							
							
								
								fix overzealous "ui" -> "plotinfo" replacement  
							
							... 
							
							
							
							some comments were just talking about the UI.. 
							
						 
						
							2023-01-05 17:46:30 -08:00  
				
					
						
							
							
								 
						
							
							
								c4a2bdd08e 
								
									
								
							
								 
							
						 
						
							
							
								
								update lua too  
							
							
							
						 
						
							2023-01-05 17:35:33 -08:00  
				
					
						
							
							
								 
						
							
							
								5e5775f5e3 
								
									
								
							
								 
							
						 
						
							
							
								
								rename globals according to structures update  
							
							
							
						 
						
							2023-01-05 17:11:01 -08:00  
				
					
						
							
							
								 
						
							
							
								a5b11065db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2547  from lethosor/codegen-stl-map-stub+v50  
							
							... 
							
							
							
							[v50] Add read-only container_identity for std::map 
							
						 
						
							2023-01-05 15:35:27 -08:00  
				
					
						
							
							
								 
						
							
							
								412531bf03 
								
									
								
							
								 
							
						 
						
							
							
								
								really fix the format string this time  
							
							
							
						 
						
							2023-01-04 21:29:45 -08:00  
				
					
						
							
							
								 
						
							
							
								9cbcd81f63 
								
									
								
							
								 
							
						 
						
							
							
								
								fix format strings for vars that were size_t  
							
							
							
						 
						
							2023-01-04 21:24:52 -08:00  
				
					
						
							
							
								 
						
							
							
								ba6c126c38 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2554  from myk002/myk_dynamic_config  
							
							... 
							
							
							
							Remove dfhack-config from release tarball 
							
						 
						
							2023-01-04 19:45:53 -08:00  
				
					
						
							
							
								 
						
							
							
								c70c4131bd 
								
									
								
							
								 
							
						 
						
							
							
								
								don't include dfhack-config/ in release tarball  
							
							... 
							
							
							
							create it at runtime
move files around so no dfhack-owned files are in there 
							
						 
						
							2023-01-04 19:41:58 -08:00  
				
					
						
							
							
								 
						
							
							
								d0fff7692e 
								
									
								
							
								 
							
						 
						
							
							
								
								move dfhack-config into data  
							
							
							
						 
						
							2023-01-04 19:41:10 -08:00  
				
					
						
							
							
								 
						
							
							
								b62cfa3699 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2552  from myk002/myk_mouse  
							
							... 
							
							
							
							Get correct mouse button down behavior in Lua without overwriting enabler fields 
							
						 
						
							2023-01-04 19:39:43 -08:00  
				
					
						
							
							
								 
						
							
							
								78be3a6463 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2548  from myk002/myk_logo  
							
							... 
							
							
							
							Display DFHack logo for the hotkeys overlay widget 
							
						 
						
							2023-01-04 19:06:05 -08:00  
				
					
						
							
							
								 
						
							
							
								e9a5ec13af 
								
									
								
							
								 
							
						 
						
							
							
								
								update logo image  
							
							
							
						 
						
							2023-01-04 17:55:01 -08:00  
				
					
						
							
							
								 
						
							
							
								4e51e02924 
								
									
								
							
								 
							
						 
						
							
							
								
								move SDL shims to a new DFSDL module  
							
							
							
						 
						
							2023-01-04 17:15:32 -08:00  
				
					
						
							
							
								 
						
							
							
								0d18dd508a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'DFHack/develop' into develop  
							
							... 
							
							
							
							# Conflicts:
#	library/xml 
							
						 
						
							2023-01-04 15:02:33 -08:00