Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ff7887d6fe
							
						
					 | 
					
						
						
							
							Merge pull request #2121 from hcraigmiller/unstable
						
						
						
						
						
						
						
						[#2111] Update examples to include plugged motors 
						
						
					 | 
					
						2023-03-18 11:19:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8f0cbd1b6d
							
						
					 | 
					
						
						
							
							Merge pull request #2116 from SiboVG/fix-simtab-export
						
						
						
						
						
						
						
						Fix simtab export 
						
						
					 | 
					
						2023-03-18 11:00:25 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3e87bb138
							
						
					 | 
					
						
						
							
							Add unit test for railbutton drag when velocity is 0
						
						
						
						
						
						
					 | 
					
						2023-03-18 10:49:26 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							206603e865
							
						
					 | 
					
						
						
							
							Avoid division by 0 by just setting railbutton pressure CD when moving very slow
						
						
						
						
						
						
						
						Note CD really doesn't matter when velocity is 0, since there's no drag force anyway. 
						
						
					 | 
					
						2023-03-18 10:47:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								H Craig Miller
							
						 
					 | 
					
						
						
						
						
							
						
						
							1eb2e1ccf9
							
						
					 | 
					
						
						
							
							Update examples to include plugged motors
						
						
						
						
						
						
						
						Update examples to include plugged motors 
						
						
					 | 
					
						2023-03-17 00:26:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa014749b6
							
						
					 | 
					
						
						
							
							Add test for CD overrides and base drag
						
						
						
						
						
						
					 | 
					
						2023-03-16 22:54:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f4a55b8d2
							
						
					 | 
					
						
						
							
							Change BarrowmanCalculator to compute base drag for current component, not previous component
						
						
						
						
						
						
					 | 
					
						2023-03-16 19:29:38 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3c34f197a
							
						
					 | 
					
						
						
							
							Fix/improve import warnings
						
						
						
						
						
						
					 | 
					
						2023-03-15 22:53:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							769ac69300
							
						
					 | 
					
						
						
							
							Unit test for multiple instances of rail buttons
						
						
						
						
						
						
					 | 
					
						2023-03-14 21:37:17 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							30088ab5a0
							
						
					 | 
					
						
						
							
							Set sustainer motor to plugged
						
						
						
						
						
						
					 | 
					
						2023-03-14 23:56:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							47837287e5
							
						
					 | 
					
						
						
							
							Account for exponential notation in CSV export
						
						
						
						
						
						
					 | 
					
						2023-03-14 23:32:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							d02b8fc431
							
						
					 | 
					
						
						
							
							Use selection-specific sim exporting in context menu
						
						
						
						
						
						
					 | 
					
						2023-03-14 23:29:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9b7ff8249
							
						
					 | 
					
						
						
							
							Divide rail button CD by instance count, since it gets multiplied by instance count up in BarrowmanCalculator.
						
						
						
						
						
						
					 | 
					
						2023-03-14 08:05:49 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							338f9460aa
							
						
					 | 
					
						
						
							
							Small fixes to recovery handler
						
						
						
						
						
						
					 | 
					
						2023-03-14 13:08:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							05561b2872
							
						
					 | 
					
						
						
							
							Confirm file overwrite
						
						
						
						
						
						
					 | 
					
						2023-03-14 00:20:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b7213e21f
							
						
					 | 
					
						
						
							
							Ignore empty simulations in sim table export
						
						
						
						
						
						
					 | 
					
						2023-03-14 00:14:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed59b64fd8
							
						
					 | 
					
						
						
							
							Use burnout for non-last stage in multi-staged rocket
						
						
						
						
						
						
					 | 
					
						2023-03-13 23:39:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							00ea1c496e
							
						
					 | 
					
						
						
							
							Update recovery device import rules
						
						
						
						
						
						
					 | 
					
						2023-03-12 23:22:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9ff65fc69
							
						
					 | 
					
						
						
							
							Update unit tests
						
						
						
						
						
						
					 | 
					
						2023-03-11 15:37:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e6abcffa7
							
						
					 | 
					
						
						
							
							Fix some merge conflicts
						
						
						
						
						
						
					 | 
					
						2023-03-11 15:34:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							14db274d42
							
						
					 | 
					
						
						
							
							Merge pull request #2110 from JoePfeiffer/fix-2058
						
						
						
						
						
						
						
						[#2058] Create simulation exception for zero-length stages; improve exception reporting 
						
						
					 | 
					
						2023-03-10 10:57:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5e9cbe2706
							
						
					 | 
					
						
						
							
							Merge pull request #2097 from JoePfeiffer/2078-typo
						
						
						
						
						
						
						
						Fix error in sim loading, add unit test, refine loading a bit. 
						
						
					 | 
					
						2023-03-10 10:56:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							46df6b501d
							
						
					 | 
					
						
						
							
							Merge pull request #2091 from SiboVG/issue-2090
						
						
						
						
						
						
						
						[#2090] Add plugged option to charge delay combobox if it wasn't present yet 
						
						
					 | 
					
						2023-03-10 10:55:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8d6cb3fdbc
							
						
					 | 
					
						
						
							
							Merge pull request #2082 from JoePfeiffer/fix-2032
						
						
						
						
						
						
						
						Tell user about zero-area fins and keep them from crashing simulation with NaN error 
						
						
					 | 
					
						2023-03-10 10:54:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							435b2bfcad
							
						
					 | 
					
						
						
							
							update unit tests
						
						
						
						
						
						
					 | 
					
						2023-03-09 15:56:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							68bdd7ff2c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/unstable' into fix-2058
						
						
						
						
						
						
					 | 
					
						2023-03-09 13:31:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							2252a31f97
							
						
					 | 
					
						
						
							
							Add extra rocket test
						
						
						
						
						
						
					 | 
					
						2023-03-09 01:01:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cfea331712
							
						
					 | 
					
						
						
							
							Merge pull request #2105 from SiboVG/issue-2103
						
						
						
						
						
						
						
						[#2103] Fix type in default pressure setter 
						
						
					 | 
					
						2023-03-08 21:35:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							4dfe63bc69
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-875
						
						
						
						
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
#	core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
#	core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
#	swing/src/net/sf/openrocket/gui/main/BasicFrame.java
#	swing/src/net/sf/openrocket/gui/util/Icons.java 
						
						
					 | 
					
						2023-03-08 21:29:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							7252f44a37
							
						
					 | 
					
						
						
							
							Add unit tests for default simulation options
						
						
						
						
						
						
					 | 
					
						2023-03-08 21:13:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							79b8d8b506
							
						
					 | 
					
						
						
							
							Merge pull request #2087 from jppetrakis/dev/jppetrakis/unstable/or_csv_from_simtable
						
						
						
						
						
						
						
						Issue #2077 [Feature Request] Add context menu ability for the simulation table to export all run simulation table rows to a CSV file 
						
						
					 | 
					
						2023-03-08 19:52:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcb77082c6
							
						
					 | 
					
						
						
							
							Disable delay box when no motor selected
						
						
						
						
						
						
					 | 
					
						2023-03-08 19:49:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							da15c59673
							
						
					 | 
					
						
						
							
							Remove some references to None and replace with Plugged
						
						
						
						
						
						
					 | 
					
						2023-03-08 19:19:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c292f7b65
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev/jppetrakis/unstable/or_csv_from_simtable' into dev/jppetrakis/unstable/or_csv_from_simtable
						
						
						
						
						
						
					 | 
					
						2023-03-08 19:13:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed62a91bc3
							
						
					 | 
					
						
						
							
							Fix file chooser size issue with accessory
						
						
						
						
						
						
					 | 
					
						2023-03-08 19:02:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jppetrakis
							
						 
					 | 
					
						
						
						
						
							
						
						
							78b75c23fa
							
						
					 | 
					
						
						
							
							make sure to get value in current units!
						
						
						
						
						
						
					 | 
					
						2023-03-08 12:18:25 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							755dfc189d
							
						
					 | 
					
						
						
							
							[#2103] Fix type in default pressure setter
						
						
						
						
						
						
					 | 
					
						2023-03-07 01:53:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b69e7dea5
							
						
					 | 
					
						
						
							
							Update file chooser dimensions
						
						
						
						
						
						
					 | 
					
						2023-03-06 20:43:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							887e38b637
							
						
					 | 
					
						
						
							
							Refactor to better use export Action
						
						
						
						
						
						
					 | 
					
						2023-03-06 20:35:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c7106a253
							
						
					 | 
					
						
						
							
							Create custom CSV escape method
						
						
						
						
						
						
					 | 
					
						2023-03-06 20:09:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							80e33ba01b
							
						
					 | 
					
						
						
							
							Refactor string utils to common class
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:55:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccdd54f64a
							
						
					 | 
					
						
						
							
							Don't need trans anymore
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:49:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							820cb4fd8c
							
						
					 | 
					
						
						
							
							Remove commons-lang3 lib
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:48:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							4821f8fb25
							
						
					 | 
					
						
						
							
							Move exporter to file dir
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:47:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							fab076eedf
							
						
					 | 
					
						
						
							
							Move file chooser stuff outside of exporter
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:46:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							61f7abe9a1
							
						
					 | 
					
						
						
							
							Code clean-up
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:25:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							92881660ec
							
						
					 | 
					
						
						
							
							Rename class to be more concise
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:15:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c148b5149
							
						
					 | 
					
						
						
							
							Create icon for simulation exceptions, so they can be seen in plots.
						
						
						
						
						
						
						
						For the moment I've just copied the simulation_end icon; it should really be something else 
						
						
					 | 
					
						2023-03-05 18:53:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							3571ebad68
							
						
					 | 
					
						
						
							
							When creating a new sim branch, copy one data point and the separation event to the new branch so we can plot it if it has an immediate exception
						
						
						
						
						
						
					 | 
					
						2023-03-05 09:20:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jppetrakis
							
						 
					 | 
					
						
						
						
						
							
						
						
							3947458cca
							
						
					 | 
					
						
						
							
							suggested source changes.
						
						
						
						
						
						
					 | 
					
						2023-03-05 08:51:56 -05:00 | 
					
					
						
						
							
							
							
						
					 |