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

3520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
d36c0b79a1 Fix non-ASCII characters 2022-05-18 00:40:28 +02:00
SiboVG
b9f758b095
Merge pull request #1347 from hcraigmiller/Preparation-for-Spill-Hole-Inclusion 
Adds additional presets for use in .orc files without throwing errors
 2022-05-18 00:37:42 +02:00
SiboVG
656d63f3d8 Remove some redundant comments 2022-05-18 00:33:45 +02:00
SiboVG
15db451aed
Merge pull request #1355 from JoePfeiffer/use-jerk 
Use jerk to adjust simulation timestep while landing
 2022-05-17 19:54:20 +02:00
JoePfeiffer
d0fd71f399 rerun all examples 2022-05-14 09:18:06 -06:00
JoePfeiffer
dbc2c832de Merge remote-tracking branch 'origin/unstable' into use-jerk 2022-05-14 08:49:37 -06:00
Joe Pfeiffer
c315aca9e9
Merge pull request #1352 from JoePfeiffer/fix-1349 
Get and save correct ground hit velocity
 2022-05-14 08:43:35 -06:00
JoePfeiffer
bbbe020903 Merge branch 'fix-1349' into use-jerk 2022-05-13 15:29:06 -06:00
JoePfeiffer
62f219a963 clean up a line of debug code 2022-05-13 15:28:01 -06:00
JoePfeiffer
f6b30df8f9 In BasicLandingStepper, instead of basing time step on acceleration (higher acceleration => shorter time step), base it on change in acceleration (ie jerk) 2022-05-13 15:24:23 -06:00
JoePfeiffer
0910317bf6 Make MathUtil::interpolate a bit more robust in the presence of possible 
rounding errors.
 2022-05-13 11:52:22 -06:00
JoePfeiffer
fbd80f480d Modify GroundStepper to not add datapoint to simulation status 
Modify BasicLandingStepper to recalculate timestep on last step to find
actual landing data
Modify BasicEventSimulationEngine to watch for altitude less than MathUtil.EPSILON rather than 0 (since BasicLandingStepper now finds altitude exactly equal to 0)
 2022-05-13 10:32:00 -06:00
SiboVG
af2a6ea3c9
Merge pull request #1346 from hcraigmiller/Parachute-preset-recognition-change 
Minor change in parachute packed length and diameter code
 2022-05-11 11:55:35 +02:00
hcraigmiller
ea30ad3537
Remove comments 
Removed comments
 2022-05-10 19:54:01 -07: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
05597b5c96
Merge pull request #1345 from hcraigmiller/Parachute-ORC-corrections 
CRITICAL pre-beta ORC corrections
 2022-05-11 01:46:05 +02:00
hcraigmiller
8f84d831fa Minor change in packed code 
Simplified code by replace new if statements with else statements. No change in functionality.
 2022-05-10 16:04:01 -07:00
hcraigmiller
bbb578ce63 CRITICAL pre-beta ORC corrections 
Corrects FruityChutes packed length and diameter units omission in entire parachute line; as well as Rocketman single decimal point placement error.
 2022-05-10 15:46:29 -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