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

2459 Commits

Author SHA1 Message Date
SiboVG
4c52480793 Merge branch 'unstable' into issue-1662 2022-09-12 20:45:00 +02:00
SiboVG
12fb49b72f Cleanup 2022-09-11 15:28:34 +02:00
SiboVG
3ae75408f7 Remove unneeded imports 2022-09-11 15:27:49 +02:00
SiboVG
7fac367749 Remove unneeded make 1010/1515 rail button generators 2022-09-11 11:29:59 +02:00
SiboVG
2d783a41cc
Merge pull request #1650 from SiboVG/issue-1649 
[#1649] Fix scaling of MassObject with autoRadius
 2022-09-10 23:03:49 +02:00
SiboVG
58c2809ee4 Limit low res root geometry to 15 points 
Because otherwise you would still get 3D issues on large rockets
 2022-09-07 21:43:04 +02:00
SiboVG
db16ebc994 Use low-res tab geometry for fin 3D rendering 2022-09-07 11:04:23 +02:00
SiboVG
b806ed2948 Use low-res root geometry for 3D rendering 2022-09-07 10:52:13 +02:00
SiboVG
6b153a5ef5 Limit maximum fin root division count 2022-09-07 10:39:19 +02:00
SiboVG
f67d3986a4 [#1649] Fix scaling of MassObject with autoRadius 2022-09-07 10:24:11 +02:00
SiboVG
48b177688e [#1646] Increase fin root resolution 2022-09-06 23:03:37 +02:00
SiboVG
9b5baa4020
Merge pull request #1645 from SiboVG/railbutton-icon 
Update rail button large icon
 2022-09-06 22:16:44 +02:00
SiboVG
abfe745c87 Update rail button large icon 2022-09-06 21:18:08 +02:00
SiboVG
40953fac84 Update rail button large icon 2022-09-06 21:14:56 +02:00
Joe Pfeiffer
8cb625aa42
Merge pull request #1637 from SiboVG/mass-override-icon 
Remove 'kg' from mass override icon
 2022-09-01 19:47:33 -06:00
Joe Pfeiffer
c51b462dfe
Merge pull request #1630 from JoePfeiffer/Cd-icon 
Add icon for Cd override
 2022-09-01 19:46:57 -06:00
JoePfeiffer
41f6faa1e5 Make the D slightly smaller than the C 2022-09-01 15:45:15 -06:00
SiboVG
260857fbf9 Update splashscreen 2022-09-01 21:57:27 +02:00
SiboVG
1a1be009de Remove 'kg' from mass override icon 2022-09-01 20:50:50 +02:00
Joe Pfeiffer
ab3ad01b03
Merge branch 'unstable' into fix-1171 2022-09-01 10:12:11 -06:00
JoePfeiffer
6a038a059c Modified CD icon 2022-09-01 09:23:59 -06:00
UncleRus
9bec0fd565 l10n: sync russian translation 2022-09-01 16:21:50 +05:00
JoePfeiffer
5927bcc74f Add icon for Cd override 2022-08-31 10:13:46 -06:00
JoePfeiffer
94bc305ccb Allow user to turn off CD override for subcomponents 2022-08-30 11:31:55 -06:00
JoePfeiffer
d076c54c9a Add component CD override logic to aerodynamic calculations. 
Add unit test for CD override
 2022-08-30 09:57:39 -06:00
JoePfeiffer
1a1e5b2e62 Changed name of "OverrideSubcomponents" to "SubcomponentsOverridden" to improve method name generated by BooleanModel. isSubcomponentsOverridden() is like fingernails on a blackboard, but it's not as bad as isOverrideSubcomponents(). 
Added CD override logic to RocketComponent.java
 2022-08-30 09:57:39 -06:00
JoePfeiffer
9656d8cb5a Send AERODYNAMIC_CHANGE, not MASS_CHANGE, when CD override changes 2022-08-30 09:57:39 -06:00
JoePfeiffer
a00105a70e UI Changes: 
Eliminate title
Rephrase "Set coefficient of drag" to "Override coefficient of drag"
Rephrase "Override mass and CG of all subcomponents" to "Override mass, CG, and CD if akk subcomponents"
Reordered so CD override is before subcomponent override

Rephrases are only in English
 2022-08-30 09:57:38 -06:00
Joe Pfeiffer
5e20c5c3fd
Merge pull request #1604 from SiboVG/issue-1315 
[#1315] Update auto length in MassObject
 2022-08-28 17:39:31 -06:00
Billy Olsen
6d8ae32ae4
Merge pull request #1620 from SiboVG/issue-1618 2022-08-27 18:54:43 -07:00
SiboVG
53b30c6b4a Update thrust curves 2022-08-27 21:30:49 +02:00
SiboVG
529160a151 Update beta version to beta.05 2022-08-27 20:43:06 +02:00
SiboVG
9aa83c1698 Use MathUtil.EPSILON for FinSet point correction 2022-08-27 12:42:55 +02:00
SiboVG
4446d07902 Remove unneeded method 2022-08-27 02:03:48 +02:00
SiboVG
5f3cb5a494 Fix fin set template print for curved parent 2022-08-27 01:34:44 +02:00
SiboVG
a4f925000d
Merge pull request #1605 from SiboVG/improved-hover 
Improve hover info texts
 2022-08-27 01:03:58 +02:00
SiboVG
f907ff186b [#1618] Fix fin tab root points 2022-08-26 23:22:42 +02:00
SiboVG
71045c6675 Refactor 2022-08-26 23:22:42 +02:00
SiboVG
a13ab56808
Merge pull request #1614 from SiboVG/issue-1613 
[#1613] Fix bugs in fin tabs auto calc
 2022-08-26 16:17:23 +02:00
SiboVG
467b1dee1d Delete outdated comment 2022-08-25 21:33:34 +02:00
JoePfeiffer
39eb2bf5bf Only set timestep to 0 if we both have no events in the queue and we're sitting on the ground. Otherwise we end up with a timestep of .001 throughout the coast phase of the flight (as .001 is a hard "minimum step size") 2022-08-25 13:02:21 -06:00
SiboVG
e8c597142c Dynamically set tab height slider max value 2022-08-25 10:00:26 +02:00
SiboVG
fad1390cc3 [#1603] Fix tab height validation 2022-08-25 09:25:14 +02:00
SiboVG
b18a0ad4a3
Merge pull request #1598 from SiboVG/issue-1227 
[#1227] Fix fin root edge display in 3D view and fin template
 2022-08-23 22:12:09 +02:00
SiboVG
895c0e083a Merge remote-tracking branch 'origin/unstable' into unstable 2022-08-23 21:27:19 +02:00
SiboVG
735057b4c6 Improved DisableStageTest 2022-08-23 21:26:44 +02:00
SiboVG
b31a8eb57b
Merge pull request #1595 from SiboVG/icons-sim-buttons 
Add icons to buttons
 2022-08-23 16:53:35 +02:00
SiboVG
e7ab5601e8 Increase test error margin 
Still sometimes a failed test due to this
 2022-08-23 16:08:47 +02:00
SiboVG
5ac4a43bdf Merge branch 'unstable' into icons-sim-buttons 
# Conflicts:
#	swing/src/net/sf/openrocket/gui/main/BasicFrame.java
#	swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
 2022-08-23 15:30:16 +02:00
SiboVG
dafeaf065a Merge branch 'unstable' into remove->delete 2022-08-23 14:53:03 +02:00