19e977528c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'autolabor-artisans' of  https://github.com/pkdawson/dfhack  into develop  
							
							... 
							
							
							
							Conflicts:
	NEWS 
							
						 
						
							2014-12-04 23:49:13 -05:00  
				
					
						
							
							
								 
						
							
							
								6e86336b8f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #427  from Ramblurr/fix-teleport  
							
							... 
							
							
							
							teleport: fix unused code causing crash 
							
						 
						
							2014-12-04 23:39:13 -05:00  
				
					
						
							
							
								 
						
							
							
								a107e41bda 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #430  from splintermind/master  
							
							... 
							
							
							
							update DT scripts for versions 29.0.0+ 
							
						 
						
							2014-12-04 23:38:34 -05:00  
				
					
						
							
							
								 
						
							
							
								c83ed531bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branches 'lethosor/stocks-esc', 'lethosor/patch-8', 'lethosor/0.40.19-update-labors' and 'lethosor/fixTexts' into develop  
							
							
							
						 
						
							2014-12-04 23:34:48 -05:00  
				
					
						
							
							
								 
						
							
							
								bd7cb578eb 
								
							
								 
							
						 
						
							
							
								
								Update xml.  
							
							
							
						 
						
							2014-12-04 23:31:05 -05:00  
				
					
						
							
							
								 
						
							
							
								f1a863eb79 
								
							
								 
							
						 
						
							
							
								
								Use short plugin name  
							
							
							
						 
						
							2014-12-03 23:27:52 -05:00  
				
					
						
							
							
								 
						
							
							
								cac2245438 
								
							
								 
							
						 
						
							
							
								
								Update some plugins to use REQUIRE_GLOBAL  
							
							
							
						 
						
							2014-12-03 23:26:54 -05:00  
				
					
						
							
							
								 
						
							
							
								16c2d4df99 
								
							
								 
							
						 
						
							
							
								
								stocks: Make LEAVESCREEN have priority over text entry  
							
							... 
							
							
							
							This should fix conflicts if LEAVESCREEN is bound to "Space" only 
							
						 
						
							2014-12-03 17:52:42 -05:00  
				
					
						
							
							
								 
						
							
							
								5d1efa82f1 
								
							
								 
							
						 
						
							
							
								
								update DT scripts  
							
							
							
						 
						
							2014-12-03 23:34:22 +01:00  
				
					
						
							
							
								 
						
							
							
								c1d36be6e8 
								
							
								 
							
						 
						
							
							
								
								teleport: fix unused code causing crash  
							
							... 
							
							
							
							The `teleportSettings` variable was never used and the line referenced
the non-existing function `getArgsTogether` 
							
						 
						
							2014-12-03 11:33:05 +01:00  
				
					
						
							
							
								 
						
							
							
								e206c242c6 
								
							
								 
							
						 
						
							
							
								
								Add a plugin_globals vector to aid in safety checks for plugins that require globals  
							
							... 
							
							
							
							This allows "using df::global::foo" to be replaced by "REQUIRE_GLOBAL(foo)",
and DFHack will refuse to load the plugin if df::global::foo is NULL 
							
						 
						
							2014-12-02 21:32:04 -05:00  
				
					
						
							
							
								 
						
							
							
								46eccdb152 
								
							
								 
							
						 
						
							
							
								
								Bind `hotkeys` to Alt-F1  
							
							... 
							
							
							
							Ctrl-F1 is a system-wide shortcut by default on OS X 
							
						 
						
							2014-12-02 18:01:53 -05:00  
				
					
						
							
							
								 
						
							
							
								2d7ea52c40 
								
							
								 
							
						 
						
							
							
								
								Clarify autolabor initialization failure  
							
							
							
						 
						
							2014-12-02 17:58:30 -05:00  
				
					
						
							
							
								 
						
							
							
								e3c13fc555 
								
							
								 
							
						 
						
							
							
								
								Add gelding to autolabor and manipulator  
							
							
							
						 
						
							2014-12-02 17:30:16 -05:00  
				
					
						
							
							
								 
						
							
							
								760acf017b 
								
							
								 
							
						 
						
							
							
								
								Update version to v0.40.19  
							
							
							
						 
						
							2014-12-02 13:51:44 +03:00  
				
					
						
							
							
								 
						
							
							
								f4e8fa2f30 
								
							
								 
							
						 
						
							
							
								
								Define a static variable to fix debug mode crash.  
							
							... 
							
							
							
							Fixes  #404  
						
							2014-12-01 17:19:20 -08:00  
				
					
						
							
							
								 
						
							
							
								7ddd3ca319 
								
							
								 
							
						 
						
							
							
								
								Expand fixTexts.sh  
							
							... 
							
							
							
							* Fall back to `rst2html.py` (the default location "setup.py" installs to)
  if `rst2html` is not available
