1be75f269b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_dreamfort' into develop  
							
							... 
							
							
							
							+typo fix in quickfort-alias-guide.rst 
							
						 
						
							2021-02-20 00:47:59 -05:00  
				
					
						
							
							
								 
						
							
							
								cc51835660 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_stockpile_containers_docs' into develop  
							
							
							
						 
						
							2021-02-20 00:38:34 -05:00  
				
					
						
							
							
								 
						
							
							
								e2bda663d0 
								
									
								
							
								 
							
						 
						
							
							
								
								Use auth token to clone repo  
							
							... 
							
							
							
							This should fix pushing, since DFHack-Urist now has permission to push to develop. 
							
						 
						
							2021-02-19 23:45:51 -05:00  
				
					
						
							
							
								 
						
							
							
								3278519c98 
								
									
								
							
								 
							
						 
						
							
							
								
								document how to specify containers for stockpiles  
							
							... 
							
							
							
							that are not specified with expansion syntax 
							
						 
						
							2021-02-19 11:43:10 -08:00  
				
					
						
							
							
								 
						
							
							
								de9375574a 
								
									
								
							
								 
							
						 
						
							
							
								
								fix syntax error  
							
							
							
						 
						
							2021-02-18 23:25:21 -08:00  
				
					
						
							
							
								 
						
							
							
								3e6294198b 
								
									
								
							
								 
							
						 
						
							
							
								
								update wording of fortplan deprecation notice  
							
							
							
						 
						
							2021-02-18 23:23:50 -08:00  
				
					
						
							
							
								 
						
							
							
								b3666da0a6 
								
									
								
							
								 
							
						 
						
							
							
								
								fix wheelbarrow UI change attribution  
							
							
							
						 
						
							2021-02-18 23:11:09 -08:00  
				
					
						
							
							
								 
						
							
							
								24c499c108 
								
									
								
							
								 
							
						 
						
							
							
								
								Add some more git flags for safety  
							
							
							
						 
						
							2021-02-18 23:22:37 -05:00  
				
					
						
							
							
								 
						
							
							
								5d9d51e327 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'lethosor/auto-update-submodules' into develop  
							
							
							
						 
						
							2021-02-18 23:15:06 -05:00  
				
					
						
							
							
								 
						
							
							
								8008243c3a 
								
									
								
							
								 
							
						 
						
							
							
								
								Configure git name/email  
							
							
							
						 
						
							2021-02-18 22:14:05 -05:00  
				
					
						
							
							
								 
						
							
							
								fa475949f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Add workflow to auto-update submodules  
							
							
							
						 
						
							2021-02-18 22:08:51 -05:00  
				
					
						
							
							
								 
						
							
							
								f3dd38a038 
								
									
								
							
								 
							
						 
						
							
							
								
								update structures  
							
							
							
						 
						
							2021-02-18 18:18:34 -06:00  
				
					
						
							
							
								 
						
							
							
								a7440ca478 
								
									
								
							
								 
							
						 
						
							
							
								
								use wheelbarrows to haul occupied cages  
							
							
							
						 
						
							2021-02-18 00:26:11 -08:00  
				
					
						
							
							
								 
						
							
							
								cf0506e650 
								
									
								
							
								 
							
						 
						
							
							
								
								add documentation for #aliases blueprints  
							
							
							
						 
						
							2021-02-17 23:10:47 -08:00  
				
					
						
							
							
								 
						
							
							
								9e17bc938c 
								
									
								
							
								 
							
						 
						
							
							
								
								only set labor validity for the player civ  
							
							
							
						 
						
							2021-02-17 09:16:49 -08:00  
				
					
						
							
							
								 
						
							
							
								6a5e6ffa00 
								
									
								
							
								 
							
						 
						
							
							
								
								add archery targets to services barracks  
							
							... 
							
							
							
							fix a few alignment problems
