3206 Commits

Author SHA1 Message Date
JoePfeiffer
6a5a298097 Add times to some of the events that were currently unspecified. If we end up getting spurious failures we can take them back out. 2023-11-18 07:04:18 -07:00
SiboVG
c0c00dd6c3 Merge unstable 2023-11-17 23:29:05 +01:00
SiboVG
06ca16724d Merge remote-tracking branch 'origin/unstable' into unstable 2023-11-17 23:22:35 +01:00
SiboVG
d838157209 Only support Java 17 2023-11-17 23:22:25 +01:00
JoePfeiffer
e752aa6c28 Merge branch 'unstable' into fix-acceleration-status
Fix conflicts between FlightEventsTest on the two branches
2023-11-17 11:02:04 -07:00
Joe Pfeiffer
9c97a9adb5
Merge pull request #2398 from JoePfeiffer/fix-sim-unit-test
Clean up FlightEventsTest unit test
2023-11-17 09:01:43 -07:00
Joe Pfeiffer
d9a3927637
Merge pull request #2346 from JoePfeiffer/inch-surface-roughness
Add "inch" units to surface roughness
2023-11-17 09:01:01 -07:00
Joe Pfeiffer
5507ae06e1
Merge pull request #2402 from SiboVG/issue-2388
[#2388] Sync wind average speed, standard div & turbulence widgets
2023-11-17 08:59:15 -07:00
SiboVG
cdeef020b7 Set wind turbulence to 0 when average speed is 0 2023-11-17 02:08:19 +01:00
SiboVG
846a265965 Update thrust curves 2023-11-15 22:02:31 +01:00
JoePfeiffer
e5554e0f1d oops, left some commented out code in there 2023-11-15 11:48:33 -07:00
JoePfeiffer
b36950651e clean up FlightEventsTest 2023-11-15 11:45:40 -07:00
Joe Pfeiffer
7fd390e4d3
Merge branch 'openrocket:unstable' into inch-surface-roughness 2023-11-15 11:02:36 -07:00
JoePfeiffer
0c9d646983 Add unit test for stage overrides 2023-11-15 09:22:44 -07:00
JoePfeiffer
c0b0eab4e6 Clean up code for mass and CG overrides
For component assemblies, set CG to CG of children when overriding mass
Fix handling of "override for children"
2023-11-15 09:13:09 -07:00
JoePfeiffer
98562bcfa7 Fix comments regarding mass and CG overrides 2023-11-15 07:09:20 -07:00
SiboVG
94c2c1ef38 Major refactor of simulation options UI 2023-11-15 04:41:31 +01:00
SiboVG
6ca19a960e Merge remote-tracking branch 'origin/unstable' into unstable 2023-11-04 16:20:13 +01:00
SiboVG
c817148feb Update installers for 23.09 2023-11-04 16:20:06 +01:00
Joe Pfeiffer
2e599f18e0
Merge branch 'openrocket:unstable' into inch-surface-roughness 2023-10-26 15:31:06 -06:00
Joe Pfeiffer
92d692f029
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-10-26 15:30:45 -06:00
JoePfeiffer
01f1dd1dc6 Avoid divide by 0 in TubeCalc when velocity is 0 by setting CD to 0 in this case. 2023-10-26 14:06:42 -06:00
Sibo Van Gool
e46c0bec2b
Merge pull request #2379 from SiboVG/issue-2378
Include radius clamping in clamping exclude
2023-10-21 01:42:44 +02:00
SiboVG
10c4d3da82 Include radius clamping in clamping exclude 2023-10-21 01:42:16 +02:00
Joe Pfeiffer
29e3166487
Merge branch 'openrocket:unstable' into inch-surface-roughness 2023-10-17 07:57:14 -06:00
Joe Pfeiffer
831ef43233
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-10-17 07:56:56 -06:00
Joe Pfeiffer
d8434e8550
Merge branch 'openrocket:unstable' into fix-2278 2023-10-15 06:42:21 -06:00
JoePfeiffer
8cc06029c5 update unit tests for changed moment of inertia calculations 2023-10-15 06:40:35 -06:00
JoePfeiffer
bcdf32ecba Don't include shoulders in CG calculation for applying parallel axis theorem to longitudinal inertia, as they aren't included in calculation of longitudinal inertia itself. 2023-10-15 06:20:10 -06:00
JoePfeiffer
141b5ec845 Turned out the unpopulated column also affected CSV export; also, I left a line of debug in 2023-10-12 14:37:21 -06:00
Joe Pfeiffer
27e668cbce
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-10-12 12:35:32 -06:00
JoePfeiffer
c8949c8a2e update test to add optimum delay 2023-10-09 10:17:14 -06:00
JoePfeiffer
03a6e614b8 load/save optimum delay time 2023-10-09 10:17:14 -06:00
JoePfeiffer
2759711950 Explicitly store optimum delay in flight data, instead of recalculating from flight data branch of time it's wanted 2023-10-09 10:16:49 -06:00
Joe Pfeiffer
9bdd61f460
Merge branch 'openrocket:unstable' into inch-surface-roughness 2023-09-28 15:59:16 -06:00
Joe Pfeiffer
7691fa5ba5
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-09-28 15:58:37 -06:00
SiboVG
0fcb2a0742 Merge branch 'unstable' into other-dark-mode 2023-09-28 18:52:43 +02:00
SiboVG
94724d9a9d WIP 2023-09-28 18:52:33 +02:00
SiboVG
382600f866 Implement dark component icons 2023-09-28 18:50:35 +02:00
Neil Weinstock
7f84357734
dark mode icon for streamer (large) 2023-09-27 09:39:09 -04:00
Neil Weinstock
6e0c02e74c
Tweaks and cleanup 2023-09-27 09:05:22 -04:00
Neil Weinstock
9ec4c97893
More small dark-mode icons 2023-09-27 08:46:43 -04:00
Neil Weinstock
1c14aec040
dark mode small parachute icon tweak 2023-09-26 20:44:51 -04:00
Neil Weinstock
7372e3671a
dark mode icons for mass object 2023-09-26 20:41:22 -04:00
Neil Weinstock
2af7214ecc
Updated large tubefin icon again 2023-09-26 20:39:37 -04:00
JoePfeiffer
a884680817 Merge branch 'unstable' into fix-acceleration-status 2023-09-26 17:09:16 -06:00
JoePfeiffer
3ff29f8d0e Merge branch 'unstable' into fix-acceleration-status
Not quite sure what the conflict was with the flight events test. It looked like it was just the changes I made on this branch...
2023-09-26 17:05:26 -06:00
JoePfeiffer
7bafe94f23 Pass acceleration data to post listeners
Also, existing code wouldn't call calculation post-listeners if pre-listeners had been called. Fixes that.
2023-09-26 16:48:54 -06:00
JoePfeiffer
7a2ede6e24 Use current atmospheric conditions, not previous conditions, in calculating thrust.
This lets us get rid of previousAtmosphericConditions completely.

Note that while we pass acceleration and atmospheric conditions into calculateAverageThrust(), we don't actually do anything with them there. They appear to be passed in for some sort of eventual enhancements when we do things like altitude compensation for motors, or acceleration for hybrids or water rockets.

It also turned out that while we called getPreviousAtmosphericConditions() when call ing calculateAverageThrust(), setPreviousAtmosphericConditions() was never called.
2023-09-26 14:46:09 -06:00
Neil Weinstock
fb3641e94f
Dark mode icons for mass 2023-09-26 11:08:07 -04:00