1e09d67fc3 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-21 20:32:50 +02:00  
				
					
						
							
							
								 
						
							
							
								81022451c2 
								
							
								 
							
						 
						
							
							
								
								Support sorting items in stocks, and correct unit sorting in joblist.  
							
							
							
						 
						
							2012-05-21 22:29:03 +04:00  
				
					
						
							
							
								 
						
							
							
								7866ab239e 
								
							
								 
							
						 
						
							
							
								
								Track structures  
							
							
							
						 
						
							2012-05-21 20:28:17 +02:00  
				
					
						
							
							
								 
						
							
							
								34f08c0223 
								
							
								 
							
						 
						
							
							
								
								Handle the stocks screen in the focus strings.  
							
							
							
						 
						
							2012-05-21 21:30:53 +04:00  
				
					
						
							
							
								 
						
							
							
								87a26ffa51 
								
							
								 
							
						 
						
							
							
								
								Track structures  
							
							
							
						 
						
							2012-05-21 18:49:27 +02:00  
				
					
						
							
							
								 
						
							
							
								8ef1423ee7 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-20 23:01:44 +02:00  
				
					
						
							
							
								 
						
							
							
								32d6257c70 
								
							
								 
							
						 
						
							
							
								
								DF code analysis uncovered another item-related flag to clear.  
							
							... 
							
							
							
							It turns out, buildings cache their 'site is blocked' state,
and won't actually recheck until the flag is cleared. 
							
						 
						
							2012-05-20 21:58:43 +04:00  
				
					
						
							
							
								 
						
							
							
								b992b04f0b 
								
							
								 
							
						 
						
							
							
								
								Remove stuff that shouldn't be in the core, and expose to lua what's left.  
							
							... 
							
							
							
							Specifically, any "if (verbose) { Core::printerr("blah") }" kind
of stuff definitely doesn't belong in the common API functions.
Also, ref->getUnit() is very expensive.
On the other hand, checks for crash-inducing conflicts with the
ui should be in the core api, and not in client plugins. 
							
						 
						
							2012-05-20 21:57:45 +04:00  
				
					
						
							
							
								 
						
							
							
								df3e1bb517 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2012-05-20 17:35:34 +02:00  
				
					
						
							
							
								 
						
							
							
								3fa155e8e6 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-20 17:33:09 +02:00  
				
					
						
							
							
								 
						
							
							
								d28d240dbd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'kmartin/master'  
							
							
							
						 
						
							2012-05-20 11:03:41 +04:00  
				
					
						
							
							
								 
						
							
							
								abbe0ceb8d 
								
							
								 
							
						 
						
							
							
								
								Fix order-of-operations oopsie in DFHack::Items::moveToInventory  
							
							
							
						 
						
							2012-05-19 14:13:32 -05:00  
				
					
						
							
							
								 
						
							
							
								bc7dbe1175 
								
							
								 
							
						 
						
							
							
								
								Merge derp fixed.  
							
							
							
						 
						
							2012-05-19 20:03:08 +02:00  
				
					
						
							
							
								 
						
							
							
								1b4a24c827 
								
							
								 
							
						 
						
							
							
								
								Support using focus strings to limit keybinding scope.  
							
							
							
						 
						
							2012-05-19 21:31:42 +04:00  
				
					
						
							
							
								 
						
							
							
								51f06c78fc 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/playfordh/dfhack  
							
							... 
							
							
							
							Conflicts:
	library/include/modules/Items.h
	library/modules/Items.cpp 
							
						 
						
							2012-05-19 19:09:13 +02:00  
				
					
						
							
							
								 
						
							
							
								ba45ac42c2 
								
							
								 
							
						 
						
							
							
								
								Track submodules  
							
							
							
						 
						
							2012-05-19 18:34:50 +02:00  
				
					
						
							
							
								 
						
							
							
								7774f5f2c1 
								
							
								 
							
						 
						
							
							
								
								Add a mechanism converting ui focus to a string representation.  
							
							... 
							
							
							
							The idea is to make ui handling more modular, dispensing with