fix bolts alias 
							
						 
						
							2021-02-17 08:24:50 -08:00  
				
					
						
							
							
								 
						
							
							
								e9afbd328e 
								
									
								
							
								 
							
						 
						
							
							
								
								Add some more client libraries to docs  
							
							
							
						 
						
							2021-02-15 21:44:35 -05:00  
				
					
						
							
							
								 
						
							
							
								416fc32cb2 
								
									
								
							
								 
							
						 
						
							
							
								
								update scripts and structures  
							
							
							
						 
						
							2021-02-15 11:49:34 -06:00  
				
					
						
							
							
								 
						
							
							
								ef1ac6ff40 
								
									
								
							
								 
							
						 
						
							
							
								
								update structures  
							
							
							
						 
						
							2021-02-13 16:23:01 -06:00  
				
					
						
							
							
								 
						
							
							
								09f0607db2 
								
									
								
							
								 
							
						 
						
							
							
								
								add deprecation warnings to fortplan  
							
							
							
						 
						
							2021-02-13 11:07:14 -08:00  
				
					
						
							
							
								 
						
							
							
								4790e23a5c 
								
									
								
							
								 
							
						 
						
							
							
								
								add more docs for quickfort orders  
							
							
							
						 
						
							2021-02-13 07:46:45 -08:00  
				
					
						
							
							
								 
						
							
							
								e87f27e1fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into myk_stockpile_containers_docs  
							
							
							
						 
						
							2021-02-13 07:17:15 -08:00  
				
					
						
							
							
								 
						
							
							
								55743fc43f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into myk_manipulator  
							
							
							
						 
						
							2021-02-13 07:16:58 -08:00  
				
					
						
							
							
								 
						
							
							
								81d0a276b2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into myk_dreamfort  
							
							
							
						 
						
							2021-02-13 07:15:11 -08:00  
				
					
						
							
							
								 
						
							
							
								d0b259e9fb 
								
									
								
							
								 
							
						 
						
							
							
								
								set wheelbarrows in stone, corpse stockpiles; pots  
							
							... 
							
							
							
							also set farming dig to priority 2 instead of 3 so the player can use 3
for other higher-than-default-but lower-than-farming tasks
and make the roughgems stockpile find the newly-moved gems QSP properly 
							
						 
						
							2021-02-13 07:07:41 -08:00  
				
					
						
							
							
								 
						
							
							
								92a01e656f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update scripts  
							
							
							
						 
						
							2021-02-12 00:37:32 -05:00  
				
					
						
							
							
								 
						
							
							
								49b6e814db 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump to beta1, update submodules  
							
							
							
						 
						
							2021-02-10 21:08:45 -05:00  
				
					
						
							
							
								 
						
							
							
								a051077820 
								
									
								
							
								 
							
						 
						
							
							
								
								update structures  
							
							
							
						 
						
							2021-02-10 18:54:12 -06:00  
				
					
						
							
							
								 
						
							
							
								ebbbfc0f8e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_orders_crash' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-02-10 00:10:53 -05:00  
				
					
						
							
							
								 
						
							
							
								efe62b412c 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2021-02-09 08:48:43 +01:00  
				
					
						
							
							
								 
						
							
							
								6ffbf401c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into ea_improve_survey_performance_keep_mlts_on_heap  
							
							
							
						 
						
							2021-02-09 08:42:42 +01:00  
				
					
						
							
							
								 
						
							
							
								47ba6c19b1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'bseiller/ea_refactoring' into develop  
							
							
							
						 
						
							2021-02-09 00:17:31 -05:00  
				
					
						
							
							
								 
						
							
							
								625380a30b 
								
									
								
							
								 
							
						 
						
							
							
								
								Update submodules  
							
							
							
						 
						
							2021-02-09 00:11:59 -05:00  
				
					
						
							
							
								 
						
							
							
								c5a5812377 
								
									
								
							
								 
							
						 
						
							
							
								
								embiggen feeder stockpiles on the industry level  
							
							
							
						 
						
							2021-02-08 18:47:59 -08:00  
				
					
						
							
							
								 
						
							
							
								4660f52b36 
								
							
								 
							
						 
						
							
							
								
								improved pre embark mineral estimates  
							
							
							
						 
						
							2021-02-08 14:45:49 +01:00  
				
					
						
							
							
								 
						
							
							
								c963da351a 
								
									
								
							
								 
							
						 
						
							
							
								
								doc updates, move booze further away from kitchen  
							
							
							
						 
						
							2021-02-07 13:52:33 -08:00  
				
					
						
							
							
								 
						
							
							
								09d91dcae1 
								
									
								
							
								 
							
						 
						
							
							
								
								move alchemist-enabling logic to autohauler  
							
							
							
						 
						
							2021-02-06 14:14:08 -08:00  
				
					
						
							
							
								 
						
							
							
								13fae4628b 
								
									
								
							
								 
							
						 
						
							
							
								
								add docs for #place-generated manager orders  
							
							
							
						 
						
							2021-02-05 17:05:34 -08:00  
				
					
						
							
							
								 
						
							
							
								6819ee9928 
								
									
								
							
								 
							
						 
						
							
							
								
								make alchemist flag valid for controllable civs  
							
							
							
						 
						
							2021-02-05 16:45:39 -08:00  
				
					
						
							
							
								 
						
							
							
								4d57d27d4d 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "allow alchemist skill to be toggled in manipulator"  
							
							... 
							
							
							
							This reverts commit fa662cafbc 
							
						 
						
							2021-02-05 16:10:36 -08:00  
				
					
						
							
							
								 
						
							
							
								64d797b4cf 
								
									
								
							
								 
							
						 
						
							
							
								
								fix a final few bugs found in playtesting  
							
							... 
							
							
							
							and doc updates 
							
						 
						
							2021-02-05 12:28:29 -08:00  
				
					
						
							
							
								 
						
							
							
								330bde7660 
								
									
								
							
								 
							
						 
						
							
							
								
								add heavy feeder piles  
							
							... 
							
							
							
							and other minor fixes found during playtesting
