Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								274d6038ad
								
							
								
							
						 | 
						
							
							
								
								Merge further changes (???)
							
							
							
							
							
						 | 
						
							2012-09-10 09:19:21 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								270351f510
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/danaris/dfhack
							
							
							
							
							
						 | 
						
							2012-09-10 09:18:24 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								45456b2230
								
							
								
							
						 | 
						
							
							
								
								Enable building Stonesense and Ruby support
							
							
							
							
							
						 | 
						
							2012-07-05 11:39:27 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								068542d58a
								
							
								
							
						 | 
						
							
							
								
								Submodule changes
							
							
							
							
							
						 | 
						
							2012-07-05 11:39:08 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								b718912184
								
							
								
							
						 | 
						
							
							
								
								Fix Ruby build
							
							
							
							
							
						 | 
						
							2012-07-05 10:31:55 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								421e5fd82c
								
							
								
							
						 | 
						
							
							
								
								Swap order of includes to work around silly compiler/assembler bug on OS X
							
							
							
							
							
						 | 
						
							2012-07-02 11:02:48 -04:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								554683929f
								
							
								
							
						 | 
						
							
							
								
								ruby: allow explicit target-os override in codegen
							
							
							
							
							
						 | 
						
							2012-07-01 14:20:55 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								31a5495031
								
							
								
							
						 | 
						
							
							
								
								ruby: osx support (maybe)
							
							
							
							
							
						 | 
						
							2012-06-29 17:51:26 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								592c0a41ac
								
							
								
							
						 | 
						
							
							
								
								ruby: remove useless raise in unit_find
							
							
							
							
							
						 | 
						
							2012-06-29 11:29:36 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								56ff129ee0
								
							
								
							
						 | 
						
							
							
								
								ruby: fix enum + base-type
							
							
							
							
							
						 | 
						
							2012-06-29 11:25:41 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								24aa3827c1
								
							
								
							
						 | 
						
							
							
								
								ruby: generate accessors for refers-to and vector of ref-target
							
							
							
							
							
						 | 
						
							2012-06-27 14:52:34 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								c2c29af959
								
							
								
							
						 | 
						
							
							
								
								ruby: fix deadlock on df exit due to BEGIN_UNLOAD + Core.Suspend()
							
							
							
							
							
						 | 
						
							2012-06-25 19:16:35 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								412e8608d8
								
							
								
							
						 | 
						
							
							
								
								ruby: add method for basic xml ref-target support, tweak scripts/slayrace
							
							
							
							
							
						 | 
						
							2012-06-25 19:05:50 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								17d06b969b
								
							
								
							
						 | 
						
							
							
								
								ruby: move all ruby invocations inside a CoreSuspend lock, remove ruby suspend method
							
							
							
							
							
						 | 
						
							2012-06-25 17:06:37 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								8fb139a2f4
								
							
								
							
						 | 
						
							
							
								
								ruby: document mutex use, load ruby-autogen in the background
							
							
							
							
							
						 | 
						
							2012-06-25 01:45:50 +02:00 | 
						
					
				
					
						
							
							
								 
								Timothy G Collett
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								d1762e3cb8
								
							
								
							
						 | 
						
							
							
								
								ruby: add growcrops script, add doc for methods in README
							
							
							
							
							
						 | 
						
							2012-06-24 21:44:40 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								552da8417e
								
							
								
							
						 | 
						
							
							
								
								ruby: handle .rb files in df/hack/scripts/
							
							
							
							
							
						 | 
						
							2012-06-24 20:24:46 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								3f4d2e4792
								
							
								
							
						 | 
						
							
							
								
								ruby: split ruby.rb in modules
							
							
							
							
							
						 | 
						
							2012-06-24 17:30:26 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								4c2d4d4b86
								
							
								
							
						 | 
						
							
							
								
								ruby: clean stuff up, install ruby modules in df/hack/ruby/
							
							
							
							
							
						 | 
						
							2012-06-24 16:09:31 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								ad1ba9bf6b
								
							
								
							
						 | 
						
							
							
								
								ruby: try msvc workaround for __thiscall
							
							
							
							
							
						 | 
						
							2012-06-24 02:59:56 +02:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								1327b4954a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/angavrilov/dfhack
							
							
							
							
							
						 | 
						
							2012-06-18 10:04:45 -05:00 | 
						
					
				
					
						
							
							
								 
								Alexander Gavrilov
							
						 | 
						
							
							
							
							
								
							
								db91850464
								
							
								
							
						 | 
						
							
							
								
								Sync to the change in gamemode/gametype globals.
							
							
							
							
							
						 | 
						
							2012-06-16 14:42:56 +04:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								0bdae68294
								
							
								
							
						 | 
						
							
							
								
								ruby: fix codegen enum base-types
							
							
							
							
							
						 | 
						
							2012-06-15 21:02:04 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								cfdf941c52
								
							
								
							
						 | 
						
							
							
								
								ruby: fix windows build warnings/load ruby.rb
							
							
							
							
							
						 | 
						
							2012-06-14 22:35:59 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								6bd67cc055
								
							
								
							
						 | 
						
							
							
								
								ruby: try to fix msvc build (use fastcall for thiscall fptr)
							
							
							
							
							
						 | 
						
							2012-06-14 14:25:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Petr Mrázek
							
						 | 
						
							
							
							
							
								
							
								2781723f7b
								
							
								
							
						 | 
						
							
							
								
								Linux build works again.
							
							
							
							
							
						 | 
						
							2012-06-14 02:25:15 +02:00 | 
						
					
				
					
						
							
							
								 
								Petr Mrázek
							
						 | 
						
							
							
							
							
								
							
								5f33ebde41
								
							
								
							
						 | 
						
							
							
								
								Merge https://github.com/Rinin/dfhack
							
							
							
							
							
						 | 
						
							2012-06-14 00:01:38 +02:00 | 
						
					
				
					
						
							
							
								 
								Petr Mrázek
							
						 | 
						
							
							
							
							
								
							
								52f9fe4a6a
								
							
								
							
						 | 
						
							
							
								
								Merge https://github.com/danaris/dfhack
							
							
							
							
							
							
							
							Conflicts:
	depends/clsocket 
							
						 | 
						
							2012-06-14 00:00:36 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								0285448367
								
							
								
							
						 | 
						
							
							
								
								ruby: fix download url, cmake doesnt handle HTTP 301
							
							
							
							
							
						 | 
						
							2012-06-13 00:20:52 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								3c1cb24d9f
								
							
								
							
						 | 
						
							
							
								
								ruby: download lib from github as tgz, switch to ruby18, simply log to stderr.log if cannot load libruby
							
							
							
							
							
						 | 
						
							2012-06-12 18:51:33 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								95606ee3dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack
							
							
							
							
							
						 | 
						
							2012-06-11 16:00:00 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								c0e7295f22
								
							
								
							
						 | 
						
							
							
								
								ruby: fix cmake to rebuild ruby-autogen.rb only when necessary
							
							
							
							
							
						 | 
						
							2012-06-10 23:42:58 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								7ee8d79014
								
							
								
							
						 | 
						
							
							
								
								ruby: download libruby with cmake
							
							
							
							
							
						 | 
						
							2012-06-10 02:06:22 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								bc734619b4
								
							
								
							
						 | 
						
							
							
								
								ruby: use ruby1.9.1 on linux
							
							
							
							
							
						 | 
						
							2012-06-10 01:45:30 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								2aace670ea
								
							
								
							
						 | 
						
							
							
								
								ruby: dlopen libruby -- currently segfaults with rb1.9 ...
							
							
							
							
							
						 | 
						
							2012-06-02 23:44:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								e143c312bf
								
							
								
							
						 | 
						
							
							
								
								Sync with df-structures changes
							
							
							
							
							
						 | 
						
							2012-05-31 19:13:11 -05:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								884cf53b0b
								
							
								
							
						 | 
						
							
							
								
								body_part_raw has its own set of flags which do NOT match body_part_template
							
							
							
							
							
						 | 
						
							2012-05-30 08:02:53 -05:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								3e61452f15
								
							
								
							
						 | 
						
							
							
								
								ruby: codegen code cleanup, move ruby-memstruct in ruby.rb, handle bool struct fields, rename Enum.to_sym/to_i to sym()/int(), define nested compound sizeof()
							
							
							
							
							
						 | 
						
							2012-05-29 18:30:18 +02:00 | 
						
					
				
					
						
							
							
								 
								jj
							
						 | 
						
							
							
							
							
								
							
								bcb698a5b4
								
							
								
							
						 | 
						
							
							
								
								ruby: have codegen compute struct offsets directly
							
							
							
							
							
						 | 
						
							2012-05-29 16:10:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Alexander Gavrilov
							
						 | 
						
							
							
							
							
								
							
								e72bf1ac9a
								
							
								
							
						 | 
						
							
							
								
								Sync to changes in df-structures.
							
							
							
							
							
						 | 
						
							2012-05-26 14:49:27 +04:00 | 
						
					
				
					
						
							
							
								 
								Alexander Gavrilov
							
						 | 
						
							
							
							
							
								
							
								8644ea4dc0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'q-github/master'
							
							
							
							
							
						 | 
						
							2012-05-26 14:41:36 +04:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								800cbca578
								
							
								
							
						 | 
						
							
							
								
								Some improvements to showmood - show relevant skill, cleanup messages
							
							
							
							
							
						 | 
						
							2012-05-25 21:31:47 -05:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								44c3afc306
								
							
								
							
						 | 
						
							
							
								
								Merge git://github.com/quietust/dfhack
							
							
							
							
							
							
							
							Gotta get the changes that prevent DFHack from crashing. 
							
						 | 
						
							2012-05-24 15:39:11 -04:00 | 
						
					
				
					
						
							
							
								 
								Timothy Collett
							
						 | 
						
							
							
							
							
								
							
								24d221052b
								
							
								
							
						 | 
						
							
							
								
								Initial changes to get dfhack building on the Mac
							
							
							
							
							
						 | 
						
							2012-05-24 11:31:20 -04:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								ae41ddc04a
								
							
								
							
						 | 
						
							
							
								
								Don't crash if world is undefined
							
							
							
							
							
						 | 
						
							2012-05-23 13:43:41 -05:00 | 
						
					
				
					
						
							
							
								 
								Quietust
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Rinin
							
						 | 
						
							
							
							
							
								
							
								705b60ca27
								
							
								
							
						 | 
						
							
							
								
								Fixed BrewDrink products counting
							
							
							
							
							
						 | 
						
							2012-05-22 19:22:36 +04:00 | 
						
					
				
					
						
							
							
								 
								Alexander Gavrilov
							
						 | 
						
							
							
							
							
								
							
								65349039f0
								
							
								
							
						 | 
						
							
							
								
								Fix workflow bug: properly deduce the output material of BrewDrink jobs.
							
							
							
							
							
						 | 
						
							2012-05-22 17:50:48 +04:00 |