ae55d2d526 
								
							
								 
							
						 
						
							
							
								
								Support linking against an external tinyxml if EXTERNAL_TINYXML is set  
							
							... 
							
							
							
							As best as I can tell, the copy of tinyxml dfhack uses is unmodified
from whenever it was first bundled. This commit adds an option to CMake,
EXTERNAL_TINYXML, that if set to ON, will attempt to link against a system
tinyxml instead of using the dfhack-bundled one.  It defaults to OFF,
so there is no change in default behavior.
The DFHACK_TINYXML variable is then set to either "tinyxml" or "dfhack-tinyxml"
so the library (and any plugins that need updating) can link against one
or the other.
The FindTinyXML.cmake script was taken from https://github.com/ros/cmake_modules 
(licensed under the 3-clause BSD license).
Add license text to new CMake file. 
							
						 
						
							2016-06-29 17:53:16 -04:00  
				
					
						
							
							
								 
						
							
							
								b338d0218e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/DFHack/dfhack  into develop  
							
							
							
						 
						
							2016-06-20 13:22:25 +05:30  
				
					
						
							
							
								 
						
							
							
								36aafd550b 
								
							
								 
							
						 
						
							
							
								
								Increased the message size limit in RemoteClient from 8mb to 64mb.  
							
							
							
						 
						
							2016-06-20 13:17:30 +05:30  
				
					
						
							
							
								 
						
							
							
								6d1c4cd9ce 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/dfhack/dfhack  into develop  
							
							
							
						 
						
							2016-06-16 23:37:21 -04:00  
				
					
						
							
							
								 
						
							
							
								a7d5c2132a 
								
							
								 
							
						 
						
							
							
								
								update xml  
							
							
							
						 
						
							2016-06-16 23:37:01 -04:00  
				
					
						
							
							
								 
						
							
							
								0918efd02d 
								
							
								 
							
						 
						
							
							
								
								fix word_wrap not returning a value.  
							
							
							
						 
						
							2016-06-16 20:52:16 +05:30  
				
					
						
							
							
								 
						
							
							
								27a84a8246 
								
							
								 
							
						 
						
							
							
								
								Move scripts to library/scripts  
							
							... 
							
							
							
							git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule. 
							
						 
						
							2016-06-15 18:45:08 -04:00  
				
					
						
							
							
								 
						
							
							
								9de4550fde 
								
							
								 
							
						 
						
							
							
								
								Update submodules  
							
							
							
						 
						
							2016-06-15 12:11:20 -04:00  
				
					
						
							
							
								 
						
							
							
								022a1bf9e8 
								
							
								 
							
						 
						
							
							
								
								Wrap script descriptions in `ls` output and remove description length cap  
							
							
							
						 
						
							2016-06-14 21:24:27 -04:00  
				
					
						
							
							
								 
						
							
							
								4f3a2b39d7 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-06-14 13:21:59 -04:00  
				
					
						
							
							
								 
						
							
							
								f07bc03c69 
								
							
								 
							
						 
						
							
							
								
								Update clsocket and Open()/Listen() usage  
							
							
							
						 
						
							2016-06-14 13:21:51 -04:00  
				
					
						
							
							
								 
						
							
							
								a2b2c66798 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #931  from warmist/advfort2  
							
							... 
							
							
							
							Advfort2 
							
						 
						
							2016-06-14 09:45:33 -04:00  
				
					
						
							
							
								 
						
							
							
								90c7dc41ec 
								
							
								 
							
						 
						
							
							
								
								Update where library/xml to point to current master  
							
							... 
							
							
							
							Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com> 
							
						 
						
							2016-06-13 17:10:58 -04:00  
				
					
						
							
							
								 
						
							
							
								a03b32846a 
								
							
								 
							
						 
						
							
							
								
								Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this  
							
							... 
							
							
							
							Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com> 
							
						 
						
							2016-06-13 16:57:45 -04:00  
				
					
						
							
							
								 
						
							
							
								a47a1c83ba 
								
							
								 
							
						 
						
							
							
								
								Update xml, clsocket  
							
							
							
						 
						
							2016-06-07 08:17:40 -04:00  
				
					
						
							
							
								 
						
							
							
								fa1c589391 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-05-30 16:58:51 -04:00  
				
					
						
							
							
								 
						
							
							
								d44bc069ad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'BenLubar/thread-memory-leak' into develop  
							
							
							
						 
						
							2016-05-30 16:24:42 -04:00  
				
					
						
							
							
								 
						
							
							
								9fc43cff4d 
								
							
								 
							
						 
						
							
							
								
								Make const method wrappers possible  
							
							... 
							
							
							
							Reverts ae3052f#935  
							
						 
						
							2016-05-28 20:11:42 -04:00  
				
					
						
							
							
								 
						
							
							
								113325f885 
								
							
								 
							
						 
						
							
							
								
								update xml  
							
							
							
						 
						
							2016-05-28 10:29:53 -04:00  
				
					
						
							
							
								 
						
							
							
								ae3052f79a 
								
							
								 
							
						 
						
							
							
								
								Make knowledge_scholar_category_flag::value() non-const  
							
							... 
							
							
							
							const methods can't be wrapped at the moment, at least without changing things
