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

3504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
656d63f3d8 Remove some redundant comments 2022-05-18 00:33:45 +02:00
hcraigmiller
74ae3a03e0 Adds packed length and diameter to preset editor 
Adds packed length and diameter to preset editor; also adds labels and additional presets for .orc files so that spill hole data can be added to the .orc files without throwing warnings (does not change editor for spill holes).
 2022-05-10 17:33:57 -07:00
SiboVG
e521755956
Merge pull request #1343 from SiboVG/issue-1340 
[fixes #1340] Clear Transition preset on shape and type change
 2022-05-10 22:59:58 +02:00
SiboVG
c895dde4a3 Clear Transition preset on shape and type change 2022-05-10 22:58:02 +02:00
SiboVG
9776a17ff3 Update install4j files for Java 17 RTE 2022-05-10 22:11:37 +02:00
SiboVG
f9851557e4
Merge pull request #1339 from SiboVG/issue-1326 
[fixes #1326] Update opacity slider with color button alpha change
 2022-05-10 19:16:17 +02:00
SiboVG
37647eb189
Merge pull request #1342 from SiboVG/unstable 
Update install4j files for beta 03
 2022-05-10 19:16:01 +02:00
SiboVG
3a3cf08e79 Update install4j files for beta 3 2022-05-10 03:55:20 +02:00
SiboVG
c156e433a3 Update beta 3 build version 2022-05-10 03:54:23 +02:00
SiboVG
17aa69aeb8
Merge pull request #1341 from SiboVG/unstable 
Update thrustcurves and dbcook's database
 2022-05-10 03:30:54 +02:00
SiboVG
59c4b6d687 Update dbcook's database 2022-05-10 03:28:14 +02:00
SiboVG
25a6ec95d2 Update thrustcurves 2022-05-10 03:24:06 +02:00
SiboVG
938fc2436e [#1326] Update opacity slider with color button alpha change 2022-05-10 02:22:04 +02:00
Joe Pfeiffer
5b49275ac5
Merge pull request #1333 from JoePfeiffer/refine-tube-drag 
Refine tube drag
 2022-05-06 07:18:13 -06:00
JoePfeiffer
d18d430524 Merge remote-tracking branch 'origin/unstable' into refine-tube-drag 
Use more detailed empirical formulas in tube pressure drop formulas
 2022-05-05 15:49:30 -06:00
SiboVG
10ba4533a3
Merge pull request #1331 from SiboVG/unstable 
Use 'design info' instead of 'specs'
 2022-05-05 03:00:59 +02:00
SiboVG
f73e21f45a Use 'design info' instead of 'specs' 2022-05-05 03:00:26 +02:00
SiboVG
900b39a830
Merge pull request #1330 from hcraigmiller/Print-Icon-Fix 
Fixed icon missing error
 2022-05-05 02:24:47 +02:00
hcraigmiller
061acb8f89 Fixed icon missing error 
OR was throwing a missing icon error on startup. This fixes that issue.
 2022-05-04 17:02:17 -07:00
Joe Pfeiffer
61e71b7239
Merge pull request #1322 from hcraigmiller/NEW-Export-Feature 
NEW Changed File > Export menu format to accommodate multiple file format
 2022-05-04 17:33:21 -06:00
SiboVG
9f85681629 Use horizontal ellipsis character for ... 2022-05-04 23:49:25 +02:00
Joe Pfeiffer
8ec85f84ac
Merge pull request #1329 from JoePfeiffer/fix-1325 
Check for inner radius of tube == 0 to avoid NaN in pressure drop
 2022-05-04 15:15:13 -06:00
hcraigmiller
85559d6da2 Update File menu and submenu 
Improves File menu and submenus in preparation for the addition of future features.
 2022-05-04 14:14:59 -07:00
JoePfeiffer
359e97108c Check for inner radius of tube == 0 to avoid NaN in pressure drop 
calculation
 2022-05-04 15:10:32 -06:00
Joe Pfeiffer
f45e2c36c8
Merge pull request #1328 from JoePfeiffer/fix-1325 
On second thought, I think I can do better than this.
 2022-05-04 10:53:17 -06:00
JoePfeiffer
05ce7cb1f5 On second thought, I think I can do better than this. 
Revert "check for tubes with inner radius of 0; set pressure drag to 0 and set a warning"

This reverts commit 7676b9b674ffc268d8c67915b8e54f44d22449fa.
 2022-05-04 10:50:20 -06:00
Joe Pfeiffer
1a66d46b61
Merge pull request #1327 from JoePfeiffer/fix-1325 
set pressure drag to 0 and flag a warning if tube inner radius is 0
 2022-05-04 10:31:35 -06:00
JoePfeiffer
7676b9b674 check for tubes with inner radius of 0; set pressure drag to 0 and set a warning 2022-05-04 10:25:46 -06:00
JoePfeiffer
0b8276b6c8 more tubefin refinement (should be squashed with prev commit) 2022-05-04 07:22:34 -06:00
JoePfeiffer
1611fd2876 More detailed model for pressure drop in tubes. 2022-05-04 07:04:01 -06:00
JoePfeiffer
30dcdda0bf correct wetted area calculation 2022-05-03 15:51:40 -06:00
Joe Pfeiffer
1e0734ae1f
Merge pull request #1318 from JoePfeiffer/fix-1291 
consider instance count in component mass
 2022-05-03 13:51:41 -06:00
SiboVG
12cba42dca
Merge pull request #1323 from SiboVG/issue-1320 
[fixes #1320] Remove 'Custom' material option from preference's add new material
 2022-05-01 23:52:22 +02:00
SiboVG
a80bfcde14 Rearrange Material types 
This causes a more logical arrangement in the preferences' add material dropdown box
 2022-05-01 23:34:37 +02:00
SiboVG
4caba0fcb5 Remove CUSTOM material from preference's add new material 
There is just no logic in adding the 'CUSTOM' option from the dropdown, because it is not even a type of density material
 2022-05-01 23:34:03 +02:00
SiboVG
d9b3b77eb7 Fix imports in BasicFrame 2022-05-01 22:28:51 +02:00
hcraigmiller
ac9d177012
Removed RASAero export option 
Pending the creation of the RASAero export translator, the export menu option for RASAero has been removed.
 2022-05-01 11:11:34 -07:00
hcraigmiller
c007888172
Clean up messages 
From: main.menu.file.export_as = Export...
     To: main.menu.file.export_as = Export as...
From: main.menu.file.export_as.desc = Export model to Rocksim .rkt file
     To: main.menu.file.export_as.desc = Export model to selected file format
 2022-05-01 01:53:52 -07:00
hcraigmiller
0e0e006553
Removed comment on line 1243 
The compiler was throwing a warning related to the "file" indicated, so I commented the line out. This change restores the line's prior status.
 2022-05-01 01:40:12 -07:00
hcraigmiller
735966de36 NEW Export Feature 
Replaces previous commit
 2022-05-01 00:12:09 -07:00
JoePfeiffer
ccb7c5e714 consider instance count in component mass 2022-04-29 19:32:19 -06:00
Joe Pfeiffer
70ad1e9b62
Merge pull request #1317 from JoePfeiffer/fix-1302 
Add listener for changes to rocket to component analysis dialog
 2022-04-29 14:36:00 -06:00
JoePfeiffer
4eacd1e659 Add listener for changes to rocket to component analysis dialog 2022-04-29 11:00:54 -06:00
Joe Pfeiffer
c5f4b401c3
Merge pull request #1314 from JoePfeiffer/cleanup-1207 
Two little cleanups in tube fin stuff.
 2022-04-27 21:48:51 -06:00
JoePfeiffer
61e57eacb5 Left a really annoying extra line of debug in BarromanCalcualtor. 
Somehow managed to have two offseting (in the case of this rocket, anyway) typos in pressure drop calculation.
 2022-04-27 21:46:41 -06:00
SiboVG
d0348726d3
Merge pull request #1312 from JoePfeiffer/fix-1207a 
Rewrite tube fin and launch lug drag calculations
 2022-04-28 01:33:52 +02:00
SiboVG
a97af9b2b7
Merge pull request #1313 from SiboVG/unstable 
Remove extra whitespace under MassComponentConfig auto checkbox
 2022-04-28 01:28:56 +02:00
SiboVG
d481ee8f65 Remove extra whitespace under MassComponentConfig auto checkbox 2022-04-28 01:28:36 +02:00
SiboVG
9f5ccdb6a0
Merge pull request #1306 from hcraigmiller/Parachure-Enhance-Data 
Parachute configuration preset input enhancements
 2022-04-28 01:24:13 +02:00
SiboVG
8c48c36226 Re-add fruity chutes 2022-04-28 01:22:45 +02:00