Japa
							
						 | 
						
							
							
							
							
								
							
								7b19c9b8f0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/DFHack/develop' into RemoteServerUnsafe
							
							
							
							
							
							
							
							# Conflicts:
#	plugins/proto/RemoteFortressReader.proto
#	plugins/remotefortressreader/remotefortressreader.cpp
#	scripts 
							
						 | 
						
							2018-02-12 20:19:40 +05:30 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								23d02a642d
								
							
								
							
						 | 
						
							
							
								
								Make tweak pausing-fps-counter non-default for now
							
							
							
							
							
							
							
							Ref #1219 
							
						 | 
						
							2018-02-12 01:48:09 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								3a122d7391
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'danamlund/better-fps-counter' into develop
							
							
							
							
							
						 | 
						
							2018-02-12 01:21:14 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								6260062d05
								
							
								
							
						 | 
						
							
							
								
								Add basic embark-assistant docs (closes #1226)
							
							
							
							
							
						 | 
						
							2018-02-11 03:08:02 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								269d575267
								
							
								
							
						 | 
						
							
							
								
								Document environment variables
							
							
							
							
							
						 | 
						
							2018-02-11 03:07:25 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								c136bcbaba
								
							
								
							
						 | 
						
							
							
								
								Update NEWS
							
							
							
							
							
						 | 
						
							2018-02-11 02:47:41 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								b2fb696473
								
							
								
							
						 | 
						
							
							
								
								Update scripts
							
							
							
							
							
						 | 
						
							2018-02-11 02:38:50 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								ca29cb8e6f
								
							
								
							
						 | 
						
							
							
								
								embark-assistant: update field names, now compiles
							
							
							
							
							
						 | 
						
							2018-02-10 17:51:02 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								ef3adbe816
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
							
							
							
							
							
						 | 
						
							2018-02-10 17:27:13 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								9fe9e64f09
								
							
								
							
						 | 
						
							
							
								
								Add dtimm to Authors.rst (#1180)
							
							
							
							
							
						 | 
						
							2018-02-10 03:04:40 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								9a0befa4cb
								
							
								
							
						 | 
						
							
							
								
								Show number of trees skipped
							
							
							
							
							
						 | 
						
							2018-02-10 03:03:07 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								342f193409
								
							
								
							
						 | 
						
							
							
								
								autochop: store skip settings in one field, fix double colon and initial load
							
							
							
							
							
							
							
							language_name fields default to -1, so the new settings could have been enabled
on all worlds by default. 
							
						 | 
						
							2018-02-10 02:07:36 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								6a758c70a8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'dtimm/develop' into develop
							
							
							
							
							
						 | 
						
							2018-02-10 01:47:06 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								55f5439ddf
								
							
								
							
						 | 
						
							
							
								
								dwarfmonitor: remove unused hook, use CoreSuspendClaimer
							
							
							
							
							
						 | 
						
							2018-02-09 02:07:08 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								19b65c2d1e
								
							
								
							
						 | 
						
							
							
								
								Remove Error.h include (#1224)
							
							
							
							
							
						 | 
						
							2018-02-07 20:14:36 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								65eb0e5fbd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'BenLubar/msvc-error' into develop
							
							
							
							
							
						 | 
						
							2018-02-07 20:08:51 -05:00 | 
						
					
				
					
						
							
							
								 
								Ben Lubar
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7ab8d74ac9
								
									
								
							
								
							
						 | 
						
							
							
								
								Add mising Error.cpp reference to dfhack-client
							
							
							
							
							
						 | 
						
							2018-02-07 14:32:27 -06:00 | 
						
					
				
					
						
							
							
								 
								Ben Lubar
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7426f08504
								
									
								
							
								
							
						 | 
						
							
							
								
								Fix Error.cpp compile for Windows
							
							
							
							
							
						 | 
						
							2018-02-07 10:40:52 -06:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								a37ac2c349
								
							
								
							
						 | 
						
							
							
								
								Re-enable IRC notifications
							
							
							
							
							
						 | 
						
							2018-02-05 19:22:07 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								bc6acfa24e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'lethosor/travis-df' into develop
							
							
							
							
							
						 | 
						
							2018-02-05 19:21:13 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								c1e2633e17
								
							
								
							
						 | 
						
							
							
								
								Refactor DFHack exception classes
							
							
							
							
							
							
							
							Move implementations out of MiscUtils.cpp to Error.cpp and make what() return a
more useful description 
							
						 | 
						
							2018-02-05 19:18:35 -05:00 | 
						
					
				
					
						
							
							
								 
								Lethosor
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6d33069fe9
								
									
								
							
								
							
						 | 
						
							
							
								
								Fix more copy-paste errors
							
							
							
							
							
						 | 
						
							2018-02-05 10:41:36 -05:00 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								7f8ea9e82c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'DFHack/develop' into remote_control
							
							
							
							
							
						 | 
						
							2018-02-05 20:11:55 +05:30 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								9a032ac447
								
							
								
							
						 | 
						
							
							
								
								I'm a moron.
							
							
							
							
							
						 | 
						
							2018-02-05 20:11:47 +05:30 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								c92227f007
								
							
								
							
						 | 
						
							
							
								
								Update news (RFR, #1214)
							
							
							
							
							
						 | 
						
							2018-02-04 23:02:12 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								b2a19dedeb
								
							
								
							
						 | 
						
							
							
								
								load-art-image-chunk: safety check
							
							
							
							
							
						 | 
						
							2018-02-04 22:56:24 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								2af5f7ab87
								
							
								
							
						 | 
						
							
							
								
								Add test runner
							
							
							
							
							
						 | 
						
							2018-02-04 16:00:53 -05:00 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								78061085c6
								
							
								
							
						 | 
						
							
							
								
								Add art image properties to RFR
							
							
							
							
							
						 | 
						
							2018-02-04 16:02:02 +05:30 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								23efb1cbf1
								
							
								
							
						 | 
						
							
							
								
								Run startup commands in dfhack_travis.init
							
							
							
							
							
						 | 
						
							2018-02-04 02:27:09 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								2de28d4357
								
							
								
							
						 | 
						
							
							
								
								Fix bash compat issues
							
							
							
							
							
						 | 
						
							2018-02-04 02:13:20 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								4aa0990dc7
								
							
								
							
						 | 
						
							
							
								
								Fix issue with DF not quitting
							
							
							
							
							
						 | 
						
							2018-02-04 02:09:18 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								f8a9557562
								
							
								
							
						 | 
						
							
							
								
								Exit with pop-screen
							
							
							
							
							
						 | 
						
							2018-02-04 00:36:19 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								a5cca75715
								
							
								
							
						 | 
						
							
							
								
								headless: Disable sound, wgetch
							
							
							
							
							
						 | 
						
							2018-02-04 00:17:46 -05:00 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								956d0ce363
								
							
								
							
						 | 
						
							
							
								
								update submodules.
							
							
							
							
							
						 | 
						
							2018-02-04 10:30:49 +05:30 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								638f0ab35a
								
							
								
							
						 | 
						
							
							
								
								Add "headless" mode, use in travis
							
							
							
							
							
						 | 
						
							2018-02-03 23:59:01 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								78c60e249e
								
							
								
							
						 | 
						
							
							
								
								Set PRINT_MODE:TEXT
							
							
							
							
							
						 | 
						
							2018-02-03 23:56:44 -05:00 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								60c1bd3c66
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/DFHack/develop'
							
							
							
							
							
							
							
							Conflicts:
	library/xml 
							
						 | 
						
							2018-02-04 10:26:39 +05:30 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								ed406e0e3d
								
							
								
							
						 | 
						
							
							
								
								fix naming and return statement.
							
							
							
							
							
						 | 
						
							2018-02-04 10:24:51 +05:30 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								c621a29fe3
								
							
								
							
						 | 
						
							
							
								
								Fix global name.
							
							
							
							
							
						 | 
						
							2018-02-04 10:21:28 +05:30 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								38140fb450
								
							
								
							
						 | 
						
							
							
								
								Copy engravings in RFR, and update the art image function.
							
							
							
							
							
						 | 
						
							2018-02-04 10:12:15 +05:30 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								b54a35ce5d
								
							
								
							
						 | 
						
							
							
								
								Build 64-bit DFHack, install SDL
							
							
							
							
							
						 | 
						
							2018-02-03 23:26:43 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								39b488a103
								
							
								
							
						 | 
						
							
							
								
								Download/install DF
							
							
							
							
							
						 | 
						
							2018-02-03 23:17:58 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								d71e252b50
								
							
								
							
						 | 
						
							
							
								
								Bump to r1
							
							
							
							
							
						 | 
						
							2018-02-03 22:17:28 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								bdba95f90c
								
							
								
							
						 | 
						
							
							
								
								memview: check for tags from sizecheck
							
							
							
							
							
						 | 
						
							2018-02-03 18:10:16 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								e88ba60ba5
								
							
								
							
						 | 
						
							
							
								
								Document "dig" priority arguments
							
							
							
							
							
						 | 
						
							2018-02-03 18:08:15 -05:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								426839aac2
								
							
								
							
						 | 
						
							
							
								
								Update scripts, xml, NEWS for dfhack/scripts#37
							
							
							
							
							
						 | 
						
							2018-02-03 17:59:26 -05:00 | 
						
					
				
					
						
							
							
								 
								Dan Amlund
							
						 | 
						
							
							
							
							
								
							
								6181b2bce3
								
							
								
							
						 | 
						
							
							
								
								Add tweak that replaces dwarf mode FPS counter with one that does not count when paused
							
							
							
							
							
						 | 
						
							2018-02-03 17:58:24 +01:00 | 
						
					
				
					
						
							
							
								 
								lethosor
							
						 | 
						
							
							
							
							
								
							
								636448f431
								
							
								
							
						 | 
						
							
							
								
								Update changelog
							
							
							
							
							
						 | 
						
							2018-02-03 03:28:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								c8747a772b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/remote_control' into remote_control
							
							
							
							
							
						 | 
						
							2018-02-03 11:10:30 +05:30 | 
						
					
				
					
						
							
							
								 
								Japa
							
						 | 
						
							
							
							
							
								
							
								0f43c07334
								
							
								
							
						 | 
						
							
							
								
								update xml
							
							
							
							
							
						 | 
						
							2018-02-03 11:10:26 +05:30 |