SiboVG
4691bb2ae3
Merge branch 'unstable' into issue-1791
2022-11-10 00:40:20 +01:00
Joe Pfeiffer
884e8edd59
Merge pull request #1804 from JoePfeiffer/tweak-events-test
...
Modify Falcon9H test rocket and FlightEventsTest to get predictable results
2022-11-09 16:18:12 -07:00
JoePfeiffer
d0a15f2a0f
Change peak thrust of G77 simulation motor so Falcon9H test rocket doesn't tumble until well after stage separations
...
Put order of expected events to match the new test rocket
2022-11-09 16:07:12 -07:00
SiboVG
a75d3402c3
Fix subcomponents override widgets not disabling when enabled prior to parent overriding subcomponents
2022-11-09 15:14:16 +01:00
SiboVG
4c8aaee8a8
Replace override parent search with overriddenBy object
2022-11-09 13:52:42 +01:00
SiboVG
16354971a4
Update unit tests
2022-11-09 05:32:05 +01:00
SiboVG
f9383b6c7d
Fix overriddenBy information getting lost between sub-children
2022-11-09 05:31:45 +01:00
SiboVG
6d80378a3f
Add unit tests for overriddenBy
2022-11-09 04:49:55 +01:00
SiboVG
03431b9c41
Fix issue in override parent updating for sub-children
2022-11-09 04:31:09 +01:00
SiboVG
072616468e
Fix component tooltip when subcomponents overridden
2022-11-09 01:55:49 +01:00
Sibo Van Gool
b1777bb36b
Merge pull request #1753 from SiboVG/issue-1621
...
Write unit tests for flight events
2022-11-08 21:41:10 +01:00
Sibo Van Gool
7625b2ee00
Merge pull request #1801 from JoePfeiffer/sort-by-stage
...
Sort on source stage for simultaneous events
2022-11-08 21:38:26 +01:00
JoePfeiffer
d74adf676f
Sort on source stage for simultaneous events
...
-- if only one of the events has a source, the other one goes first.
-- if both have sources, lower (numerically higher) stage goes first.
2022-11-08 13:30:21 -07:00
SiboVG
a3776ddec0
Add warning for subcomponents that mass/CG/CD is overridden by parent
2022-11-08 16:51:39 +01:00
SiboVG
4e1c0f15fb
[ #1631 ] Show subcomponent overridden icon
...
When a component's parent has the subcomponent overridden icon enabled, that component will now also have a dedicated icon, indicating that it's mass has been overridden
2022-11-08 16:51:15 +01:00
SiboVG
de15bdd79b
Add warning in prefs sim options
2022-11-08 15:48:59 +01:00
SiboVG
378808fae4
Change warning to dark red color instead of flashy red
2022-11-08 14:25:05 +01:00
SiboVG
451dec9cac
Add new, dark red color preset
2022-11-08 14:24:41 +01:00
SiboVG
8004743b64
Add icons for mass/CG/CD subcomponent override
2022-11-08 11:51:05 +01:00
SiboVG
ae47195f66
Save state of which component overrides mass/CG/CD of the current component
2022-11-08 11:50:37 +01:00
Sibo Van Gool
9f06b98bd5
Merge pull request #1800 from JoePfeiffer/fix-1702
...
Fix 1702
2022-11-08 11:40:49 +01:00
Sibo Van Gool
a40acf226e
Merge pull request #1796 from SiboVG/issue-1793
...
[#1793 ] Fix Pod set angle slider for negative angles
2022-11-08 10:19:39 +01:00
JoePfeiffer
2a9b87fe7e
Don't display component assemblies other than entire rocket
2022-11-07 15:26:03 -07:00
Joe Pfeiffer
3f73f694e2
Merge branch 'openrocket:unstable' into fix-1702
2022-11-07 15:23:42 -07:00
Sibo Van Gool
cd420b6499
Merge pull request #1795 from SiboVG/issue-1348
...
[#1348 ] Add support for RockSim importing and exporting of Pods
2022-11-07 21:21:35 +01:00
Sibo Van Gool
009cbbe17c
Merge pull request #1797 from SiboVG/issue-1794
...
[#1794 ] Clamp IntegerModel to min and max on set
2022-11-07 21:20:44 +01:00
Joe Pfeiffer
399b024728
Merge pull request #1799 from JoePfeiffer/fix-1790
...
Wait to do TUMBLE processing until actual TUMBLE event is obtained from queue
2022-11-07 12:47:14 -07:00
JoePfeiffer
2c8c29c46d
Wait to do TUMBLE processing until actual TUMBLE event is removed from queue
...
Run TARC payloader simulation and save new simulation data. I compared our simulation data with an on-line descent rate calculator at https://descentratecalculator.onlinetesting.net/ and saw that the results are well within 1 fps of each other.
2022-11-07 08:02:48 -07:00
SiboVG
8cbe1e791c
Add unit test for getMass vs getSectionMass
2022-11-07 10:37:55 +01:00
SiboVG
47d4f7c0b1
[ #1791 ] Return component mass as section mass if subcomponents mass is overridden
2022-11-07 00:12:15 +01:00
SiboVG
40f2994a84
[ #1794 ] Clamp IntegerModel to min and max on set
2022-11-06 23:59:04 +01:00
SiboVG
c13c882670
[ #1793 ] Fix angle slider for negative angles
2022-11-06 23:49:26 +01:00
SiboVG
b104ca2ab1
Add unit test for RockSim pod exporting
2022-11-06 23:45:01 +01:00
SiboVG
92edca5923
[ #1348 ] Add RockSim exporting of PodSet
2022-11-06 23:44:28 +01:00
SiboVG
afbd989249
Add unit tests for RockSim pod importing
2022-11-04 22:27:52 +01:00
SiboVG
b074503a1e
Merge branch 'unstable' into issue-1348
...
# Conflicts:
# core/test/net/sf/openrocket/file/rocksim/importt/RockSimLoaderTest.java
2022-11-04 21:46:53 +01:00
Sibo Van Gool
986b485cf6
Merge pull request #1789 from SiboVG/issue-106
...
[#106 ] Support SubAssembly RockSim import
2022-11-04 21:43:57 +01:00
Sibo Van Gool
44ee427c19
Merge pull request #1788 from SiboVG/issue-1787
...
[#1787 ] Deselect components when no components clicked
2022-11-04 21:43:26 +01:00
Sibo Van Gool
87511df328
Merge pull request #1782 from SiboVG/issue-1781
...
[#1781 ] Multi-component parameter additions/deletions in rocket optimizer
2022-11-04 21:43:09 +01:00
SiboVG
9eb9ee2ff1
Fix unit tests for rocket that contains pods
2022-11-04 17:51:25 +01:00
SiboVG
9cea70f517
[ #1348 ] Add support for RockSim PodSet importing
2022-11-04 17:49:40 +01:00
SiboVG
ad937b968d
Merge branch 'unstable' into issue-106
...
# Conflicts:
# core/test/net/sf/openrocket/file/rocksim/importt/RockSimLoaderTest.java
2022-11-04 01:02:49 +01:00
SiboVG
a449d7b7f1
Add unit tests for RockSim SubAssembly import
2022-11-04 00:59:09 +01:00
SiboVG
90cceecd65
[ #106 ] Fix SubAssembly importing in RockSim
2022-11-04 00:38:32 +01:00
Sibo Van Gool
13c3e1c6f2
Merge pull request #1783 from SiboVG/issue-966
...
[#966 ] Fix weird behavior when clicking on textured part in 3D view
2022-11-03 23:59:58 +01:00
SiboVG
6f6fc1dd23
[ #1787 ] Deselect components when no components clicked
2022-11-03 23:58:44 +01:00
SiboVG
ba849c8d9a
Texture flushing is not needed :)
2022-11-03 21:58:47 +01:00
SiboVG
3d3ad2486b
Rename SubAssembly RockSim test
...
This is really confusing as it's not about the SubAssembly component in RockSim...
2022-11-03 21:44:14 +01:00
JoePfeiffer
30a49c2f6f
Add component assemblies to BarrowmanCalculator:calculateForceAnalysis
...
Display component assemblies in ComponentAnalysisDialog
Use "Total" instead of actual component name for Rocket in Stability tab, for consistency with Drag characteristics tab
Use user-specified units instead of internal units for Stability display.
2022-11-03 09:06:48 -06:00
Sibo Van Gool
d3e872478d
Merge pull request #1785 from SiboVG/issue-1776
...
[#1776 ] Add unit tests for RockSim import fins on transition
2022-11-03 02:15:04 +01:00