huge functions that switch or if/else on lots of variables.
For now, used to split up functions in the sort plugin. 
							
						 
						
							2012-05-19 19:50:36 +04:00  
				
					
						
							
							
								 
						
							
							
								4aa6dbdd00 
								
							
								 
							
						 
						
							
							
								
								Support sorting items in the trade screens.  
							
							... 
							
							
							
							Caveat: sorts items in containers independently from the container. 
							
						 
						
							2012-05-18 19:18:49 +04:00  
				
					
						
							
							
								 
						
							
							
								1333dc569f 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/Caldfir/dfhack  
							
							
							
						 
						
							2012-05-18 17:42:34 +02:00  
				
					
						
							
							
								 
						
							
							
								ed6da7618a 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/warmist/dfhack  
							
							
							
						 
						
							2012-05-18 17:41:09 +02:00  
				
					
						
							
							
								 
						
							
							
								3c44e22760 
								
							
								 
							
						 
						
							
							
								
								Support trade viewscreens in Items::getSelectedItem.  
							
							
							
						 
						
							2012-05-18 17:54:05 +04:00  
				
					
						
							
							
								 
						
							
							
								51ad697bf5 
								
							
								 
							
						 
						
							
							
								
								Fix unresolved symbol reference in Windows platform.  
							
							
							
						 
						
							2012-05-18 08:25:25 -05:00  
				
					
						
							
							
								 
						
							
							
								48185568e9 
								
							
								 
							
						 
						
							
							
								
								Added df::Items::moveToBuilding. Moved item from ground to building, usefull for museum forts (placing items on tables)  
							
							
							
						 
						
							2012-05-18 16:05:29 +03:00  
				
					
						
							
							
								 
						
							
							
								3f542b4df1 
								
							
								 
							
						 
						
							
							
								
								Update merge  
							
							
							
						 
						
							2012-05-18 07:40:05 -05:00  
				
					
						
							
							
								 
						
							
							
								52426f9035 
								
							
								 
							
						 
						
							
							
								
								Track xml  
							
							
							
						 
						
							2012-05-17 20:41:41 +04:00  
				
					
						
							
							
								 
						
							
							
								f37f708b37 
								
							
								 
							
						 
						
							
							
								
								Add a workaround for Planepacked bug in buildings constructed via API.  
							
							... 
							
							
							
							Buildings hanging in the air cause constructWithFilters to