in DataFuncs.h 
							
						 
						
							2016-05-28 10:28:22 -04:00  
				
					
						
							
							
								 
						
							
							
								4d3df60470 
								
							
								 
							
						 
						
							
							
								
								Update xml (offsets)  
							
							
							
						 
						
							2016-05-27 17:51:01 -04:00  
				
					
						
							
							
								 
						
							
							
								c1ba435058 
								
							
								 
							
						 
						
							
							
								
								Update version and xml  
							
							
							
						 
						
							2016-05-27 17:41:23 -04:00  
				
					
						
							
							
								 
						
							
							
								e76258b040 
								
							
								 
							
						 
						
							
							
								
								knowledge category flag  
							
							
							
						 
						
							2016-05-26 15:15:42 -05:00  
				
					
						
							
							
								 
						
							
							
								700392ba55 
								
							
								 
							
						 
						
							
							
								
								Fix tinythread memory leak in two ways:  
							
							... 
							
							
							
							1. update to tinythread version 1.1, which provides a detach method
2. move the thread disassociation to the join function, which allows
attached threads to be joined even after they finish (this was the main
leak)
Also update RemoteServer.cpp to detach threads and delete the thread
objects instead of leaking them (although they are much smaller than the
actual threads). 
							
						 
						
							2016-05-21 19:17:08 -05:00  
				
					
						
							
							
								 
						
							
							
								6c64b3441d 
								
							
								 
							
						 
						
							
							
								
								Fixes to gui/advfort.lua  
							
							
							
						 
						
							2016-05-20 13:55:59 +03:00  
				
					
						
							
							
								 
						
							
							
								d93cf2cd2e 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-05-17 23:26:21 -04:00  
				
					
						
							
							
								 
						
							
							
								b7aa8aca26 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-05-14 22:27:21 -04:00  
				
					
						
							
							
								 
						
							
							
								1832e563b7 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-05-14 19:41:41 -04:00  
				
					
						
							
							
								 
						
							
							
								a89251cdf8 
								
							
								 
							
						 
						
							
							
								
								Find job in job screen  
							
							
							
						 
						
							2016-05-14 16:07:27 -04:00  
				
					
						
							
							
								 
						
							
							
								118d88e44f 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-05-14 16:07:10 -04:00  
				
					
						
							
							
								 
						
							
							
								55e58e5f06 
								
							
								 
							
						 
						
							
							
								
								Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins  
							
							
							
						 
						
							2016-05-14 11:43:37 -04:00  
				
					
						
							
							
								 
						
							
							
								97f7cd6081 
								
							
								 
							
						 
						
							
							
								
								Bump version and update xml  
							
							
							
						 
						
							2016-05-12 16:03:33 -04:00  
				
					
						
							
							
								 
						
							
							
								fee6e57b40 
								
							
								 
							
						 
						
							
							
								
								Disable viewscreen_layer_workshop_profilest focus handler for now  
							
							
							
						 
						
							2016-05-11 17:52:56 -04:00  
				
					
						
							
							
								 
						
							
							
								ed81be16b3 
								
							
								 
							
						 
						
							
							
								
								Improve logging of vtable interpose errors  
							
							
							
						 
						
							2016-05-11 17:52:10 -04:00  
				
					
						
							
							
								 
						
							
							
								38051a5a48 
								
							
								 
							
						 
						
							
							
								
								remove tweak manager-quantity  
							
							
							
						 
						
							2016-05-11 17:51:57 -04:00  
				
					
						
							
							
								 
						
							
							
								b53f829737 
								
							
								 
							
						 
						
							
							
								
								Update to 0.43.01-alpha0 and update xml  
							
							
							
						 
						
							2016-05-10 17:48:50 -04:00  
				
					
						
							
							
								 
						
							
							
								c1e44c178f 
								
							
								 
							
						 
						
							
							
								
								Add on_click/on_rclick handlers to widgets.Label  
							
							... 
							
							
							
							Closes  #919  
						
							2016-05-09 21:30:34 -04:00  
				
					
						
							
							
								 
						
							
							
								402a96b0e6 
								
							
								 
							
						 
						
							
							
								
								Expose new unit functions to lua and add some basic safety checks  
							
							
							
						 
						
							2016-04-23 21:52:50 -04:00  
				
					
						
							
							
								 
						
							
							
								bc7c689d93 
								
							
								 
							
						 
						
							
							
								
								update xml  
							
							
							
						 
						
							2016-04-23 20:33:03 -04:00  
				
					
						
							
							
								 
						
							
							
								52728babd4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into zone-unassign  
							
							
							
						 
						
							2016-04-22 18:41:15 -04:00  
				
					
						
							
							
								 
						
							
							
								b36193857c 
								
							
								 
							
						 
						
							
							
								
								Add string:startswith(), endswith()  
							
							
							
						 
						
							2016-04-16 17:13:41 -04:00  
				
					
						
							
							
								 
						
							
							
								0d37209063 
								
							
								 
							
						 
						
							
							
								
								use trade_state enum  
							
							
							
						 
						
							2016-04-13 09:44:57 -04:00  
				
					
						
							
							
								 
						
							
							
								7c91b8f755 
								
							
								 
							
						 
						
							
							
								
								Add more informative focus_path  
							
							... 
							
							
							
							This with conjunction of changes in eventful will make the sidebar overlay more bug-free :) 
							
						 
						
							2016-04-10 16:53:18 +03:00  
				
					
						
							
							
								 
						
							
							
								8b8ce4eff9 
								
							
								 
							
						 
						
							
							
								
								Spelling mistake  
							
							
							
						 
						
							2016-04-10 15:45:43 +03:00  
				
					
						
							
							
								 
						
							
							
								d1c45d00d2 
								
							
								 
							
						 
						
							
							
								
								Fix some bugs in workshopOverlay  
							
							... 
							
							
							
							Fix bugs relating to "remove building"/"suspend remove" part of overlay. 
							
						 
						
							2016-04-10 14:44:09 +03:00  
				
					
						
							
							
								 
						
							
							
								80521d1bb1 
								
							
								 
							
						 
						
							
							
								
								add onGetSelectedBuilding to workshop overlay  
							
							... 
							
							
							
							This will make other stuff that depends on dfhack.gui.getSelectedBuilding work with workshop overlay 
							
						 
						
							2016-04-10 12:28:15 +03:00  
				
					
						
							
							
								 
						
							
							
								49863a9f32 
								
							
								 
							
						 
						
							
							
								
								Add a file-like lua JSON wrapper  
							
							
							
						 
						
							2016-04-08 17:40:14 -04:00  
				
					
						
							
							
								 
						
							
							
								b97d33ca28 
								
							
								 
							
						 
						
							
							
								
								moveToBuilding improvements  
							
							... 
							
							
							
							- Don't set in_building by default when use_mode is 0 (consistent with most vanilla DF items)
- make use_mode optional and default to 0 (including in Lua API)
Resolves  #885  
							
						 
						
							2016-04-05 11:43:02 -04:00  
				
					
						
							
							
								 
						
							
							
								d9e368cab4 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-04-03 21:10:02 -04:00  
				
					
						
							
							
								 
						
							
							
								e0ae7bde79 
								
							
								 
							
						 
						
							
							
								
								Add Lua primitives: ptr-string, pointer, ptr-vector, bit-vector, bit-array  
							
							... 
							
							
							
							These are most useful with df.reinterpret_cast, but df.new can also be used for
most of these (except ptr-string) 
							
						 
						
							2016-04-03 20:48:57 -04:00