Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac17cd0d5 
							
						 
					 
					
						
						
							
							bugfixing core RocketComponent placement code  
						
						
						
						
					 
					
						2015-08-01 08:52:37 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							28cca8d140 
							
						 
					 
					
						
						
							
							added code to scale view based on Outside / Parallel Stage offsets.  Approximate.  
						
						
						
						
					 
					
						2015-07-25 11:23:01 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							5f42a10c20 
							
						 
					 
					
						
						
							
							[Major Refactor] Parallel stages are children of centerline stages  
						
						
						
						
					 
					
						2015-07-24 16:44:10 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							2f42594acb 
							
						 
					 
					
						
						
							
							fixed many display issues relating to refactoring of RocketComponent axialOffset code.  
						
						
						
						
					 
					
						2015-07-21 14:16:13 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							8755777924 
							
						 
					 
					
						
						
							
							implemented loading of stage parameters (and fixed stage xml writing  
						
						
						
						
					 
					
						2015-07-01 19:20:19 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							177b24a667 
							
						 
					 
					
						
						
							
							implemented gui elements for locating a stage relative to another stage.  
						
						
						
						
					 
					
						2015-06-30 17:57:14 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							d5de1cbac4 
							
						 
					 
					
						
						
							
							added save-to-ork code, removed stage rotation parameter.  
						
						
						
						
					 
					
						2015-06-28 19:42:18 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							df5b213d44 
							
						 
					 
					
						
						
							
							fixed conical nosecane display issue while instanced (i.e. off-axis)  
						
						
						
						
					 
					
						2015-06-25 18:41:28 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							0945961fc4 
							
						 
					 
					
						
						
							
							bugfix commits - fixed rearview display bug, implemented component.getPositionVector()  
						
						
						
						
					 
					
						2015-06-25 17:12:27 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							56dec21824 
							
						 
					 
					
						
						
							
							[Large] Refactored RocketFigure drawing code to enable moving components by offset  
						
						
						
						
					 
					
						2015-06-25 11:22:58 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							6f4cba68ae 
							
						 
					 
					
						
						
							
							refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints  
						
						
						
						
					 
					
						2015-06-23 13:12:48 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							8e268a9a25 
							
						 
					 
					
						
						
							
							added gui and model elements for stage multiplicity  
						
						
						
						
					 
					
						2015-06-22 16:10:13 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d47cf806 
							
						 
					 
					
						
						
							
							implemented gui elements for controlling stage axial placement.  + other Event refinements  
						
						
						
						
					 
					
						2015-06-15 15:38:18 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							4f716b40af 
							
						 
					 
					
						
						
							
							Updated GUI with axial stage position elements  
						
						
						
						
					 
					
						2015-06-13 22:47:19 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							2cd5fe6306 
							
						 
					 
					
						
						
							
							removed pod code.  This will be re-implemented later if appropriate.  
						
						
						
						
					 
					
						2015-06-13 20:55:37 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f3b3b3bb 
							
						 
					 
					
						
						
							
							bugfix, part 3: Pod numbers now update correctly.  
						
						
						
						
					 
					
						2015-06-08 18:22:19 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							8371876718 
							
						 
					 
					
						
						
							
							ACTUAL bugfix commit: Stage Config dialog fixed.  
						
						
						
						
					 
					
						2015-06-08 18:19:23 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b1e6576e 
							
						 
					 
					
						
						
							
							[GUI Options Implemented] Implemented GUI elements to change the position of external components.  
						
						... 
						
						
						
						External Components are pods and parallel stages.  Slightly different UI options have been implemented for each. 
						
						
					 
					
						2015-06-03 15:48:13 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							5d2e7730f5 
							
						 
					 
					
						
						
							
							Added extra checks to OutsideComponent implementations.  Minor commit.  
						
						
						
						
					 
					
						2015-06-03 10:45:14 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							58d9e8f682 
							
						 
					 
					
						
						
							
							Added OutsideComponent.java; Implemented in ExternalComponent and Stage  
						
						... 
						
						
						
						OutsideComponent.java is an interface which describes components place outside the rocket (i.e. wing-tip pods, or strap-on boosters stages.
The interface is minimal, consisting merely of a couple getters and setters for the external position, rotation, and a flag to turn this on and off. 
						
						
					 
					
						2015-06-03 10:41:01 -04:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							cd3a149929 
							
						 
					 
					
						
						
							
							Merge pull request  #232  from celeron533/master  
						
						... 
						
						
						
						Update zh_CN translation 
						
						
					 
					
						2015-03-29 16:06:53 -05:00 
						 
				 
			
				
					
						
							
							
								Doug Pedrick 
							
						 
					 
					
						
						
						
						
							
						
						
							f1cf8c88bd 
							
						 
					 
					
						
						
							
							Added support for Rocksim Tube Fin Set file elements (import and export).  
						
						
						
						
					 
					
						2015-03-29 11:56:15 -05:00 
						 
				 
			
				
					
						
							
							
								celeron533 
							
						 
					 
					
						
						
						
						
							
						
						
							1c42de5540 
							
						 
					 
					
						
						
							
							Update zh_CN translation  
						
						... 
						
						
						
						Update zh_CN translation file 
						
						
					 
					
						2015-03-28 18:03:56 +08:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							3d64b58144 
							
						 
					 
					
						
						
							
							Fix release number.  
						
						
						
						
					 
					
						2015-03-27 18:39:44 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							25a2279073 
							
						 
					 
					
						
						
							
							Change to dev.  
						
						
						
						
					 
					
						2015-03-26 08:01:05 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							b15afb3709 
							
						 
					 
					
						
						
							
							Changing release version back to 15.03 to get the tag in the correct place.  
						
						
						
						
					 
					
						2015-03-26 08:00:10 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							204e3e9159 
							
						 
					 
					
						
						
							
							Update documentation for 15.03.  
						
						
						
						
					 
					
						2015-03-26 07:51:38 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							a631f39483 
							
						 
					 
					
						
						
							
							Prepare for 15.03dev  
						
						
						
						
					 
					
						2015-03-26 06:57:13 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							f3440bac68 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/openrocket/openrocket  
						
						... 
						
						
						
						Conflicts:
	core/fileformat.txt 
						
						
					 
					
						2015-03-26 06:52:22 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							e6ba1e349c 
							
						 
					 
					
						
						
							
							Updated documentation for 15.03.  
						
						
						
						
					 
					
						2015-03-26 06:49:54 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							13dc5289ff 
							
						 
					 
					
						
						
							
							Updated thrustcurves.  
						
						
						
						
					 
					
						2015-03-23 07:02:10 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cce52e3d 
							
						 
					 
					
						
						
							
							Merge pull request  #230  from kruland2607/feature-tubefins  
						
						... 
						
						
						
						Feature tubefins 
						
						
					 
					
						2015-03-23 03:11:06 -05:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							37225b04e2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature-tubefins  
						
						
						
						
					 
					
						2015-03-22 21:06:57 -05:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							13b2a37785 
							
						 
					 
					
						
						
							
							Remove debugging code  
						
						
						
						
					 
					
						2015-01-27 23:01:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							b75d7e38c6 
							
						 
					 
					
						
						
							
							when using 'File > Save As..' dialog, this patch will update the filename extension directly within the dialog box, upon chanig the FileFilter type, in addition to after the dialog is accepted.  
						
						
						
						
					 
					
						2015-01-20 13:39:26 -05:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							487da3a3fc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/scripting  
						
						... 
						
						
						
						Conflicts:
	swing/.settings/org.eclipse.jdt.core.prefs 
						
						
					 
					
						2015-01-10 18:44:55 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							45c41537ed 
							
						 
					 
					
						
						
							
							Check that scripting engine supports Invocable before casting  
						
						
						
						
					 
					
						2015-01-10 18:38:47 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							8c00dbf159 
							
						 
					 
					
						
						
							
							Add unit tests for file version 1.7 (simulation extensions)  
						
						
						
						
					 
					
						2015-01-10 18:36:24 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c2092379 
							
						 
					 
					
						
						
							
							Move TestScriptingUtil to test/ directory  
						
						
						
						
					 
					
						2015-01-10 17:50:11 +02:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							8f478f6eb7 
							
						 
					 
					
						
						
							
							Merge pull request  #225  from enderw88/fin-fillets  
						
						... 
						
						
						
						Fin fillets 
						
						
					 
					
						2015-01-09 21:37:00 -06:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							482f2b8462 
							
						 
					 
					
						
						
							
							Merge pull request  #227  from kruland2607/upstreammaster  
						
						... 
						
						
						
						Start using Java 1.7. 
						
						
					 
					
						2015-01-09 21:36:26 -06:00 
						 
				 
			
				
					
						
							
							
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							9db83259dc 
							
						 
					 
					
						
						
							
							Start using Java 1.7.  
						
						
						
						
					 
					
						2015-01-09 21:33:16 -06:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							31570a7a3b 
							
						 
					 
					
						
						
							
							Presume a release to be made in 15.01  
						
						
						
						
					 
					
						2015-01-09 18:59:45 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							bf71296794 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/scripting  
						
						... 
						
						
						
						Conflicts:
	swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java 
						
						
					 
					
						2015-01-07 18:03:57 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							c2f44f97f6 
							
						 
					 
					
						
						
							
							Update example design of simulation extensions  
						
						
						
						
					 
					
						2015-01-07 17:59:43 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							129217cf2b 
							
						 
					 
					
						
						
							
							Add degrees/sec as a roll unit  
						
						
						
						
					 
					
						2015-01-07 17:37:40 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							0eef08ae41 
							
						 
					 
					
						
						
							
							Fine-tune UI  
						
						
						
						
					 
					
						2015-01-07 17:37:14 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							9c75e7ee75 
							
						 
					 
					
						
						
							
							Call simulation extensions when a ORK document is loaded  
						
						
						
						
					 
					
						2015-01-07 17:36:57 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							78d282f56f 
							
						 
					 
					
						
						
							
							Add possibility to copy simulation extensions from other simulations  
						
						
						
						
					 
					
						2015-01-07 17:13:41 +02:00 
						 
				 
			
				
					
						
							
							
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							79fd36dc9f 
							
						 
					 
					
						
						
							
							Fix document loading/saving  
						
						
						
						
					 
					
						2015-01-06 20:45:10 +02:00