exhibit the same behavior as a moody dwarf in a burrow excluding
the workshop, i.e. endlessly collecting the same type of reagent.
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1416 
The workaround monitors jobs and reclassifies the reagents on the fly. 
							
						 
						
							2012-05-17 20:38:27 +04:00  
				
					
						
							
							
								 
						
							
							
								e9ef9b87b5 
								
							
								 
							
						 
						
							
							
								
								Add central locations for onUpdate and onStateChange handling in core.  
							
							
							
						 
						
							2012-05-17 20:04:09 +04:00  
				
					
						
							
							
								 
						
							
							
								2c0024adc9 
								
							
								 
							
						 
						
							
							
								
								Make Items::getPosition exactly match the DF original in behavior.  
							
							
							
						 
						
							2012-05-17 19:56:55 +04:00  
				
					
						
							
							
								 
						
							
							
								efdb709284 
								
							
								 
							
						 
						
							
							
								
								Support creating rollers and stops with dfhack.buildings.constructBuilding.  
							
							
							
						 
						
							2012-05-17 00:19:29 +04:00  
				
					
						
							
							
								 
						
							
							
								68c5d9b86c 
								
							
								 
							
						 
						
							
							
								
								Stop Shift-Enter from being handled as if it was Shift-M.  
							
							
							
						 
						
							2012-05-16 18:10:07 +04:00  
				
					
						
							
							
								 
						
							
							
								dbd39af58a 
								
							
								 
							
						 
						
							
							
								
								Support testing and modifying pending timeout callbacks.  
							
							
							
						 
						
							2012-05-16 17:06:08 +04:00  
				
					
						
							
							
								 
						
							
							
								e77c9dc730 
								
							
								 
							
						 
						
							
							
								
								Add new PUSH_HAUL_VEHICLES labor to autolabor.  
							
							... 
							
							
							
							This commit will only work with 0.34.08 (or later). 
							
						 
						
							2012-05-15 13:42:48 -05:00  
				
					
						
							
							
								 
						
							
							
								27ca317871 
								
							
								 
							
						 
						
							
							
								
								Added new method - Items::moveToInventory(...)  
							
							... 
							
							
							
							Signed-off-by: playfordh <harlanplayford@gmail.com> 
							
						 
						
							2012-05-15 06:01:59 -04:00  
				
					
						
							
							
								 
						
							
							
								d4f9806568 
								
							
								 
							
						 
						
							
							
								
								Track library  
							
							
							
						 
						
							2012-05-14 17:30:21 -05:00  
				
					
						
							
							
								 
						
							
							
								e078c75737 
								
							
								 
							
						 
						
							
							
								
								Track submodules  
							
							
							
						 
						
							2012-05-14 13:44:03 -05:00  
				
					
						
							
							
								 
						
							
							
								642a625586 
								
							
								 
							
						 
						
							
							
								
								Support custom buildings in dfhack.buildings.getFiltersByType.  
							
							... 
							
							
							
							Also document it and constructBuilding in Lua API docs. 
							
						 
						
							2012-05-13 18:39:00 +04:00  
				
					
						
							
							
								 
						
							
							
								87ec1de891 
								
							
								 
							
						 
						
							
							
								
								Improve lua api for tile biome access.  
							
							
							
						 
						
							2012-05-13 13:58:41 +04:00  
				
					
						
							
							
								 
						
							
							
								c6b52067bd 
								
							
								 
							
						 
						
							
							
								
								Request designation rescan in auto-growing burrows.  
							
							... 
							
							
							
							This improves performance of burrowed miners digging 1-wide tunnels. 
							
						 
						
							2012-05-12 20:54:26 +04:00  
				
					
						
							
							
								 
						
							
							
								60bb486aba 
								
							
								 
							
						 
						
							
							
								
								Add api for enabling liquid and temperature updates for blocks.  
							
							... 
							
							
							
							Now updates also have to be enabled for the z level to work. 
							
						 
						
							2012-05-12 20:12:09 +04:00  
				
					
						
							
							
								 
						
							
							
								af3e389093 
								
							
								 
							
						 
						
							
							
								
								Update submodules.  
							
							
							
						 
						
							2012-05-12 18:50:22 +04:00  
				
					
						
							
							
								 
						
							
							
								92f069e209 
								
							
								 
							
						 
						
							
							
								
								Brush output lists numbers, update xml.  
							
							
							
						 
						
							2012-05-11 07:00:18 +02:00  
				
					
						
							
							
								 
						
							
							
								d6813c7690 
								
							
								 
							
						 
						
							
							
								
								Change xml submodule pointer.  
							
							
							
						 
						
							2012-05-08 19:08:34 +04:00  
				
					
						
							
							
								 
						
							
							
								191071beb6 
								
							
								 
							
						 
						
							
							
								
								Add more lua scripts.  
							
							
							
						 
						
							2012-05-08 12:55:06 +04:00  
				
					
						
							
							
								 
						
							
							
								fca618ff1b 
								
							
								 
							
						 
						
							
							
								
								Support default building inputs in dfhack.buildings.constructBuilding.  
							
							
							
						 
						
							2012-05-06 19:11:29 +04:00  
				
					
						
							
							
								 
						
							
							
								9ad8d767b4 
								
							
								 
							
						 
						
							
							
								
								Add code for adding abstract buildings and removing constructions.  
							
							
							
						 
						
							2012-05-06 19:09:11 +04:00  
				
					
						
							
							
								 
						
							
							
								b70130cf36 
								
							
								 
							
						 
						
							
							
								
								Add a couple more building api functions.  
							
							
							
						 
						
							2012-05-06 11:22:55 +04:00  
				
					
						
							
							
								 
						
							
							
								05e8083c84 
								
							
								 
							
						 
						
							
							
								
								Allow constructing itemless actual buildings.  
							
							
							
						 
						
							2012-05-06 10:09:39 +04:00  
				
					
						
							
							
								 
						
							
							
								3bd44e5367 
								
							
								 
							
						 
						
							
							
								
								Move some things that won't work in dfhack-client to a separate file.  
							
							
							
						 
						
							2012-05-05 21:07:18 +04:00  
				
					
						
							
							
								 
						
							
							
								81f2240c23 
								
							
								 
							
						 
						
							
							
								
								Fix some things that confuse MSVC.  
							
							
							
						 
						
							2012-05-05 20:46:28 +04:00  
				
					
						
							
							
								 
						
							
							
								7e01b004e9 
								
							
								 
							
						 
						
							
							
								
								Implement timeouts in the core lua context, and quicksave script.  
							
							
							
						 
						
							2012-05-04 20:59:06 +04:00