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

3335 Commits

Author SHA1 Message Date
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
SiboVG
3b37b078d0 Add discard prefs checkbox 2023-06-06 19:09:44 +02:00
SiboVG
5af6827e92 [#2226] Add Ok/Cancel buttons in preference dialog 2023-06-06 18:14:59 +02:00
Sibo Van Gool
2fc2c6427b
Merge pull request #2220 from SiboVG/issue-2079 
[#2079] Display secondary stability unit
 2023-05-29 22:42:30 +02:00
SiboVG
5e717e443d Add secondary stability unit in preferences 2023-05-29 15:24:36 +02:00
SiboVG
b21b7569f5 Refactor preference keys 
Yes, will break compatibility, but it's just one checkbox. Too bad.
 2023-05-29 12:23:39 +02:00
Sibo Van Gool
80558fbf43
Merge pull request #2219 from SiboVG/issue-2217 
[#2217] Fix mass issues for fin sets (+ CM of launch lug and rail buttons)
 2023-05-26 00:25:08 +02:00
SiboVG
c0516e8751 [#2218] Apply outer/inner diameter preset to tube fin 2023-05-25 20:36:13 +02:00
SiboVG
6f3f1ed67d [#2079] Display percentage length unit in stability info 2023-05-24 01:39:35 +02:00
SiboVG
7273386df9 Update unit tests for fix 2023-05-24 00:11:43 +02:00
SiboVG
dceed80dff Fix CMy & CMz of rail button and launch lug 2023-05-23 23:35:54 +02:00
SiboVG
7ff01c3b4f Add unit tests for tube fin mass 2023-05-23 21:17:41 +02:00
SiboVG
d58b856acc [#2217] Whoops, my bad, component volume is for all instances 2023-05-23 21:17:31 +02:00
Neil Weinstock
890c7829f0
Slightly less-small icons 2023-05-16 21:16:36 -04:00
Neil Weinstock
00ec22fbff
Downsized subcomponent override icons 2023-05-16 10:25:50 -04:00
Sibo Van Gool
b8895a1ea0
Merge pull request #2214 from SiboVG/issue-2209 
[#2209] Average segment centroids
 2023-05-15 19:24:01 +02:00
SiboVG
22e99e8534 Add unit tests for fillets on transition 2023-05-11 21:31:36 +02:00
SiboVG
ab878a82f0 [#2209] Average segment centroids 2023-05-11 21:06:51 +02:00
Sibo Van Gool
7956867dd9
Merge pull request #2211 from SiboVG/issue-2203 
[#2203] Handle SimulationException separately
 2023-05-10 23:10:52 +02:00
thzero
52d7e4d8ba cleanup of test resource in the java folder instead of the resources folder 2023-05-10 07:57:46 -05:00