6f67a71e00 
								
							
								 
							
						 
						
							
							
								
								Search for cur_season and cur_season_tick in devel/find-offsets.  
							
							
							
						 
						
							2012-09-22 14:52:08 +04:00  
				
					
						
							
							
								 
						
							
							
								038d62367e 
								
							
								 
							
						 
						
							
							
								
								Implement explicit hook priority in vmethod interpose.  
							
							... 
							
							
							
							This resolves a getName order conflict between power-meter and rename. 
							
						 
						
							2012-09-22 13:14:06 +04:00  
				
					
						
							
							
								 
						
							
							
								82dc1445cf 
								
							
								 
							
						 
						
							
							
								
								Support the Room list in getSelectedBuilding.  
							
							
							
						 
						
							2012-09-20 11:55:53 +04:00  
				
					
						
							
							
								 
						
							
							
								c39a337223 
								
							
								 
							
						 
						
							
							
								
								Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.  
							
							
							
						 
						
							2012-09-20 11:11:20 +04:00  
				
					
						
							
							
								 
						
							
							
								7ce772ae0e 
								
							
								 
							
						 
						
							
							
								
								Add an API function that returns the selected building.  
							
							
							
						 
						
							2012-09-20 10:41:03 +04:00  
				
					
						
							
							
								 
						
							
							
								a4799a384b 
								
							
								 
							
						 
						
							
							
								
								Catch C++ exceptions in dfhack.buildings.setSize  
							
							
							
						 
						
							2012-09-18 20:45:59 +04:00  
				
					
						
							
							
								 
						
							
							
								57b72831ca 
								
							
								 
							
						 
						
							
							
								
								Overhaul the concept of lua 'class' initialization yet again.  
							
							
							
						 
						
							2012-09-18 20:30:25 +04:00  
				
					
						
							
							
								 
						
							
							
								d70a79deb9 
								
							
								 
							
						 
						
							
							
								
								Follow changes in XML defs.  
							
							
							
						 
						
							2012-09-18 13:11:11 +04:00  
				
					
						
							
							
								 
						
							
							
								be928a9dc5 
								
							
								 
							
						 
						
							
							
								
								Fix a data structure integrity bug in VMethodInterposeLinkBase.  
							
							... 
							
							
							
							This causes assertion failure and abort later on. 
							
						 
						
							2012-09-18 10:40:14 +04:00  
				
					
						
							
							
								 
						
							
							
								36e44c682c 
								
							
								 
							
						 
						
							
							
								
								Add a plugin implementing 'add spatter to item' reactions.  
							
							
							
						 
						
							2012-09-17 21:15:51 +04:00  
				
					
						
							
							
								 
						
							
							
								c1e20c6f05 
								
							
								 
							
						 
						
							
							
								
								Follow changes to structures.  
							
							
							
						 
						
							2012-09-17 12:47:18 +04:00  
				
					
						
							
							
								 
						
							
							
								811c096c0e 
								
							
								 
							
						 
						
							
							
								
								Vaporize liquids from barrels, and destroy bin contents in siege engine.  
							
							
							
						 
						
							2012-09-14 20:22:49 +04:00  
				
					
						
							
							
								 
						
							
							
								24772f4dbc 
								
							
								 
							
						 
						
							
							
								
								Add an api function for destroying items.  
							
							
							
						 
						
							2012-09-14 18:49:02 +04:00  
				
					
						
							
							
								 
						
							
							
								d22591e240 
								
							
								 
							
						 
						
							
							
								
								Fix a file descriptor leak and a crash in linux getMemRanges.  
							
							
							
						 
						
							2012-09-14 12:35:55 +04:00  
				
					
						
							
							
								 
						
							
							
								1d8c9a6a5f 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/danaris/dfhack  
							
							
							
						 
						
							2012-09-13 14:30:44 -05:00  
				
					
						
							
							
								 
						
							
							
								24b93ea61f 
								
							
								 
							
						 
						
							
							
								
								Library location fixing script  
							
							
							
						 
						
							2012-09-13 14:58:52 -04:00  
				
					
						
							
							
								 
						
							
							
								46321a6a01 
								
							
								 
							
						 
						
							
							
								
								Rename world_data.unk_204 to feature_map  
							
							
							
						 
						
							2012-09-12 13:41:59 -05:00  
				
					
						
							
							
								 
						
							
							
								f06f9af6b8 
								
							
								 
							
						 
						
							
							
								
								Throw items from bins around in siege engine, like minecarts do.  
							
							
							
						 
						
							2012-09-12 20:57:25 +04:00  
				
					
						
							
							
								 
						
							
							
								7c71aeab5f 
								
							
								 
							
						 
						
							
							
								
								Add function for making item projectiles.  
							
							
							
						 
						
							2012-09-12 18:17:42 +04:00  
				
					
						
							
							
								 
						
							
							
								3a075f4bc7 
								
							
								 
							
						 
						
							
							
								
								Trivial siege engine aiming at units, with logic in lua.  
							
							
							
						 
						
							2012-09-11 19:17:24 +04:00  
				
					
						
							
							
								 
						
							
							
								ccefd02ee3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-09-10 11:56:23 -04:00  
				
					
						
							
							
								 
						
							
							
								96abc903ab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  http://github.com/peterix/dfhack  
							
							
							
						 
						
							2012-09-10 11:54:56 -04:00  
				
					
						
							
							
								 
						
							
							
								274d6038ad 
								
							
								 
							
						 
						
							
							
								
								Merge further changes (???)  
							
							
							
						 
						
							2012-09-10 09:19:21 -04:00  
				
					
						
							
							
								 
						
							
							
								270351f510 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/danaris/dfhack  
							
							
							
						 
						
							2012-09-10 09:18:24 -04:00  
				
					
						
							
							
								 
						
							
							
								9679b7729c 
								
							
								 
							
						 
						
							
							
								
								Clean up the movement speed calculation function and move into the core.  
							
							
							
						 
						
							2012-09-09 17:04:58 +04:00  
				
					
						
							
							
								 
						
							
							
								ec3d489bda 
								
							
								 
							
						 
						
							
							
								
								Move curse-affected attribute value getters to the core.  
							
							
							
						 
						
							2012-09-09 12:51:08 +04:00  
				
					
						
							
							
								 
						
							
							
								a36fe25e72 
								
							
								 
							
						 
						
							
							
								
								Finish the effective skill computation function, and move to core.  
							
							
							
						 
						
							2012-09-09 12:27:40 +04:00  
				
					
						
							
							
								 
						
							
							
								94b729579e 
								
							
								 
							
						 
						
							
							
								
								Reindent to remove tabs.  
							
							
							
						 
						
							2012-09-09 10:53:08 +04:00  
				
					
						
							
							
								 
						
							
							
								8e0f3e3bce 
								
							
								 
							
						 
						
							
							
								
								Added ListBox to gui.dialogs  
							
							... 
							
							
							
							A listbox class. Can be either filled with table of strings, or string+callback tables. Needs some code revision :) 
							
						 
						
							2012-09-09 02:28:07 +03:00  
				
					
						
							
							
								 
						
							
							
								fb88aad51d 
								
							
								 
							
						 
						
							
							
								
								Reverse-engineer unit speed computation from DF code.  
							
							
							
						 
						
							2012-09-08 21:07:18 +04:00  
				
					
						
							
							
								 
						
							
							
								bfa6ed3e08 
								
							
								 
							
						 
						
							
							
								
								Support setting the target area for the siege engine.  
							
							
							
						 
						
							2012-09-08 13:46:02 +04:00  
				
					
						
							
							
								 
						
							
							
								325e294af2 
								
							
								 
							
						 
						
							
							
								
								Start the siege engine plugin with code to highlight obstacles on screen.  
							
							
							
						 
						
							2012-09-07 19:54:32 +04:00  
				
					
						
							
							
								 
						
							
							
								e925d8f4d9 
								
							
								 
							
						 
						
							
							
								
								Add an API function for reading tiles from the screen buffers.  
							
							
							
						 
						
							2012-09-07 11:36:45 +04:00  
				
					
						
							
							
								 
						
							
							
								c971a819de 
								
							
								 
							
						 
						
							
							
								
								Experimental creation of map blocks in gui/liquids script.  
							
							
							
						 
						
							2012-09-06 22:45:19 +04:00  
				
					
						
							
							
								 
						
							
							
								d5ea05ebb8 
								
							
								 
							
						 
						
							
							
								
								Implement a pressure plate sensitive to machine power.  
							
							... 
							
							
							
							When built next to a gearbox, it will monitor its powered state. 
							
						 
						
							2012-09-06 12:37:29 +04:00  
				
					
						
							
							
								 
						
							
							
								8d876cc7d9 
								
							
								 
							
						 
						
							
							
								
								Support renaming some buildings, and arbitrary units, via gui script.  
							
							
							
						 
						
							2012-09-05 21:27:42 +04:00  
				
					
						
							
							
								 
						
							
							
								57086ac56e 
								
							
								 
							
						 
						
							
							
								
								Add stock MessageBox and InputBox dialog screens for lua scripts.  
							
							
							
						 
						
							2012-09-05 19:45:45 +04:00  
				
					
						
							
							
								 
						
							
							
								27f169e298 
								
							
								 
							
						 
						
							
							
								
								Provide a partial application utility function to lua.  
							
							... 
							
							
							
							Implemented in C++ for efficiency. 
							
						 
						
							2012-09-05 17:37:36 +04:00  
				
					
						
							
							
								 
						
							
							
								3b8e3d1459 
								
							
								 
							
						 
						
							
							
								
								Fix wrong assumptions in lua wrapper for BitArray.  
							
							
							
						 
						
							2012-09-02 17:18:01 +04:00  
				
					
						
							
							
								 
						
							
							
								3713c5ea9e 
								
							
								 
							
						 
						
							
							
								
								Add some APIs required by steam engine to the core.  
							
							
							
						 
						
							2012-09-02 14:10:58 +04:00  
				
					
						
							
							
								 
						
							
							
								8536785d1d 
								
							
								 
							
						 
						
							
							
								
								Boilers made out of unsuitable materials should explode!  
							
							
							
						 
						
							2012-09-01 20:46:34 +04:00  
				
					
						
							
							
								 
						
							
							
								e0097d8d43 
								
							
								 
							
						 
						
							
							
								
								Fix access to unnamed bits in bitfields, and allow hook.apply(false)  
							
							
							
						 
						
							2012-09-01 11:25:24 +04:00  
				
					
						
							
							
								 
						
							
							
								0f1be28637 
								
							
								 
							
						 
						
							
							
								
								Follow xml changes.  
							
							
							
						 
						
							2012-09-01 00:17:08 +04:00  
				
					
						
							
							
								 
						
							
							
								750eefe48a 
								
							
								 
							
						 
						
							
							
								
								Follow unconditional JMP chains in MSVC vmethod ptr detection.  
							
							
							
						 
						
							2012-08-30 19:28:53 +04:00  
				
					
						
							
							
								 
						
							
							
								8a617edb10 
								
							
								 
							
						 
						
							
							
								
								Support "ls -a" to list scripts in subdirs.  
							
							
							
						 
						
							2012-08-29 19:03:53 +04:00  
				
					
						
							
							
								 
						
							
							
								f1915915b4 
								
							
								 
							
						 
						
							
							
								
								Follow change in xml again.  
							
							
							
						 
						
							2012-08-27 23:03:02 +04:00  
				
					
						
							
							
								 
						
							
							
								5fed060d7d 
								
							
								 
							
						 
						
							
							
								
								Follow field rename in xml.  
							
							
							
						 
						
							2012-08-27 16:01:11 +04:00  
				
					
						
							
							
								 
						
							
							
								b2bdc199cb 
								
							
								 
							
						 
						
							
							
								
								Fix NULL pointer access in ~virtual_identity.  
							
							
							
						 
						
							2012-08-26 22:43:18 +04:00  
				
					
						
							
							
								 
						
							
							
								3402a3cd5d 
								
							
								 
							
						 
						
							
							
								
								Fix a deadlock problem between suspend in (un)load, and onupdate.  
							
							
							
						 
						
							2012-08-26 14:43:14 +04:00  
				
					
						
							
							
								 
						
							
							
								7f1e4b46bc 
								
							
								 
							
						 
						
							
							
								
								Implement inheritance-aware vmethod interposing.  
							
							... 
							
							
							
							I.e. overwriting the vmethod in all vtables that use it, not only one. 
							
						 
						
							2012-08-26 14:43:14 +04:00  
				
					
						
							
							
								 
						
							
							
								41ad42d0fd 
								
							
								 
							
						 
						
							
							
								
								Expose the liquids plugin engine to lua, and make a wrapper gui script.  
							
							
							
						 
						
							2012-08-25 10:37:03 +04:00  
				
					
						
							
							
								 
						
							
							
								9154564e71 
								
							
								 
							
						 
						
							
							
								
								Sync up submodules  
							
							
							
						 
						
							2012-08-24 21:56:16 +02:00  
				
					
						
							
							
								 
						
							
							
								8359e80b23 
								
							
								 
							
						 
						
							
							
								
								Expose a few API functions to lua, and implement a room browser overlay.  
							
							
							
						 
						
							2012-08-24 18:26:18 +04:00  
				
					
						
							
							
								 
						
							
							
								d52c54cc76 
								
							
								 
							
						 
						
							
							
								
								Pull some minor stuff from mechanisms into main libs.  
							
							
							
						 
						
							2012-08-24 13:49:22 +04:00  
				
					
						
							
							
								 
						
							
							
								296f82b02f 
								
							
								 
							
						 
						
							
							
								
								Try using the Objective-C 'alloc + init' idiom for lua screen objects.  
							
							
							
						 
						
							2012-08-24 13:28:34 +04:00  
				
					
						
							
							
								 
						
							
							
								e825dc5ddb 
								
							
								 
							
						 
						
							
							
								
								Tweak the API for current viewscreen, and dispatch show/dismiss from C++.  
							
							
							
						 
						
							2012-08-24 13:20:08 +04:00  
				
					
						
							
							
								 
						
							
							
								b12b9fa91e 
								
							
								 
							
						 
						
							
							
								
								Suspend DF around loading and unloading plugins.  
							
							... 
							
							
							
							This is necessary to improve safety of vtable interposing. 
							
						 
						
							2012-08-23 19:51:55 +04:00  
				
					
						
							
							
								 
						
							
							
								c6c5ad56c9 
								
							
								 
							
						 
						
							
							
								
								Track lua event listener count, and let the C++ host know.  
							
							... 
							
							
							
							This allows completely avoiding the call overhead if there
