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  
				
					
						
							
							
								 
						
							
							
								37c81df21c 
								
							
								 
							
						 
						
							
							
								
								Add reverse vtable name lookup  
							
							
							
						 
						
							2016-04-03 20:45:44 -04:00  
				
					
						
							
							
								 
						
							
							
								a49f313f84 
								
							
								 
							
						 
						
							
							
								
								update xml  
							
							
							
						 
						
							2016-04-03 13:34:52 -04:00  
				
					
						
							
							
								 
						
							
							
								ec5e91bd6a 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-28 21:00:27 -04:00  
				
					
						
							
							
								 
						
							
							
								b115fdc73f 
								
							
								 
							
						 
						
							
							
								
								Load script paths from dfhack-config/script-paths.txt  
							
							
							
						 
						
							2016-03-27 15:56:23 -04:00  
				
					
						
							
							
								 
						
							
							
								866d31f121 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-26 11:12:06 -04:00  
				
					
						
							
							
								 
						
							
							
								af4a3428a6 
								
							
								 
							
						 
						
							
							
								
								Split DataStaticsFields into multiple compilation units  
							
							
							
						 
						
							2016-03-22 17:34:25 -04:00  
				
					
						
							
							
								 
						
							
							
								b8bbf5f545 
								
							
								 
							
						 
						
							
							
								
								field_offset: Use actual type instances instead of reinterpret_cast(type, 1)  
							
							... 
							
							
							
							ui_build_selector is a virtual class as of 0.42.06, so reinterpret_cast-ing it
with bad addresses will crash. 'df.new(df.ui_build_selector)' works just fine. 
							
						 
						
							2016-03-22 17:27:53 -04:00  
				
					
						
							
							
								 
						
							
							
								a3ddc63836 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/DFHack/dfhack  into develop  
							
							... 
							
							
							
							Conflicts:
	plugins/remotefortressreader.cpp 
							
						 
						
							2016-03-20 16:30:49 +05:30  
				
					
						
							
							
								 
						
							
							
								e505bf0a58 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-18 17:05:59 -04:00  
				
					
						
							
							
								 
						
							
							
								76793045a9 
								
							
								 
							
						 
						
							
							
								
								Only block keyboard events in OS X SDL_PollEvent hook without focus  
							
							... 
							
							
							
							Blocking all events causes issues with window manager controls when the window
is not focused - for example, DF doesn't resize certain screen buffers, leading
to flickering in OpenGL print modes. 
							
						 
						
							2016-03-13 10:33:25 -04:00  
				
					
						
							
							
								 
						
							
							
								f8ff447cb5 
								
							
								 
							
						 
						
							
							
								
								Add a check to the histfig fix and tweak NEWS.  
							
							
							
						 
						
							2016-03-10 08:50:03 -05:00  
				
					
						
							
							
								 
						
							
							
								fd132d3fe7 
								
							
								 
							
						 
						
							
							
								
								Fix persistent histfig crashbug.  
							
							
							
						 
						
							2016-03-10 08:38:55 -05:00  
				
					
						
							
							
								 
						
							
							
								cbb4275a44 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-09 14:54:24 -05:00  
				
					
						
							
							
								 
						
							
							
								dd9f1bf759 
								
							
								 
							
						 
						
							
							
								
								make world friend of machine and building handlers to allow use their  
							
							... 
							
							
							
							protected constructor 
							
						 
						
							2016-03-09 13:03:16 +02:00  
				
					
						
							
							
								 
						
							
							
								c700847bcf 
								
							
								 
							
						 
						
							
							
								
								Remove a couple unneeded includes  
							
							
							
						 
						
							2016-03-04 20:23:00 -05:00  
				
					
						
							
							
								 
						
							
							
								c595f7908a 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-04 20:22:09 -05:00  
				
					
						
							
							
								 
						
							
							
								9da79544de 
								
							
								 
							
						 
						
							
							
								
								fix Units::isCitizen  
							
							... 
							
							
							
							fixes a lot of issues where plugins ignore non-dwarf citizens and work
with dwarf mercenaries and bards, where it shouldnot 
							
						 
						
							2016-03-04 22:48:33 +02:00  
				
					
						
							
							
								 
						
							
							
								8eb39cc1d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/dfhack/dfhack  into develop  
							
							
							
						 
						
							2016-03-03 23:19:03 -05:00  
				
					
						
							
							
								 
						
							
							
								0db3c72557 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-03-03 23:18:36 -05:00  
				
					
						
							
							
								 
						
							
							
								d508028bcc 
								
							
								 
							
						 
						
							
							
								
								fix job-duplicate (do not clone posting_index)  
							
							... 
							
							
							
							if job cannot be done right now, game puts it in df.global.world.job_postings