refine the embark profile suggestions 
							
						 
						
							2021-02-04 23:01:12 -08:00  
				
					
						
							
							
								 
						
							
							
								efc92750fa 
								
							
								 
							
						 
						
							
							
								
								Fix crash  
							
							... 
							
							
							
							embark-assistant.cpp: Move call to survey::initiate() after call to survey::setup(), otherwise state won't exist 
							
						 
						
							2021-02-04 01:10:10 +01:00  
				
					
						
							
							
								 
						
							
							
								6c6a9968ff 
								
									
								
							
								 
							
						 
						
							
							
								
								hauling aliases can take from multile stockpiles  
							
							
							
						 
						
							2021-02-03 13:51:02 -08:00  
				
					
						
							
							
								 
						
							
							
								52bf998224 
								
							
								 
							
						 
						
							
							
								
								Adapt to review comments by @PatrikLundell  
							
							... 
							
							
							
							- survey.cpp: rename loop variable for more clarity; replace use of parmeter with use of vector.size(), replace nested vector.at calls with direct index access/subscript as it is faster and easier to read 
							
						 
						
							2021-02-03 14:32:03 +01:00  
				
					
						
							
							
								 
						
							
							
								2eea9fd692 
								
									
								
							
								 
							
						 
						
							
							
								
								change central ramp to central stairs  
							
							
							
						 
						
							2021-02-02 22:11:19 -08:00  
				
					
						
							
							
								 
						
							
							
								0c304cf85f 
								
							
								 
							
						 
						
							
							
								
								Improve performance of surveying => faster search  
							
							... 
							
							
							
							replace the local/automatic mid_level_tiles variable in matcher::match_world_tile with one that is created once during the setup phase (heap).
The dynamic part of the contained (16*16*3 = 768) vectors is being allocated on the heap in both cases - which made the repeated instatiations of the automatic variable so slow/expensive.
Also replace calls to vector<bool>.resize in nested loops with direct assignments to those vectors, which curiously even after a lot of profiling is the fastest way to reset the inorganic vectors - at least on Windows.
- embark-assistant.cpp: Replace 2 local/automatic mid_level_tiles variables with a single dynamic variable created during setup as well; add calls to matcher::setup() and matcher::shutdown()
- matcher.cpp/.h: add state with mid_level_tiles member; add setup and shutdown functions
- survey.cpp: add function reset_mlt_inorganics as replacement for the looped calls to vector::resize as all inorganic vectors are now expected to have the proper size when entering survey::survey_mid_level_tile 
							
						 
						
							2021-02-03 00:08:59 +01:00  
				
					
						
							
							
								 
						
							
							
								45a3c903a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into myk_dreamfort  
							
							
							
						 
						
							2021-02-02 10:53:38 -08:00  
				
					
						
							
							
								 
						
							
							
								1063497828 
								
									
								
							
								 
							
						 
						
							
							
								
								don't crash on malformed orders json  
							
							
							
						 
						
							2021-02-02 10:50:21 -08:00  
				
					
						
							
							
								 
						
							
							
								fa662cafbc 
								
									
								
							
								 
							
						 
						
							
							
								
								allow alchemist skill to be toggled in manipulator  
							
							... 
							
							
							
							since autohauler uses it as a flag 
							
						 
						
							2021-02-02 08:28:48 -08:00