are none. The downside is that the event object now has to
be a userdata with lots of metamethods. 
							
						 
						
							2012-08-23 19:27:28 +04:00  
				
					
						
							
							
								 
						
							
							
								1e28ceff6d 
								
							
								 
							
						 
						
							
							
								
								Add getProfessionColor and getCasteProfessionColor to Units module  
							
							
							
						 
						
							2012-08-22 16:54:00 -05:00  
				
					
						
							
							
								 
						
							
							
								cf4b8a0196 
								
							
								 
							
						 
						
							
							
								
								Improve viewport manipulation utilities and support scroll in mechanisms.  
							
							... 
							
							
							
							I.e. allow the user to scroll around with cursor keys,
provided that keeps the cursor still visible. 
							
						 
						
							2012-08-22 22:29:01 +04:00  
				
					
						
							
							
								 
						
							
							
								f0fc3acf87 
								
							
								 
							
						 
						
							
							
								
								Turn an assert in vmethod interpose code into a mandatory check and abort.  
							
							
							
						 
						
							2012-08-22 18:22:59 +04:00  
				
					
						
							
							
								 
						
							
							
								7987ea9a98 
								
							
								 
							
						 
						
							
							
								
								Put some compatibility features into the base dfhack viewscreen.  
							
							
							
						 
						
							2012-08-22 18:18:19 +04:00  
				
					
						
							
							
								 
						
							
							
								6e8b68fb29 
								
							
								 
							
						 
						
							
							
								
								Add yet one more frame style.  
							
							
							
						 
						
							2012-08-22 13:06:06 +04:00  
				
					
						
							
							
								 
						
							
							
								2b79582e99 
								
							
								 
							
						 
						
							
							
								
								Implement a policy of marking DFHack-owned screens with a signature.  
							
							
							
						 
						
							2012-08-22 12:28:01 +04:00  
				
					
						
							
							
								 
						
							
							
								8969fc9435 
								
							
								 
							
						 
						
							
							
								
								manipulator: Inherit from dfhack_viewscreen, and don't use itoa.  
							
							
							
						 
						
							2012-08-22 12:23:56 +04:00  
				
					
						
							
							
								 
						
							
							
								51ba252344 
								
							
								 
							
						 
						
							
							
								
								Add Screen::drawBorder(string), duplicates DF's interfacest::drawborder()  
							
							
							
						 
						
							2012-08-21 15:28:11 -05:00  
				
					
						
							
							
								 
						
							
							
								985d96c596 
								
							
								 
							
						 
						
							
							
								
								Allow interposing the 1st vmethod  
							
							
							
						 
						
							2012-08-21 15:27:29 -05:00  
				
					
						
							
							
								 
						
							
							
								15235cc938 
								
							
								 
							
						 
						
							
							
								
								More work on utilities for making lua viewscreens.  
							
							
							
						 
						
							2012-08-21 19:40:37 +04:00  
				
					
						
							
							
								 
						
							
							
								451e965936 
								
							
								 
							
						 
						
							
							
								
								Add a Painter class for lua viewscreens, and extract other utilities.  
							
							... 
							
							
							
							Painter clips to an arbitrary rectangle window, and
