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

5363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Pfeiffer
d2c20bd90f
Merge pull request #2066 from JoePfeiffer/fix-tubefins 
Fix interstices area calculation and update pressure drag calculation for tube fins
 2023-07-02 16:51:13 -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
103a981bca [#2242] Remove double translation to root center 2023-07-01 18:28:00 +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
65c6e96446 Refactor component add buttons 
This method works also for dark mode
 2023-06-30 15:38:20 +02:00
SiboVG
dfa5a3a968 Make lighting in 3D view brighter 2023-06-30 13:41:26 +02:00
SiboVG
8fddaed972 Fix unused translation keys 2023-06-29 22:12:56 +02:00
Sibo Van Gool
0d0fdbf3ef
Merge pull request #2241 from SiboVG/issue-2205 
[#2205] Not sure if useful
 2023-06-29 21:48:36 +02:00
SiboVG
26022915e4 Stop tracking .idea/workspace.xml 2023-06-29 21:46:11 +02:00
SiboVG
f28f9f88a5 Fix workspace formatting bug 2023-06-29 21:43:37 +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
3277f757d7 Update GitHub workflow for Java 17 2023-06-28 16:18:52 +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
0d5549d96a Some more updates to Java 17 for IntelliJ 2023-06-28 11:25:28 +02:00
SiboVG
fb7cd435d9 Update install4j for Java 17 2023-06-28 11:13:48 +02:00
SiboVG
82c9f4aadb Update Java to Java 17 2023-06-28 10:50:08 +02:00
Joe Pfeiffer
07b2ddacdb
Merge pull request #2238 from openrocket/revert-1860-fix-1611 
Revert "Disallow stage separation at launch"
 2023-06-27 15:39:44 -06: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
Sibo Van Gool
0042caa86b
Merge pull request #2232 from SiboVG/jogl-2.5 
Bump JOGL to 2.5
 2023-06-27 00:04:39 +02:00
SiboVG
bb2ad98d98 [#1629] Show calculated mass & CG for non-overridden components 2023-06-25 02:19:51 +02:00
SiboVG
a18b10746c Improve formatting of component analysis tables 2023-06-25 00:37:06 +02:00
SiboVG
07caceb92e Bump JOGL to 2.5 2023-06-22 20:51:46 +02:00
SiboVG
aa1c09f8b9 Add dummy release notes 2023-06-20 23:49:09 +02:00
Sibo Van Gool
16893a74f5
Merge pull request #2228 from SiboVG/issue-2226 
[#2226] Add Ok/Cancel buttons in preference dialog
 2023-06-20 23:41:33 +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
aa154c49da Ensure units are updated upon preferences importing 2023-06-06 18:21:34 +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
SiboVG
a7124ec5d7 Refactor widgets in separate panels 2023-05-29 11:53:00 +02:00