hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,780 Commits 2 Branches 43 Tags
Commit Graph

3187 Commits

Author SHA1 Message Date
SiboVG
438adb14ef [#1970] Add absolute inner tube separation option 
Co-authored-by: jura0207 <jv51207@fer.hr>
 2023-07-23 15:52:18 +02:00
Sibo Van Gool
9c0466d543
Whoops, remove rocket dump 2023-07-23 15:37:15 +02:00
SiboVG
84ff186d39 Update unit tests 2023-07-23 02:53:26 +02:00
SiboVG
b6235a1630 Don't copy flight events of child boosters 2023-07-23 02:53:19 +02:00
SiboVG
e9146a35d4 Move flight data secondary data copying to constructor 2023-07-23 02:18:33 +02:00
SiboVG
b6a79dfb18 Check for nose cone base radius for massObject auto radius 2023-07-22 02:14:03 +02:00
SiboVG
3120b2d968 Include simulation headers in clipboard copy + add to context menu 2023-07-22 01:46:07 +02:00
SiboVG
70e678e990 Merge branch 'unstable' into issue-2225 2023-07-18 02:35:05 +02:00
Joe Pfeiffer
81ea69d489
Merge pull request #2257 from SiboVG/ask-metadata 
Open dialog to save design information when saving the file
 2023-07-17 18:29:29 -06:00
Joe Pfeiffer
f691066145
Merge pull request #2253 from JoePfeiffer/fix-2196 
Check for 0 mass when running simulation
 2023-07-17 18:26:10 -06:00
Joe Pfeiffer
4e982f7cd7
Merge pull request #2248 from JoePfeiffer/fix-2247 
Use MassObject API to set parachute length, radius from preset
 2023-07-17 18:25:42 -06:00
Sibo Van Gool
875a2b775a
Merge pull request #2250 from SiboVG/issue-2244 
[#2244 & #2249] Copy default sep config instead of creating new one
 2023-07-18 00:49:30 +02:00
SiboVG
4603648de3 Include unstaged files 2023-07-16 02:19:14 +02:00
SiboVG
9fb157f6b5 Merge branch 'unstable' into dark-theme 
# Conflicts:
#	swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
#	swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
 2023-07-16 02:11:59 +02:00
SiboVG
aa104f6d0c [#1089] Support dark mode & custom font size 2023-07-16 02:01:14 +02:00
SiboVG
407fa8162c Open dialog to save design information when saving the file 2023-07-11 15:46:35 +02:00
JoePfeiffer
8c722fbc27 Check for 0 mass when running simulation 2023-07-07 14:36:15 -06:00
JoePfeiffer
7dde3c2009 remove debug code (oops) 2023-07-05 15:52:37 -06:00
JoePfeiffer
ea70d28ca8 Only set automatic radius flag if parachute packed dimensions came from preset 2023-07-05 15:46:09 -06:00
Joe Pfeiffer
eeae3d2c31
Merge pull request #2243 from SiboVG/issue-2231 
[#2231 & #2242] Account for fin cant in root points
 2023-07-05 13:54:34 -06:00
Joe Pfeiffer
60e44e9b16
Merge pull request #2237 from SiboVG/issue-1629 
[#1629] Show calculated mass, CG & CD in override tab if not overridden
 2023-07-05 13:41:17 -06:00
SiboVG
69f651d670 [#2244] Copy default sep config instead of creating new one 2023-07-04 23:43:26 +02:00
JoePfeiffer
773ac72e7c Use MassObject API to set parachute length, radius from preset 2023-07-03 18:37:03 -06:00
Joe Pfeiffer
dd1cd29586
Merge branch 'openrocket:unstable' into fix-tubefins 2023-07-02 16:44:31 -06:00
SiboVG
fb80671a60 Add unit tests for canted fins 2023-07-02 00:52:38 +02:00
SiboVG
d728a27ee9 [#2231] Account for fin cant in root points 2023-07-01 23:13:34 +02:00
SiboVG
40598f1c8c Update unit test 2023-07-01 13:48:08 +02:00
SiboVG
7ec6d98544 Update file version 2023-07-01 13:36:54 +02:00
SiboVG
ea4c3139f1 Merge branch 'unstable' into issue-2225 2023-07-01 13:35:37 +02:00
JoePfeiffer
a3dfb8ecd4 The first time a TubeFinSet is added to a rocket, inherit the thickness from 
the parent BodyTube.

The two rockets I was using to test my code both turned out to have the thickness of their tube fins set to the default, so the need for a user to do this is clearly easy to miss (I created one of those rockets myself!).
 2023-06-30 15:13:08 -06:00
JoePfeiffer
d5291d7b52 Refinements to calculation of tube drag 2023-06-30 10:09:00 -06:00
SiboVG
8fddaed972 Fix unused translation keys 2023-06-29 22:12:56 +02:00
SiboVG
78f1ee3a94 Better exception handling 2023-06-29 21:43:36 +02:00
SiboVG
688ccc9b45 Explicitly clone ID 2023-06-29 19:18:25 +02:00
JoePfeiffer
a3aebadcff Commit so I can grab latest changes from unstable 2023-06-28 15:20:42 -06:00
Joe Pfeiffer
6908bd8e7b
Merge branch 'openrocket:unstable' into fix-tubefins 2023-06-28 15:18:53 -06:00
SiboVG
d9544c838e Merge branch 'unstable' into issue-2225 2023-06-28 16:21:46 +02:00
SiboVG
8f3fe0e44a Use existing method for finding component with ID 2023-06-28 15:52:27 +02:00
Sibo Van Gool
55d0124508
Merge pull request #2240 from SiboVG/default-java17 
Configure OR to use Java 17 by default
 2023-06-28 15:37:27 +02:00
SiboVG
82c9f4aadb Update Java to Java 17 2023-06-28 10:50:08 +02:00
Sibo Van Gool
6a0711f4b2
Revert "Disallow stage separation at launch" 2023-06-27 23:35:42 +02:00
SiboVG
0ce1eab5ad Non-ASCII characters aren't allowed :( 2023-06-27 23:22:57 +02:00
SiboVG
02f723cbdc Clarify that total is for the rocket 2023-06-27 23:08:31 +02:00
SiboVG
9c14e0ce84 [#1629] Show calculated CD in override tab if not overridden 2023-06-27 23:06:20 +02:00
Sibo Van Gool
325b46608e
Merge pull request #2230 from SiboVG/issue-2222 
[#2222] Fix file association Open Recent
 2023-06-27 22:15:03 +02:00
SiboVG
82b9ab89c7 [#2225] Copy simulation data from sustainer to other stages for CSV export 2023-06-27 16:39:56 +02:00
SiboVG
bc8f72ca3c Save component ID for component + save flight event source 
This is to fix an issue where simulations loaded from the .ork file did not have the correct event source set
 2023-06-27 16:35:36 +02:00
SiboVG
bb2ad98d98 [#1629] Show calculated mass & CG for non-overridden components 2023-06-25 02:19:51 +02:00
SiboVG
a329f91ad9 [#2222] Fix file association Open Recent 2023-06-20 23:38:23 +02:00
SiboVG
67552c3cb6 Merge branch 'unstable' into issue-2226 
# Conflicts:
#	core/src/net/sf/openrocket/startup/Preferences.java
 2023-06-06 21:23:21 +02:00