9a73ea9f14 
								
							
								 
							
						 
						
							
							
								
								Cleanup World module to use df::global, and fix crashes when control_mode/game_mode are missing  
							
							
							
						 
						
							2012-05-23 12:51:03 -05:00  
				
					
						
							
							
								 
						
							
							
								81022451c2 
								
							
								 
							
						 
						
							
							
								
								Support sorting items in stocks, and correct unit sorting in joblist.  
							
							
							
						 
						
							2012-05-21 22:29:03 +04:00  
				
					
						
							
							
								 
						
							
							
								8ef1423ee7 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-20 23:01:44 +02:00  
				
					
						
							
							
								 
						
							
							
								8ff4f1a78e 
								
							
								 
							
						 
						
							
							
								
								Disable ruby plugin by default.  
							
							
							
						 
						
							2012-05-20 22:58:02 +02: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  
				
					
						
							
							
								 
						
							
							
								489f22e550 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'ruby' of  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-05-20 17:37:13 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b8ce3b45e1 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jaxad0127/dfhack  
							
							
							
						 
						
							2012-05-19 18:37:02 +02:00  
				
					
						
							
							
								 
						
							
							
								d0de575a2b 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-05-19 18:27:57 +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  
				
					
						
							
							
								 
						
							
							
								b851ee2d22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/peterix/dfhack  
							
							
							
						 
						
							2012-05-19 12:53:23 +02:00  
				
					
						
							
							
								 
						
							
							
								e2f39368b1 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2012-05-18 17:43:22 +02: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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0d2849ca5a 
								
							
								 
							
						 
						
							
							
								
								Modified autodump to enable extraction of equipped items from unit inventory  
							
							... 
							
							
							
							Signed-off-by: playfordh <harlanplayford@gmail.com> 
							
						 
						
							2012-05-15 06:32:09 -04:00  
				
					
						
							
							
								 
						
							
							
								689cf3ee51 
								
							
								 
							
						 
						
							
							
								
								Added ForceEquip plugin to project  
							
							... 
							
							
							
							Signed-off-by: playfordh <harlanplayford@gmail.com> 
							
						 
						
							2012-05-15 06:03:29 -04:00  
				
					
						
							
							
								 
						
							
							
								27cc2dc92c 
								
							
								 
							
						 
						
							
							
								
								Add dwarf state table entries for the new jobs from .34.7 and .34.8.  Also add a warning message for a dwarf who is doing an unknown job (instead of just reading random nonsense from off the end of the dwarf_states array).  
							
							... 
							
							
							
							This code is backward-compatible (the extra job entries will simply be unused in pre-.8). 
							
						 
						
							2012-05-14 21:54:11 -05:00  
				
					
						
							
							
								 
						
							
							
								e078c75737 
								
							
								 
							
						 
						
							
							
								
								Track submodules  
							
							
							
						 
						
							2012-05-14 13:44:03 -05:00  
				
					
						
							
							
								 
						
							
							
								86dc2d9855 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'angavrilov/master'  
							
							... 
							
							
							
							Conflicts:
	library/xml 
							
						 
						
							2012-05-12 19:49:27 -05:00  
				
					
						
							
							
								 
						
							
							
								bd2b55c490 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-05-12 19:43:02 -05:00  
				
					
						
							
							
								 
						
							
							
								2629db5ed1 
								
							
								 
							
						 
						
							
							
								
								ruby: add building creation code  
							
							
							
						 
						
							2012-05-13 01:40:44 +02:00  
				
					
						
							
							
								 
						
							
							
								ea6e207290 
								
							
								 
							
						 
						
							
							
								
								Merge upstream  
							
							
							
						 
						
							2012-05-12 23:52:13 +02:00  
				
					
						
							
							
								 
						
							
							
								3da787c5c9 
								
							
								 
							
						 
						
							
							
								
								Merge upstream  
							
							
							
						 
						
							2012-05-12 23:51:49 +02: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  
				
					
						
							
							
								 
						
							
							
								ccbae58365 
								
							
								 
							
						 
						
							
							
								
								Set default beekeeper max to 1 in autolabor (see  http://www.bay12games.com/dwarves/mantisbt/view.php?id=3981 )  
							
							
							
						 
						
							2012-05-12 11:21:12 -05: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  
				
					
						
							
							
								 
						
							
							
								f3ca3addbf 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-05-10 22:06:43 -06:00  
				
					
						
							
							
								 
						
							
							
								dfe86f9bd7 
								
							
								 
							
						 
						
							
							
								
								ruby: interpret types in vmethod signatures  
							
							
							
						 
						
							2012-05-11 01:34:03 +02:00  
				
					
						
							
							
								 
						
							
							
								607cd9c8f2 
								
							
								 
							
						 
						
							
							
								
								ruby: tweak enums  
							
							
							
						 
						
							2012-05-10 23:41:50 +02:00  
				
					
						
							
							
								 
						
							
							
								d30573a0e0 
								
							
								 
							
						 
						
							
							
								
								probe: fix gcc warning  
							
							
							
						 
						
							2012-05-10 22:57:11 +02:00  
				
					
						
							
							
								 
						
							
							
								987cf697db 
								
							
								 
							
						 
						
							
							
								
								Merge upstream  
							
							
							
						 
						
							2012-05-09 15:44:32 +02:00  
				
					
						
							
							
								 
						
							
							
								dce7f17fe7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-05-08 07:32:35 -06:00  
				
					
						
							
							
								 
						
							
							
								5bd90e28b8 
								
							
								 
							
						 
						
							
							
								
								Add a missing return in tiletypes  
							
							
							
						 
						
							2012-05-07 19:30:33 -06:00  
				
					
						
							
							
								 
						
							
							
								833bf518d9 
								
							
								 
							
						 
						
							
							
								
								Fix some issues  
							
							
							
						 
						
							2012-05-07 18:31:28 -06:00  
				
					
						
							
							
								 
						
							
							
								7ee4c584b9 
								
							
								 
							
						 
						
							
							
								
								ruby: tweak enums, pointerary  
							
							
							
						 
						
							2012-05-06 22:42:06 +02:00  
				
					
						
							
							
								 
						
							
							
								bfb26f1c1f 
								
							
								 
							
						 
						
							
							
								
								ruby: deconstructbld  
							
							
							
						 
						
							2012-05-06 01:02:21 +02:00  
				
					
						
							
							
								 
						
							
							
								96a62a8865 
								
							
								 
							
						 
						
							
							
								
								ruby: fix buildbed sample  
							
							
							
						 
						
							2012-05-06 00:13:53 +02:00  
				
					
						
							
							
								 
						
							
							
								f18aa9d947 
								
							
								 
							
						 
						
							
							
								
								ruby: add link_job  
							
							
							
						 
						
							2012-05-05 23:56:26 +02:00  
				
					
						
							
							
								 
						
							
							
								e2a978a4fa 
								
							
								 
							
						 
						
							
							
								
								ruby: avoid infinite recursion in inspect  
							
							
							
						 
						
							2012-05-05 22:43:12 +02:00  
				
					
						
							
							
								 
						
							
							
								e3440126a3 
								
							
								 
							
						 
						
							
							
								
								Fix missing switch case warnings.  
							
							
							
						 
						
							2012-05-05 19:36:22 +04:00  
				
					
						
							
							
								 
						
							
							
								4e084d0df7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'rh73/master'  
							
							
							
						 
						
							2012-05-05 19:28:19 +04:00  
				
					
						
							
							
								 
						
							
							
								1b5ce7b717 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'ab9rf/master'  
							
							
							
						 
						
							2012-05-05 19:26:56 +04:00  
				
					
						
							
							
								 
						
							
							
								d4d6349f48 
								
							
								 
							
						 
						
							
							
								
								Expose builtin commands to dfhack-run, and add lua script support.  
							
							... 
							
							
							
							Move builtin command implementation to Core methods, and fall
back to hack/scripts/*.lua for otherwise unrecognized commands. 
							
						 
						
							2012-05-04 19:47:18 +04:00  
				
					
						
							
							
								 
						
							
							
								138461634e 
								
							
								 
							
						 
						
							
							
								
								ruby: fix vtable for linux destructor  
							
							
							
						 
						
							2012-05-03 19:19:58 +02:00  
				
					
						
							
							
								 
						
							
							
								ba1e3c4b23 
								
							
								 
							
						 
						
							
							
								
								ruby: vmethod call  
							
							
							
						 
						
							2012-05-03 18:49:12 +02:00  
				
					
						
							
							
								 
						
							
							
								5afe2ca002 
								
							
								 
							
						 
						
							
							
								
								Update dfhack for specific_ref.  
							
							
							
						 
						
							2012-05-03 11:47:04 +04:00