* Warn if the installed docutils version is below 0.12, to avoid extraneous
  CSS changes between docutils versions
* Add a status message for updated files
* Update HTML files 
							
						 
						
							2014-12-01 16:13:31 -05:00  
				
					
						
							
							
								 
						
							
							
								5aa05a7276 
								
							
								 
							
						 
						
							
							
								
								Update Readme.html.  
							
							
							
						 
						
							2014-11-30 16:49:16 -05:00  
				
					
						
							
							
								 
						
							
							
								bf7f746aa9 
								
							
								 
							
						 
						
							
							
								
								Fix Readme.rst so it will compile.  
							
							
							
						 
						
							2014-11-30 16:48:58 -05:00  
				
					
						
							
							
								 
						
							
							
								83d3785735 
								
							
								 
							
						 
						
							
							
								
								Update xml.  
							
							
							
						 
						
							2014-11-30 14:03:00 -05:00  
				
					
						
							
							
								 
						
							
							
								7859da7d77 
								
							
								 
							
						 
						
							
							
								
								Update stonesense.  
							
							
							
						 
						
							2014-11-30 12:31:29 -05:00  
				
					
						
							
							
								 
						
							
							
								868bc4c7fb 
								
							
								 
							
						 
						
							
							
								
								Update xml.  
							
							
							
						 
						
							2014-11-30 11:32:46 -05:00  
				
					
						
							
							
								 
						
							
							
								921f0dd06a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'quietust/develop' into develop  
							
							
							
						 
						
							2014-11-30 11:31:59 -05:00  
				
					
						
							
							
								 
						
							
							
								d9ae3cc612 
								
							
								 
							
						 
						
							
							
								
								Removed removebadthoughts and updated Readme.rst and NEWS.  
							
							
							
						 
						
							2014-11-30 09:26:04 -05:00  
				
					
						
							
							
								 
						
							
							
								81b75161d6 
								
							
								 
							
						 
						
							
							
								
								Updated remove-stress to the new argument system.  
							
							
							
						 
						
							2014-11-30 09:23:35 -05:00  
				
					
						
							
							
								 
						
							
							
								5dcec6f683 
								
							
								 
							
						 
						
							
							
								
								Add Putnam's remove-stress script  
							
							
							
						 
						
							2014-11-30 22:30:13 +11:00  
				
					
						
							
							
								 
						
							
							
								9dbe639919 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #402  from Ramblurr/stockpiles  
							
							... 
							
							
							
							plugin: Stockpile Settings Serialization 
							
						 
						
							2014-11-28 23:15:46 -05:00  
				
					
						
							
							
								 
						
							
							
								5b1eb0e770 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'lethosor/cmdprompt-cursor' into develop  
							
							
							
						 
						
							2014-11-28 23:13:09 -05:00  
				
					
						
							
							
								 
						
							
							
								5912f63253 
								
							
								 
							
						 
						
							
							
								
								Update NEWS.  
							
							
							
						 
						
							2014-11-28 23:03:39 -05:00  
				
					
						
							
							
								 
						
							
							
								16fcdc3035 
								
							
								 
							
						 
						
							
							
								
								modtools/item-trigger should now work with items  
							
							
							
						 
						
							2014-11-28 23:03:27 -05:00  
				
					
						
							
							
								 
						
							
							
								762f5231e2 
								
							
								 
							
						 
						
							
							
								
								reaction-trigger typo.  
							
							
							
						 
						
							2014-11-28 23:01:44 -05:00  
				
					
						
							
							
								 
						
							
							
								a6ae6d4c28 
								
							
								 
							
						 
						
							
							
								
								autolabor: Fix compile on Windows.  
							
							... 
							
							
							
							VC10 wants an explicit return type for lambdas. 
							
						 
						
							2014-11-28 00:55:26 +01:00  
				
					
						
							
							
								 
						
							
							
								794e1ee6f0 
								
							
								 
							
						 
						
							
							
								
								autolabor: Document and improve the talent pool parameter.  
							
							
							
						 
						
							2014-11-27 21:13:20 +01:00  
				
					
						
							
							
								 
						
							
							
								cb6d4da2f2 
								
							
								 
							
						 
						
							
							
								
								stockpules: fix protobuf-lite support  
							
							... 
							
							
							
							Looks like we lost more than just TextFormat when we lost full protobuf
