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

3549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
73044b3570 Update overridden text message 2022-03-06 02:36:49 +01:00
SiboVG
7255756e79 Undo #1204 changes 2022-03-06 02:35:22 +01:00
Joe Pfeiffer
933d211049
Merge pull request #1224 from SiboVG/issue-1220 
[fixes #1220] Fix RockSim fin import issue
 2022-03-05 17:18:42 -07:00
SiboVG
5074ac827e [#1220] Fix RockSim fin import issue 2022-03-05 17:06:47 +01:00
SiboVG
0dc7c306fe [#1204] Remove inertia update in calculateMotors 2022-03-05 16:41:00 +01:00
SiboVG
ec4e6eed37 [#1204] Add CG override effect to motors 
The problem was that the overrideCG had no effect in calculateMotors().
 2022-03-05 15:49:26 +01:00
SiboVG
001edc600a Fix DS_Store (hopefully) 2022-03-05 02:59:14 +01:00
JoePfeiffer
d2f364f086 Correctly identify when time is past end of thrustcurve so thrust is 0 in getAverageThrust 
This has been lurking -- we're not actually supposed to be calling getAverageThrustThrust when we're past the end of the thrustcurve (there's a test for whether the motor is active before calling it), but another bug in the parallel staging code exposed it.
 2022-03-04 17:52:44 -07:00
SiboVG
d661cf12aa Fix overrideCG slider length for non-assembly components 2022-03-05 00:35:45 +01:00
SiboVG
e3ce66d2ba Add 3/8 and 1/2 elastic braided cord material 2022-03-05 00:05:00 +01:00
SiboVG
3fcd942ee4 Add documentation 2022-03-04 18:11:15 +01:00
SiboVG
e82a7a89b2 Add helper methods 2022-03-04 18:10:44 +01:00
SiboVG
210183f3fd [#1172] Add additional shock cord materials 2022-03-04 16:29:41 +01:00
SiboVG
ff00ace5e4 Merge branch 'unstable' into issue-1204 2022-03-04 04:27:40 +01:00
Joe Pfeiffer
939a07e9e0
Merge pull request #1213 from SiboVG/issue-1208 
[fixes #1208] Add StageSelector button for ParallelStage
 2022-03-03 11:33:52 -07:00
JoePfeiffer
4cef774c3d Create CalcMap based on all components, not just active ones 2022-03-03 10:55:40 -07:00
SiboVG
96e9135260 Include PhotoShop file 2022-03-03 03:50:27 +01:00
SiboVG
55be6de1fa Update backdrop image 2022-03-03 03:49:39 +01:00
SiboVG
d7dfb580c2 [#1172] Add new shockcord materials 
Thanks to @hcraigmiller
 2022-03-03 03:11:44 +01:00
SiboVG
e7e96ca715 [#1204] Fix overrideCGX slider length 2022-03-03 02:50:53 +01:00
SiboVG
91b43317f3 Use component iterator instead of self-written childrenRecursive 2022-03-03 00:28:45 +01:00
SiboVG
06f220d6a9 [#1208] Add StageSelector button for ParallelStage 2022-03-02 22:39:20 +01:00
SiboVG
930881dae6
Merge pull request #1205 from JoePfeiffer/fix-1174 
Make motor database search more robust, especially when loading files
 2022-03-01 19:50:17 +01:00
JoePfeiffer
4bd50af673 Make motor database search more robust, especially when loading files: 
Instead of requiring motor "designation" to match either the actual designation or the common name, require it to be a substring of the actual designation or that the common name be a substring of the actual designation.  Many motors in stored rocket files have "designations" that resemble, but do not match, actual designations and common names.

Don't match on diameter or length when loading files.  Motors with errors in the old database (eg M1850) would fail to be recognized.
 2022-03-01 11:38:09 -07:00
SiboVG
ef809147e1 Only allow Java 11 runtime version 2022-03-01 18:58:53 +01:00
SiboVG
c3bffceb8f Fix DS_Store issue 2022-03-01 17:29:45 +01:00
SiboVG
43b25f973e Align icons vertically 2022-03-01 17:06:36 +01:00
SiboVG
4f96814d55 Update icon positioning slightly 2022-03-01 03:26:25 +01:00
SiboVG
8e75c577e8 [fixes #1160] Update Mac installer to single bundle with Applications folder target 2022-03-01 03:12:39 +01:00
SiboVG
6a6fe8d862 [fixes #1176] Add JRE version checking at startup 2022-03-01 01:48:17 +01:00
SiboVG
7e14a07f9b
Merge pull request #1201 from SiboVG/issues-1163 
[fixes #1163 & #1175] Fix unreliable simulation creation from new flight config
 2022-02-28 23:56:21 +01:00
SiboVG
6fe0a2bf5f
Merge pull request #1199 from SiboVG/issue-1189 
[fixes #1189] Fix Shine slider too small
 2022-02-28 23:56:05 +01:00
SiboVG
dd86485055
Merge pull request #1200 from SiboVG/issue-1192 
[fixes #1192] Use default 3D component color mid-grey + 30% shine
 2022-02-28 23:15:59 +01:00
SiboVG
60d8b12297 Update default 3D color to #BBBBBB 2022-02-28 23:14:00 +01:00
SiboVG
cd44d73b55 [fixes #1163] I messed up one line of code... 2022-02-28 22:56:44 +01:00
SiboVG
746c251c5d [fixes #1192] Use default 3D component color mid-grey + 30% shine 2022-02-28 22:07:20 +01:00
SiboVG
161884bc1b Rename some stuff 2022-02-28 21:10:40 +01:00
SiboVG
125e8f8270 Redo the changes from PR #970 
I have no idea why the changes from that PR were gone, but... now they're back...
 2022-02-28 20:40:48 +01:00
SiboVG
9be77d7a4f Clamp shine & opacity values 2022-02-28 20:39:38 +01:00
SiboVG
901d7b5332 Merge branch 'unstable' into issue-1189 2022-02-28 20:26:03 +01:00
Joe Pfeiffer
a6ddbcd1c5
Merge pull request #1197 from SiboVG/issue-1078 
[fixes #1078] Add opacity slider to appearance config
 2022-02-28 10:48:41 -07:00
Joe Pfeiffer
788b9ab12e
Merge pull request #1182 from SiboVG/issue-1181 
[fixes #1181] Fix initial motor select in MotorChooserDialog
 2022-02-28 10:38:25 -07:00
Joe Pfeiffer
804d9bad0d
Merge pull request #1180 from SiboVG/issue-1166 
[fixes #1166] Use [{motors}] for flight config motors placeholder
 2022-02-28 10:27:19 -07:00
SiboVG
a52135c382
Merge pull request #1198 from JoePfeiffer/fix-1196 
Don't save backward-compatible radialdirection for ParallelStage
 2022-02-28 18:18:18 +01:00
JoePfeiffer
7917576404 Don't save backward-compatible radialdirection for ParallelStage 2022-02-28 10:09:36 -07:00
SiboVG
6ca76c4e43 [fixes #1078] Add opacity slider to appearance config 2022-02-28 18:03:40 +01:00
Joe Pfeiffer
0bcbde8a8d
Merge pull request #1194 from SiboVG/issue-1190 
[fixes #1190] Fix ConfigDialog Close-button cut off
 2022-02-28 09:35:41 -07:00
SiboVG
7b09634760 [fixes #1190] Fix ConfigDialog Close-button cut off 2022-02-28 17:14:06 +01:00
SiboVG
fb872fdb66 [fixes #1189] Fix Shine slider zero width 2022-02-28 16:35:07 +01:00
SiboVG
c230df3ba3
Merge pull request #1185 from JoePfeiffer/add-install4j 
Add install4j configuration files
 2022-02-28 12:14:29 +01:00