tracks current cursor and color state. 
							
						 
						
							2012-08-21 11:35:39 +04:00  
				
					
						
							
							
								 
						
							
							
								601a3a7927 
								
							
								 
							
						 
						
							
							
								
								Add a script that implements a linked mechanism browser.  
							
							
							
						 
						
							2012-08-20 23:04:01 +04:00  
				
					
						
							
							
								 
						
							
							
								38a07a4ca5 
								
							
								 
							
						 
						
							
							
								
								Export the tile finder function to lua, and improve mouse event reporting.  
							
							
							
						 
						
							2012-08-19 20:00:10 +04:00  
				
					
						
							
							
								 
						
							
							
								cacb082416 
								
							
								 
							
						 
						
							
							
								
								Add a stupid example of a lua-controlled viewscreen.  
							
							
							
						 
						
							2012-08-19 17:53:25 +04:00  
				
					
						
							
							
								 
						
							
							
								30f71ff510 
								
							
								 
							
						 
						
							
							
								
								Implement support for lua-backed viewscreens.  
							
							
							
						 
						
							2012-08-19 14:27:44 +04:00  
				
					
						
							
							
								 
						
							
							
								b8ee52131b 
								
							
								 
							
						 
						
							
							
								
								Add a module for painting tiles into the gps global.  
							
							
							
						 
						
							2012-08-19 09:31:09 +04:00  
				
					
						
							
							
								 
						
							
							
								fd0bf2ef92 
								
							
								 
							
						 
						
							
							
								
								Extract the color enum from color_ostream to toplevel.  
							
							
							
						 
						
							2012-08-19 09:21:25 +04:00  
				
					
						
							
							
								 
						
							
							
								c6694e386f 
								
							
								 
							
						 
						
							
							
								
								Add rather inefficient type_identity wrapping for std::set.  
							
							... 
							
							
							
							Accessing an element is O(N), as if it was walking a list. 
							
						 
						
							2012-08-18 14:34:20 +04:00  
				
					
						
							
							
								 
						
							
							
								24cc8b5c7a 
								
							
								 
							
						 
						
							
							
								
								Expose an API to claim the suspend lock from the Core.  
							
							... 
							
							
							
							Previously it was hard-coded in Core::Update, but interposed
