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

5536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Pfeiffer
7691fa5ba5
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-09-28 15:58:37 -06:00
SiboVG
b88b789a09 Ensure column index does not exceed table size 2023-09-28 21:52:59 +02:00
SiboVG
382600f866 Implement dark component icons 2023-09-28 18:50:35 +02:00
Sibo Van Gool
10c9b918be
Merge pull request #2354 from neilweinstock/component-icons-update 
Component icons update for dark mode
 2023-09-28 15:41:32 +02:00
SiboVG
e489a6d1d2 Remove dark icons 2023-09-28 15:41:19 +02:00
Joe Pfeiffer
24552f5d5b
Merge pull request #2355 from JoePfeiffer/update-3d-rocket 
update 3D printable rocket example
 2023-09-27 08:31:38 -06:00
JoePfeiffer
edbb826bbb update 3D printable rocket example 2023-09-27 08:20:47 -06: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
b3dbedce40 get updated component file 2023-09-26 17:16:14 -06: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
Neil Weinstock
e668c7b183
dark mode icons for shock cord 2023-09-26 10:35:19 -04:00
Neil Weinstock
a84b764cf2
dark mode icons for pods 2023-09-26 10:34:41 -04:00
Neil Weinstock
2e80a27408
dark mode icons for parachute 2023-09-26 10:34:13 -04:00
Neil Weinstock
b46269a82d
Cleaned-up tubefin icons 
Fixed some defects and also made them suitable for dark mode as well as light
 2023-09-26 10:33:37 -04:00
Sibo Van Gool
a01db37ec2
Merge pull request #2350 from SiboVG/add-jvm-args 
Add JVM arguments to fix 3D issue on Windows
 2023-09-26 14:26:04 +02:00
SiboVG
9b48dd8983 Merge remote-tracking branch 'origin/unstable' into unstable 2023-09-25 23:43:45 +02:00
SiboVG
74d3eecee6 Fix CG z position in top view 2023-09-25 23:43:33 +02:00
JoePfeiffer
65b36af180 cleaned up FlightEventsTest by 
(1) creating a CompareEvents() method called by both testSingleStage() and testMultiStage() to get rid of duplicate code; also made creation of expected events in testSingleStage() cleaner

(2) tied required time accuracy of events that depend on one of the simulationsteppers to the simulation timestep. This also let us go back to testing time on all events.
 2023-09-24 16:37:43 -06:00
SiboVG
5fa13d5b79 Add JVM parameters to fix 3D issue on Windows 2023-09-24 22:46:48 +02:00
Sibo Van Gool
fa5bd94772
Merge pull request #2347 from SiboVG/issue-2344 
[#2344] Optimize UI color fetching
 2023-09-24 22:33:48 +02:00
JoePfeiffer
1b29a6b767 Testing time on events that are determined by simulation steppers shouldn't be 
more precise than the simulation time step.
 2023-09-23 14:23:59 -06:00
JoePfeiffer
faa7c03308 Make store persistent instead of creating a new one every step() 
Use timestep remaining in store instead of getPreviousTimeStep() and setPreviousTimeStep()
 2023-09-23 14:19:59 -06:00
Sibo Van Gool
d9a86021f3
Merge pull request #2340 from SiboVG/fix-preset-column 
Fix component preset table column popup menu
 2023-09-22 18:38:43 +02:00
SiboVG
08695a8ffb Add UI color for multi-comp edit color 2023-09-22 18:33:35 +02:00
SiboVG
ebb4186ccb Refactor UI theme elements to update from listener 2023-09-22 18:21:49 +02:00
SiboVG
248ca23a50 [#2344] Optimize UI color fetching 2023-09-22 11:56:05 +02:00
Sibo Van Gool
2ce09e8f90
Merge pull request #2343 from SiboVG/issue-2341 
[#2341] Sanitize OBJ export groupnames
 2023-09-20 13:28:40 +02:00
SiboVG
d36b5d3e9d [#2341] Sanitize groupnames 2023-09-20 13:27:58 +02:00
SiboVG
19854154b4 Refactor filename illegal char method 2023-09-20 13:27:38 +02:00
SiboVG
a9c328d8b1 Use radio buttons for units buttons 2023-09-19 22:30:39 +02:00
SiboVG
d6b5034764 Don't do anything if legacy column already in right state 2023-09-19 22:23:07 +02:00
SiboVG
9d6d8f25b7 More reasonable legacy column default width 2023-09-19 22:19:20 +02:00
SiboVG
e342574ef3 Use optimal width if no width found 2023-09-19 22:14:54 +02:00
SiboVG
d0f3f7b345 More robust column remembering 2023-09-19 22:12:20 +02:00
SiboVG
4ab28ac276 Update legacy checkbox when legacy column visibility changes 2023-09-19 19:06:07 +02:00
SiboVG
26d399c5f1 Only show visible columns in popup menu 2023-09-19 18:30:04 +02:00
SiboVG
c7e9f46b39 Reformat 2023-09-19 01:31:02 +02:00
Sibo Van Gool
27b0498a3b
Merge pull request #2332 from JoePfeiffer/3d-rocket 
Add David Cain's 3d printed model rocket example
 2023-09-18 23:05:14 +02:00
SiboVG
dd12e0c92a Add border to y axis types 2023-09-18 22:35:27 +02:00
SiboVG
f77b76b649 Fix welcome border dark mode 2023-09-17 22:39:14 +02:00
Sibo Van Gool
8802c48201
Merge pull request #2334 from SiboVG/update-jogl 
Update JOGL
 2023-09-17 22:33:16 +02:00