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

5492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8a43f8d482
Merge pull request #2260 from JoePfeiffer/new-two-stage 
New two-stage rocket example
 2023-07-17 18:26:46 -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
Sibo Van Gool
0b87241f03
Merge pull request #2262 from SiboVG/fix-stab-info-text 
Separate stability info text from rest
 2023-07-17 16:04:45 +02:00
SiboVG
696e0f0c62 Separate stability info text from rest 2023-07-17 16:02:19 +02:00
SiboVG
378407ab82 Don't use FlatLaf LAF in installer 2023-07-17 13:50:45 +02:00
SiboVG
e7432d80b9 Fix JAR for Windows 2023-07-17 12:40:29 +02:00
SiboVG
5a03f130ed Update darklaf to fix button positioning 
This is from a custom build of darklaf where I removed the 20 offset from shadowSize (see https://github.com/weisJ/darklaf/issues/347)
 2023-07-17 01:05:53 +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
d9f9f139ab Fix DescriptionArea not applying font size change 2023-07-16 02:01:14 +02:00
SiboVG
aa104f6d0c [#1089] Support dark mode & custom font size 2023-07-16 02:01:14 +02:00
JoePfeiffer
8449d903b4 Improved sustainer fin section/interstage design to allow for through-the-wall fin mount for entire fin chord 2023-07-15 17:49:35 -06:00
JoePfeiffer
151b81ab90 New two-stage rocket example 2023-07-13 16:04:13 -06:00
Sibo Van Gool
b73bdcf17b
Merge pull request #2259 from SiboVG/issue-2256 
[#2256] Use fixed width for warnings panel
 2023-07-11 20:58:10 +02:00
SiboVG
602d9436e2 [#2256] Use fixed width for warnings panel 2023-07-11 20:56:59 +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
ba0867ee8e Use selected config as init ID 
This fixes a bug where multi-editing different flight configurations in the same stage (e.g. of the last booster stage of 'Three-stage rocket') would not always correctly work
 2023-07-04 23:45:39 +02: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
Sibo Van Gool
efc76ddd56
Merge pull request #2246 from JoePfeiffer/fix-2245 
update legacy component preset databases setting all units to SI, instead of the various mixes of g, kg, cm, and m that previously existed.
 2023-07-03 22:41:26 +02:00
JoePfeiffer
1b2d7656c4 update legacy component preset databases setting all units to SI, instead of the various mixes of g, kg, cm, and m that previously existed. 
*Only* updates the unit specifiers, not values.  The values appear to have all been in MKS units, while the unit specifiers were in error.
 2023-07-03 14:01:29 -06:00
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