when job finally can be done, game removes job from postings and clears posting_index
that index should not be cloned by job-duplicate(new jobs(added by vanilla way) have that value -1 always anyway)
cloning posting_index into the new job causes that job to be ignored 
							
						 
						
							2016-03-03 21:32:16 +02:00  
				
					
						
							
							
								 
						
							
							
								5334bd8a6a 
								
							
								 
							
						 
						
							
							
								
								Bump version to 0.42.06-alpha0 and update xml  
							
							
							
						 
						
							2016-02-28 11:18:27 -05:00  
				
					
						
							
							
								 
						
							
							
								5bb19a230f 
								
							
								 
							
						 
						
							
							
								
								getKillCount: also search kills->events  
							
							
							
						 
						
							2016-02-25 15:34:56 -05:00  
				
					
						
							
							
								 
						
							
							
								25507a10f9 
								
							
								 
							
						 
						
							
							
								
								Add Units::getKillCount() and expose it to Lua  
							
							
							
						 
						
							2016-02-25 15:21:14 -05:00  
				
					
						
							
							
								 
						
							
							
								3e44aabf12 
								
							
								 
							
						 
						
							
							
								
								Expose Units::getSquadName to lua  
							
							
							
						 
						
							2016-02-25 15:19:35 -05:00  
				
					
						
							
							
								 
						
							
							
								297bbd6f20 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'warmist/develop' into develop ( closes   #772 )  
							
							
							
						 
						
							2016-02-24 17:24:03 -05:00  
				
					
						
							
							
								 
						
							
							
								83c70ccb0f 
								
							
								 
							
						 
						
							
							
								
								forbid manipulator editing non-citizens  
							
							
							
						 
						
							2016-02-11 13:31:52 +02:00  
				
					
						
							
							
								 
						
							
							
								fafe1e9ce1 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-02-03 23:19:41 -05:00  
				
					
						
							
							
								 
						
							
							
								d4988c5faf 
								
							
								 
							
						 
						
							
							
								
								Add no handler version of lua event.  
							
							
							
						 
						
							2016-02-01 22:22:12 +02:00  
				
					
						
							
							
								 
						
							
							
								0a670bb0db 
								
							
								 
							
						 
						
							
							
								
								Implement  #804 , move some functions to Units, colorize zone output, a  
							
							... 
							
							
							
							little cleanup 
							
						 
						
							2016-02-01 11:12:06 -05:00  
				
					
						
							
							
								 
						
							
							
								2d23a848cc 
								
							
								 
							
						 
						
							
							
								
								git-describe: Add git xml information  
							
							
							
						 
						
							2016-02-01 10:30:53 -05:00  
				
					
						
							
							
								 
						
							
							
								77466f01e0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'BenLubar/benlubar-valgrind' into develop  
							
							
							
						 
						
							2016-01-31 14:52:04 -05:00  
				
					
						
							
							
								 
						
							
							
								248331a196 
								
							
								 
							
						 
						
							
							
								
								buildingplan: Support floodgates, grates, bars  
							
							... 
							
							
							
							See #808  
							
						 
						
							2016-01-31 14:50:07 -05:00  
				
					
						
							
							
								 
						
							
							
								ea9261f5b5 
								
							
								 
							
						 
						
							
							
								
								allow dfhack to run inside valgrind  
							
							... 
							
							
							
							valgrind replaces the readlink system call, but not the open system
call. By calling readlink first, we guarantee that /proc/self/exe is the
actual Dwarf Fortress executable and not the valgrind executable.
See also: https://bugs.kde.org/show_bug.cgi?id=86921  
							
						 
						
							2016-01-31 13:34:07 -06:00  
				
					
						
							
							
								 
						
							
							
								80fd2270db 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/dfhack/dfhack  into develop  
							
							
							
						 
						
							2016-01-31 14:22:57 -05:00  
				
					
						
							
							
								 
						
							
							
								a316dfa074 
								
							
								 
							
						 
						
							
							
								
								set floodgate flags correctly when allocating it in lua or c++  
							
							... 
							
							
							
							https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/plugins/ruby/building.rb#L63  
						
							2016-01-29 14:50:50 -06:00  
				
					
						
							
							
								 
						
							
							
								80ecbbd369 
								
							
								 
							
						 
						
							
							
								
								get rid of "private" comment in BitArray.h  
							
							
							
						 
						
							2016-01-21 16:49:16 -05:00  
				
					
						
							
							
								 
						
							
							
								675d173266 
								
							
								 
							
						 
						
							
							
								
								set civzone number when constructing a civzone  
							
							
							
						 
						
							2016-01-18 14:46:39 -06:00  
				
					
						
							
							
								 
						
							
							
								0b2ba377be 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-01-18 11:49:37 -05:00  
				
					
						
							
							
								 
						
							
							
								ab8cce2a86 
								
							
								 
							
						 
						
							
							
								
								Update xml  
							
							
							
						 
						
							2016-01-18 10:13:16 -05:00