vmethods may need this feature too. 
							
						 
						
							2012-08-18 11:52:38 +04:00  
				
					
						
							
							
								 
						
							
							
								01ba2a31fc 
								
							
								 
							
						 
						
							
							
								
								Tweak the interpose API, and fix a couple of bugs.  
							
							
							
						 
						
							2012-08-18 11:48:07 +04:00  
				
					
						
							
							
								 
						
							
							
								236ffd578b 
								
							
								 
							
						 
						
							
							
								
								Add experimental support for interposing vmethods of known classes.  
							
							... 
							
							
							
							The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API. 
							
						 
						
							2012-08-17 22:40:53 +04:00  
				
					
						
							
							
								 
						
							
							
								bcc41c081a 
								
							
								 
							
						 
						
							
							
								
								Add a utility function for patching read-only memory.  
							
							
							
						 
						
							2012-08-17 15:07:48 +04:00  
				
					
						
							
							
								 
						
							
							
								61185d29ca 
								
							
								 
							
						 
						
							
							
								
								console-linux: silence minor gcc warnings  
							
							
							
						 
						
							2012-08-12 00:27:20 +02:00  
				
					
						
							
							
								 
						
							
							
								589be93fbf 
								
							
								 
							
						 
						
							
							
								
								Sync with structures  
							
							
							
						 
						
							2012-08-02 14:44:59 +02:00  
				
					
						
							
							
								 
						
							
							
								9705497a7e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/peterix/dfhack  
							
							
							
						 
						
							2012-07-17 10:39:20 -05:00  
				
					
						
							
							
								 
						
							
							
								bf82b2d20d 
								
							
								 
							
						 
						
							
							
								
								Sync with df-structures  
							
							
							
						 
						
							2012-07-17 10:35:20 -05:00  
				
					
						
							
							
								 
						
							
							
								1c9194d1c4 
								
							
								 
							
						 
						
							
							
								
								While installing scripts, do not copy ~ files.  
							
							
							
						 
						
							2012-07-12 02:24:32 +02:00  
				
					
						
							
							
								 
						
							
							
								a5977db443 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-07-09 01:13:07 +02:00  
				
					
						
							
							
								 
						
							
							
								6975f643fc 
								
							
								 
							
						 
						
							
							
								
								Fixage, syncing with structures  
							
							
							
						 
						
							2012-07-09 01:05:40 +02:00  
				
					
						
							
							
								 
						
							
							
								c20951c30b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-07-06 20:37:14 +02:00  
				
					
						
							
							
								 
						
							
							
								028b47a321 
								
							
								 
							
						 
						
							
							
								
								update xml  
							
							
							
						 
						
							2012-07-06 20:36:53 +02:00  
				
					
						
							
							
								 
						
							
							
								4bbb185f7b 
								
							
								 
							
						 
						
							
							
								
								Fix build and allow autodump to any walkable tile (e.g. a stair).  
							
							
							
						 
						
							2012-07-06 20:11:20 +04:00  
				
					
						
							
							
								 
						
							
							
								8e17ebbefc 
								
							
								 
							
						 
						
							
							
								
								add SC_PAUSED / SC_UNPAUSED onStateChange events  
							
							
							
						 
						
							2012-07-05 18:03:02 +02:00  
				
					
						
							
							
								 
						
							
							
								23d28f9961 
								
							
								 
							
						 
						
							
							
								
								Update df-structures dependency  
							
							
							
						 
						
							2012-07-05 10:32:32 -04:00  
				
					
						
							
							
								 
						
							
							
								e4d4bf23ae 
								
							
								 
							
						 
						
							
							
								
								update xml, fix autolabor with new trade depot flags name  
							
							
							
						 
						
							2012-07-04 19:05:44 +02:00  
				
					
						
							
							
								 
						
							
							
								cdd711efa4 
								
							
								 
							
						 
						
							
							
								
								add COAL subtypes in MaterialInfo::getToken  
							
							
							
						 
						
							2012-07-04 17:31:41 +02:00  
				
					
						
							
							
								 
						
							
							
								a7a25b80a0 
								
							
								 
							
						 
						
							
							
								
								ruby: use the color_ostream argument from dfhack to output to dfhack-run  
							
							
							
						 
						
							2012-07-03 16:13:15 +02:00  
				
					
						
							
							
								 
						
							
							
								c24333515b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jjyg/dfhack  
							
							... 
							
							
							
							Conflicts:
	library/Core.cpp
Starting to merge in Ruby stuffs 
							
						 
						
							2012-07-02 11:07:30 -04:00  
				
					
						
							
							
								 
						
							
							
								421e5fd82c 
								
							
								 
							
						 
						
							
							
								
								Swap order of includes to work around silly compiler/assembler bug on OS X  
							
							
							
						 
						
							2012-07-02 11:02:48 -04:00  
				
					
						
							
							
								 
						
							
							
								6f433ff58f 
								
							
								 
							
						 
						
							
							
								
								Move back to using interposition to be more portable  
							
							
							
						 
						
							2012-06-29 10:15:48 -04:00  
				
					
						
							
							
								 
						
							
							
								ccbebdafb0 
								
							
								 
							
						 
						
							
							
								
								fix error spam when using Zoom hotkeys  
							
							
							
						 
						
							2012-06-28 15:05:00 +02:00  
				
					
						
							
							
								 
						
							
							
								d5ae1fc4f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/danaris/dfhack  
							
							... 
							
							
							
							Conflicts:
	depends/clsocket
	package/darwin/dfhack
	package/darwin/dfhack-run
Fixed. 
							
						 
						
							2012-06-24 18:41:24 -04:00