batwings 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2fd2a011 
							
						 
					 
					
						
						
							
							Merge branch 'feature-stagerecovery' into integration  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java 
						
						
					 
					
						2012-10-24 10:22:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill Kuker 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bb8c002c 
							
						 
					 
					
						
						
							
							 
						
						 
						
						
						
						
					 
					
						2012-10-23 14:51:55 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d87244a4 
							
						 
					 
					
						
						
							
							Implemented flight data branches for stage recovery.  Updated jfreechart  
						
						 
						
						... 
						
						
						
						to 1.0.14 and jcommon to 1.0.17.  Added primitive support for plotting
all databranches. 
						
						
					 
					
						2012-10-23 10:57:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Ruland 
							
						 
					 
					
						
						
						
						
							
						
						
							ead406e852 
							
						 
					 
					
						
						
							
							Exploded the exp4j source into our src/ directory.  This allows us to more easily modify changes we make to the source.  I inlined one call to Arrays.copyOf.  
						
						 
						
						
						
						
					 
					
						2012-08-10 19:13:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Richard Graham 
							
						 
					 
					
						
						
						
						
							
						
						
							837d13adc0 
							
						 
					 
					
						
						
							
							Again fixing classpath and custom exp4j  
						
						 
						
						
						
						
					 
					
						2012-08-06 00:38:25 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Richard Graham 
							
						 
					 
					
						
						
						
						
							
						
						
							bf668d4604 
							
						 
					 
					
						
						
							
							Fixed classpath for patched exp4j in repo (hopefully)  
						
						 
						
						
						
						
					 
					
						2012-08-06 00:30:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill Kuker 
							
						 
					 
					
						
						
						
						
							
						
						
							26329cedec 
							
						 
					 
					
						
						
							
							Include OSX UI elements.  
						
						 
						
						... 
						
						
						
						"OrangeExtensions" jar provides stubs for compilation and linking on other OSs. 
						
						
					 
					
						2012-06-24 19:22:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill Kuker 
							
						 
					 
					
						
						
						
						
							
						
						
							8babd54f4f 
							
						 
					 
					
						
						
							
							Update to the latest 2.0 release candidate of JOGL (Build 57).  
						
						 
						
						... 
						
						
						
						Move JOGL Libraries from lib/native to lib/jogl, which is less misleading.
Update .classpath and build.xml with new directory name. 
						
						
					 
					
						2012-06-20 00:34:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill Kuker 
							
						 
					 
					
						
						
						
						
							
						
						
							6695f92ab1 
							
						 
					 
					
						
						
							
							JOGL Based support for a 3D view of the rocket.  
						
						 
						
						... 
						
						
						
						Change to RocketPanel to add 3D option.
Change to build process to use a Jar-in-Jar technique, not Fat Jar, using the Eclipse projects jar-in-jar loader. (Does not require eclipse!) 
						
						
					 
					
						2012-06-11 20:25:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							9552b2de86 
							
						 
					 
					
						
						
							
							Expression parser updates  
						
						 
						
						
						
						
					 
					
						2012-05-22 04:11:25 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Ruland 
							
						 
					 
					
						
						
						
						
							
						
						
							6de0ea7083 
							
						 
					 
					
						
						
							
							Initial work on BodyTube ComponentPresets.  
						
						 
						
						
						
						
					 
					
						2012-03-29 02:47:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							2492a85e88 
							
						 
					 
					
						
						
							
							Initial plugin framework  
						
						 
						
						
						
						
					 
					
						2012-03-20 20:19:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							a406956b06 
							
						 
					 
					
						
						
							
							Guided tour updates  
						
						 
						
						
						
						
					 
					
						2012-03-10 15:03:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Ruland 
							
						 
					 
					
						
						
						
						
							
						
						
							b066c4d714 
							
						 
					 
					
						
						
							
							Creating resources/ source directory to hold l10n, pix, and datafiles.  Changes to build.xml to support it.  The directory moves will be done in separate svn move operations.  
						
						 
						
						
						
						
					 
					
						2012-01-11 03:15:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Ruland 
							
						 
					 
					
						
						
						
						
							
						
						
							b22b6d1fc3 
							
						 
					 
					
						
						
							
							moving to core/  
						
						 
						
						
						
						
					 
					
						2012-01-08 02:40:48 +00:00