57fc0f3e89 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4  
							
							... 
							
							
							
							Conflicts:
	NEWS
	library/xml
	plugins/CMakeLists.txt
	plugins/autoSyndrome.cpp 
							
						 
						
							2013-10-19 20:19:29 -04:00  
				
					
						
							
							
								 
						
							
							
								e175efa689 
								
							
								 
							
						 
						
							
							
								
								Implement a template-based classical Perlin noise generator.  
							
							... 
							
							
							
							The mask argument of the Impl template is there because apparently
an inner template cannot be fully specialized, so there needs to be
some argument besides i. 
							
						 
						
							2013-10-01 18:58:04 +04:00  
				
					
						
							
							
								 
						
							
							
								599af0a4d9 
								
							
								 
							
						 
						
							
							
								
								Fix linux and windows build issues.  
							
							... 
							
							
							
							- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file. 
							
						 
						
							2013-09-30 22:51:29 +04:00  
				
					
						
							
							
								 
						
							
							
								9e81d27cd1 
								
							
								 
							
						 
						
							
							
								
								Implement the same random generator as DF uses for DFHack.  
							
							
							
						 
						
							2013-09-30 19:46:39 +04:00  
				
					
						
							
							
								 
						
							
							
								df2e04db26 
								
							
								 
							
						 
						
							
							
								
								Update xml definitions.  
							
							
							
						 
						
							2013-08-16 18:25:16 +04:00  
				
					
						
							
							
								 
						
							
							
								ba73de5e35 
								
							
								 
							
						 
						
							
							
								
								EventManager: use units.all instead of units.active.  
							
							
							
						 
						
							2013-06-20 21:34:32 -04:00  
				
					
						
							
							
								 
						
							
							
								49409d4630 
								
							
								 
							
						 
						
							
							
								
								Follow xml changes.  
							
							
							
						 
						
							2013-06-11 16:10:42 +04:00  
				
					
						
							
							
								 
						
							
							
								57c42e3927 
								
							
								 
							
						 
						
							
							
								
								Maps.ensureTileBlock: fixed temperature issues, and properly added blocks to the world.map.map_blocks vector to prevent weird glitches.  
							
							
							
						 
						
							2013-06-10 15:43:14 -04:00  
				
					
						
							
							
								 
						
							
							
								3403146461 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'peterix/master'  
							
							... 
							
							
							
							Conflicts:
	plugins/CMakeLists.txt
	plugins/autoSyndrome.cpp 
							
						 
						
							2013-05-25 20:08:56 -04:00  
				
					
						
							
							
								 
						
							
							
								638b2e974c 
								
							
								 
							
						 
						
							
							
								
								EventManager: cleaned up manageEvents considerably, using a function pointer array.  
							
							
							
						 
						
							2013-05-25 12:19:54 -04:00  
				
					
						
							
							
								 
						
							
							
								bcaaa72387 
								
							
								 
							
						 
						
							
							
								
								EventManager should use a CoreSuspender just in case.  
							
							
							
						 
						
							2013-05-25 11:50:43 -04:00  
				
					
						
							
							
								 
						
							
							
								b44cd86dc9 
								
							
								 
							
						 
						
							
							
								
								EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.  
							
							
							
						 
						
							2013-05-25 09:44:17 -04:00  
				
					
						
							
							
								 
						
							
							
								29b5e20575 
								
							
								 
							
						 
						
							
							
								
								autoSyndrome should now work with syndromeTrigger.  
							
							
							
						 
						
							2013-05-11 16:46:37 -04:00  
				
					
						
							
							
								 
						
							
							
								e5fd918b0c 
								
							
								 
							
						 
						
							
							
								
								job: unk2 -> subtype  
							
							
							
						 
						
							2013-05-05 03:55:08 +02:00  
				
					
						
							
							
								 
						
							
							
								6a907e3584 
								
							
								 
							
						 
						
							
							
								
								Fix issue  #195  - off by one error in building dimensions  
							
							
							
						 
						
							2013-04-24 17:41:25 +02:00  
				
					
						
							
							
								 
						
							
							
								b4092f62e6 
								
							
								 
							
						 
						
							
							
								
								New module: Once. Intended to help prevent debug error message spam.  
							
							
							
						 
						
							2013-03-23 22:38:33 -04:00  
				
					
						
							
							
								 
						
							
							
								7cbd201f31 
								
							
								 
							
						 
						
							
							
								
								Nuke the third exit(1) and change building caching code to make more sense.  
							
							
							
						 
						
							2013-02-14 13:13:25 +04:00  
				
					
						
							
							
								 
						
							
							
								9ca435544e 
								
							
								 
							
						 
						
							
							
								
								Nuke unsafe behavior in Buildings::findAtTile from orbit.  
							
							
							
						 
						
							2013-02-13 15:03:15 +04:00  
				
					
						
							
							
								 
						
							
							
								e06b6904f1 
								
							
								 
							
						 
						
							
							
								
								Small fix to sync dfhack with the structures.  
							
							
							
						 
						
							2013-01-15 23:41:43 +01:00  
				
					
						
							
							
								 
						
							
							
								3ffbef2396 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'canStepBetween' into recent  
							
							
							
						 
						
							2013-01-05 18:10:29 -05:00  
				
					
						
							
							
								 
						
							
							
								f8abd5c595 
								
							
								 
							
						 
						
							
							
								
								StepBetween: renamed stuff back to the way it was. Thought I had already done that.  
							
							
							
						 
						
							2013-01-05 18:09:50 -05:00  
				
					
						
							
							
								 
						
							
							
								6622e9e06f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'canStepBetween' into recent  
							
							... 
							
							
							
							Conflicts:
	library/modules/Maps.cpp 
							
						 
						
							2013-01-05 13:32:29 -05:00  
				
					
						
							
							
								 
						
							
							
								ec03d567d2 
								
							
								 
							
						 
						
							
							
								
								EventManager: use WORLD_LOADED instead of MAP_LOADED.  
							
							
							
						 
						
							2013-01-03 22:47:27 -05:00  
				
					
						
							
							
								 
						
							
							
								715f191c26 
								
							
								 
							
						 
						
							
							
								
								EventManager: made the frequency part of EventHandler.  
							
							
							
						 
						
							2013-01-03 19:31:29 -05:00  
				
					
						
							
							
								 
						
							
							
								9e74ae58f2 
								
							
								 
							
						 
						
							
							
								
								EventManager: Fixed a problem with deregistering event frequencies.  
							
							
							
						 
						
							2013-01-03 19:07:05 -05:00  
				
					
						
							
							
								 
						
							
							
								910e398a7b 
								
							
								 
							
						 
						
							
							
								
								EventManager: added invasion event.  
							
							
							
						 
						
							2013-01-03 15:52:56 -05:00  
				
					
						
							
							
								 
						
							
							
								5865579b23 
								
							
								 
							
						 
						
							
							
								
								EventManager: got rid of print statement.  
							
							
							
						 
						
							2013-01-02 19:26:37 -05:00  
				
					
						
							
							
								 
						
							
							
								6d2773856a 
								
							
								 
							
						 
						
							
							
								
								EventManager: fixed a few things.  
							
							
							
						 
						
							2013-01-02 19:23:40 -05:00  
				
					
						
							
							
								 
						
							
							
								4e4e382b8f 
								
							
								 
							
						 
						
							
							
								
								EventManager: added syndrome event.  
							
							
							
						 
						
							2013-01-02 18:30:15 -05:00  
				
					
						
							
							
								 
						
							
							
								c3b2ae2137 
								
							
								 
							
						 
						
							
							
								
								EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.  
							
							
							
						 
						
							2013-01-02 11:07:56 -05:00  
				
					
						
							
							
								 
						
							
							
								fa78d6ccfc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'recent' into eventManager-unstable  
							
							... 
							
							
							
							Conflicts:
	library/modules/Job.cpp 
							
						 
						
							2013-01-02 03:16:45 -05:00  
				
					
						
							
							
								 
						
							
							
								4e99841862 
								
							
								 
							
						 
						
							
							
								
								EventManager: made Buildings module keep track of buildings so that it  
							
							... 
							
							
							
							can do findAtTile in constant time. 
							
						 
						
							2013-01-01 22:22:31 -05:00  
				
					
						
							
							
								 
						
							
							
								7972902c81 
								
							
								 
							
						 
						
							
							
								
								stepBetween: named a few things better, and fixed a lot.  
							
							
							
						 
						
							2012-12-19 20:30:37 -05:00  
				
					
						
							
							
								 
						
							
							
								a93c0223a2 
								
							
								 
							
						 
						
							
							
								
								EventManager: unstable. Temp commit.  
							
							
							
						 
						
							2012-12-18 20:28:30 -05:00  
				
					
						
							
							
								 
						
							
							
								555c754636 
								
							
								 
							
						 
						
							
							
								
								EventManager: added construction and building events.  
							
							
							
						 
						
							2012-12-18 18:34:38 -05:00  
				
					
						
							
							
								 
						
							
							
								22837af8d7 
								
							
								 
							
						 
						
							
							
								
								canWalkBetween: fixed bug involving ramps.  
							
							
							
						 
						
							2012-12-17 00:25:14 -05:00  
				
					
						
							
							
								 
						
							
							
								1a6a09281b 
								
							
								 
							
						 
						
							
							
								
								canWalkBetween: forgot a case with ramps.  
							
							
							
						 
						
							2012-12-16 23:37:15 -05:00  
				
					
						
							
							
								 
						
							
							
								d2be8f18e1 
								
							
								 
							
						 
						
							
							
								
								canWalkBetween: forgot a case with stairs.  
							
							
							
						 
						
							2012-12-16 23:30:35 -05:00  
				
					
						
							
							
								 
						
							
							
								01e5e93825 
								
							
								 
							
						 
						
							
							
								
								Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.  
							
							
							
						 
						
							2012-12-16 23:26:50 -05:00  
				
					
						
							
							
								 
						
							
							
								78aab90f3a 
								
							
								 
							
						 
						
							
							
								
								EventManager: whitespace.  
							
							
							
						 
						
							2012-12-16 16:27:08 -05:00  
				
					
						
							
							
								 
						
							
							
								3951d4d204 
								
							
								 
							
						 
						
							
							
								
								EventManager: made it safe to register/unregister while events are being triggered.  
							
							
							
						 
						
							2012-12-16 15:39:39 -05:00  
				
					
						
							
							
								 
						
							
							
								d4d8e69556 
								
							
								 
							
						 
						
							
							
								
								EventManager: Allowed absolute time registration.  
							
							
							
						 
						
							2012-12-15 18:08:59 -05:00  
				
					
						
							
							
								 
						
							
							
								86e002f3ff 
								
							
								 
							
						 
						
							
							
								
								EventManager: added item creation event.  
							
							
							
						 
						
							2012-12-15 16:49:13 -05:00  
				
					
						
							
							
								 
						
							
							
								b0314755e0 
								
							
								 
							
						 
						
							
							
								
								EventManager: added unit death event.  
							
							
							
						 
						
							2012-12-15 14:40:11 -05:00  
				
					
						
							
							
								 
						
							
							
								155a4d044c 
								
							
								 
							
						 
						
							
							
								
								EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.  
							
							
							
						 
						
							2012-12-14 23:29:28 -05:00  
				
					
						
							
							
								 
						
							
							
								747723187f 
								
							
								 
							
						 
						
							
							
								
								EventManager: first draft.  
							
							
							
						 
						
							2012-12-14 21:05:38 -05:00  
				
					
						
							
							
								 
						
							
							
								6bc791d985 
								
							
								 
							
						 
						
							
							
								
								follow df-structure rename unit.unknown8 + able_stand_*  
							
							
							
						 
						
							2012-12-10 22:50:33 +01:00  
				
					
						
							
							
								 
						
							
							
								a0e671d75d 
								
							
								 
							
						 
						
							
							
								
								Make rename unit reset the name if it becomes completely empty.  
							
							
							
						 
						
							2012-12-08 20:39:57 +04:00  
				
					
						
							
							
								 
						
							
							
								ebc2625d97 
								
							
								 
							
						 
						
							
							
								
								ditch the unused Vegetation module  
							
							
							
						 
						
							2012-12-06 23:47:25 +01:00  
				
					
						
							
							
								 
						
							
							
								3953112eb9 
								
							
								 
							
						 
						
							
							
								
								dump Vegetation::t_plant, fix plant.is_burning  
							
							
							
						 
						
							2012-12-03 19:03:07 +01:00