support. Copied these two serialization functions over. 
							
						 
						
							2014-11-27 16:36:42 +01:00  
				
					
						
							
							
								 
						
							
							
								8b1b32a499 
								
							
								 
							
						 
						
							
							
								
								autolabor: Add a talent pool parameter.  
							
							
							
						 
						
							2014-11-27 15:56:14 +01:00  
				
					
						
							
							
								 
						
							
							
								1c496fb255 
								
							
								 
							
						 
						
							
							
								
								add savestock and loadstock to NEWS and Readme.rst  
							
							
							
						 
						
							2014-11-27 14:49:16 +01:00  
				
					
						
							
							
								 
						
							
							
								d352d0f42d 
								
							
								 
							
						 
						
							
							
								
								stockpiles: remove dependency on full protobuf  
							
							
							
						 
						
							2014-11-27 14:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								de919050b1 
								
							
								 
							
						 
						
							
							
								
								Revert "install the full protobuf library"  
							
							... 
							
							
							
							This reverts commit 443a9676e1 
							
						 
						
							2014-11-27 13:40:11 +01:00  
				
					
						
							
							
								 
						
							
							
								7cbb1ed043 
								
							
								 
							
						 
						
							
							
								
								Revert "use full protobuf library project wide"  
							
							... 
							
							
							
							This reverts commit f100d30f56 
							
						 
						
							2014-11-27 13:39:30 +01:00  
				
					
						
							
							
								 
						
							
							
								b6f5bcb7dc 
								
							
								 
							
						 
						
							
							
								
								stockpiles: fix compilation on windows  
							
							... 
							
							
							
							VS2010 only supports a subset of C++11 
							
						 
						
							2014-11-27 13:28:17 +01:00  
				
					
						
							
							
								 
						
							
							
								4e69046c72 
								
							
								 
							
						 
						
							
							
								
								Update NEWS  
							
							
							
						 
						
							2014-11-25 20:26:54 -05:00  
				
					
						
							
							
								 
						
							
							
								445640f80c 
								
							
								 
							
						 
						
							
							
								
								Allow commands invoked through command-prompt to access selected items/units/buildings  
							
							... 
							
							
							
							Fixes  #273  
						
							2014-11-25 20:25:31 -05:00  
				
					
						
							
							
								 
						
							
							
								84d24ca13f 
								
							
								 
							
						 
						
							
							
								
								Fix Hold->HoldTerrain, also use a proper fix for Attack  
							
							
							
						 
						
							2014-11-25 11:30:25 -06:00  
				
					
						
							
							
								 
						
							
							
								f100d30f56 
								
							
								 
							
						 
						
							
							
								
								use full protobuf library project wide  
							
							... 
							
							
							
							since plugins are using full protobuf, there is no reason
for everything not to. this removes the need to ship both the full
protobuf lib and the protobuf-lite lib. 
							
						 
						
							2014-11-25 10:48:51 +01:00  
				
					
						
							
							
								 
						
							
							
								42dd60a24c 
								
							
								 
							
						 
						
							
							
								
								Add autolabor-artisans.lua  
							
							
							
						 
						
							2014-11-24 02:32:22 +01:00  
				
					
						
							
							
								 
						
							
							
								063b669f6b 
								
							
								 
							
						 
						
							
							
								
								stockpiles: cleanup output and add docs  
							
							
							
						 
						
							2014-11-22 18:57:56 +01:00  
				
					
						
							
							
								 
						
							
							
								00c1676744 
								
							
								 
							
						 
						
							
							
								
								stockpiles: correct typo  
							
							
							
						 
						
							2014-11-22 18:54:22 +01:00  
				
					
						
							
							
								 
						
							
							
								e599f4b1e1 
								
							
								 
							
						 
						
							
							
								
								stockpiles: more user documentation  
							
							
							
						 
						
							2014-11-22 18:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								f2d4bf53bd 
								
							
								 
							
						 
						
							
							
								
								stockpiles: fix empty list crash  
							
							... 
							
							
							
							I was clear()ing all empty stockpile index vectors , but DF expects them
to be initialized with '\0' despite the fact they aren't used.
To keep DF happy and prevent segfaults, we now initialize all lists to
their appropriate sizes with a sane default value. 
							
						 
						
							2014-11-22 18:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								869a92dfc5 
								
							
								 
							
						 
						
							
							
								
								stockpiles: handle all metals and stones  
							
							
							
						 
						
							2014-11-22 18:33:49 +01:00