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

2074 Commits

Author SHA1 Message Date
JoePfeiffer
07e15ddaa2 Merge branch 'unstable' into SIMFAIL-flight-event 2024-01-03 07:31:13 -07:00
JoePfeiffer
3c8327ffd2 tweak display of abort in sim plot a little 2024-01-03 07:26:51 -07:00
JoePfeiffer
f9a8f59247 Add simulation aborts to .ork file load/save 2024-01-03 07:09:24 -07:00
JoePfeiffer
c5f1f011ef Add simulation abort to sim panel tooltip 2024-01-02 08:37:07 -07:00
JoePfeiffer
eb4b02bda4 Assign priorities to event images and colors based on ordinal of event types (higher ordinal means higher priority) 2024-01-02 08:05:17 -07:00
JoePfeiffer
c1b76be844 Add simulation abort title to simulation plot 2024-01-02 07:39:30 -07:00
Sibo Van Gool
e056e6ed07
Merge pull request #2421 from neilweinstock/texture-pulldown 
Updated texture select combobox
 2023-12-28 00:17:31 +01:00
JoePfeiffer
1115212317 Remove some now-unused Exception classes: MotorIgnitionException and SimulationLaunchException. 2023-12-24 20:34:34 -07:00
JoePfeiffer
173a3d38e2 Integrate SIM_ABORT into code across OR 2023-12-24 20:34:34 -07:00
SiboVG
78593a6749 Improve default materials for fins and nose cone 2023-12-24 14:35:51 +01:00
neil.weinstock@gmail.com
05e9758f36 texture select combobox: show 20 items, change "From file..." to "Select file..." 2023-12-10 20:48:28 -05:00
Sibo Van Gool
c136436284
Merge pull request #2416 from SiboVG/issue-2178 
[#2178] Add South/West unit for latitude/longitude
 2023-12-09 02:03:15 +01:00
Sibo Van Gool
5746aa1350
Merge pull request #2406 from SiboVG/refactor-warnings 
Add Warning component source to Warning
 2023-12-09 02:02:41 +01:00
SiboVG
757a2ab006 Re-add lat and long to unit prefs panel 2023-12-01 19:30:33 +01:00
SiboVG
52f33a3429 Merge branch 'unstable' into issue-2178 
# Conflicts:
#	core/src/net/sf/openrocket/simulation/FlightDataType.java
#	core/src/net/sf/openrocket/unit/UnitGroup.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
 2023-12-01 19:28:40 +01:00
SiboVG
e6a4f9bddb Whoops, forgot to use FlightDataComboBox for x axis types 2023-11-25 03:50:34 +01:00
SiboVG
0ff32888a1 Refactor searchable and categorizable combobox to general method 
In case we want to use it for other parts of the UI :)
 2023-11-25 03:00:50 +01:00
SiboVG
341ab81b79 [#2338] Use searchable and categorizable combobox for flight data type 2023-11-24 20:47:05 +01:00
SiboVG
764ebac7b0 Merge branch 'unstable' into issue-2338 2023-11-23 17:31:55 +01:00
Sibo Van Gool
ce2c9c97fe
Merge pull request #2407 from SiboVG/issue-2345 
[#2345] Reintroduce motor ignition delay optimization
 2023-11-23 17:31:24 +01:00
SiboVG
f3a58598d6 Merge branch 'unstable' into issue-2338 2023-11-22 23:22:34 +01:00
SiboVG
06a7999ba4 Fix coloring of disabled optimization parameters in dark mode 2023-11-19 03:53:09 +01:00
SiboVG
9c163fa551 Rename custom color class to ORColor 2023-11-19 00:47:55 +01:00
SiboVG
a0dc99c40b Update chute sim 2023-11-17 23:32:12 +01:00
SiboVG
c0c00dd6c3 Merge unstable 2023-11-17 23:29:05 +01:00
Joe Pfeiffer
a0a1ab58de
Merge pull request #2395 from isaacjones99/issue-2258 
[2258] Changed the static text box in the component analysis dialog to a JSpinner
 2023-11-17 09:04:36 -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
8ad74c0b27 [#2388] Sync wind average speed, standard div & turbulence widgets 2023-11-17 02:00:02 +01:00
Joe Pfeiffer
3888a59ae2
Merge pull request #2396 from SiboVG/fix-color-select 
Also check color when using default material
 2023-11-15 10:17:39 -07:00
SiboVG
94c2c1ef38 Major refactor of simulation options UI 2023-11-15 04:41:31 +01:00
Isaac
1e0947529c [2258] Changed the size of the spinners and unit selector and removed wildcard imports. 2023-11-13 13:53:46 +00:00
Sibo Van Gool
f304e4577a
Merge branch 'unstable' into issue-2258 2023-11-13 03:57:48 +01:00
SiboVG
e62cd4c6db Set column widths in miglayout 2023-11-13 03:43:38 +01:00
SiboVG
6b5b951fe5 Add correct border for dark theme unit selectors 2023-11-13 03:30:44 +01:00
Isaac
e4ace36e93 [2258] Changed the static text box in the component analysis dialog to a JSpinner. 2023-11-13 00:13:03 +00:00
SiboVG
0b3b31275d Also check color when using default material 2023-11-12 18:00:53 +01:00
SiboVG
30c7f63cf7 [#2385] Use plot colors for thrust curves 2023-10-31 16:21:09 +01:00
SiboVG
48d9532e2f Merge remote-tracking branch 'origin/unstable' into unstable 2023-10-30 13:29:06 +01:00
SiboVG
b0fdb57167 Switch import and export preferences button order 2023-10-30 13:28:59 +01:00
SiboVG
439b0a77c6 First restore column visibility 
Fixes the second column to start disappearing...
 2023-10-25 01:29:53 +02:00
SiboVG
78dac7e498 Compute optimal column width if not in preference 2023-10-25 01:23:56 +02:00
SiboVG
bec89c444b Merge branch 'unstable' into issue-2357 2023-10-23 23:48:21 +02:00
SiboVG
30c4b84d87 [#2357] Save column width, order, and visibility in preset table 2023-10-23 20:02:51 +02:00
SiboVG
c5e8bbbe9c Use proper view index in table selection 2023-10-23 20:00:23 +02:00
SiboVG
3e33c8fceb Properly dispose component config dialog (for dark theme UI) 2023-10-23 19:23:37 +02:00
SiboVG
8ca59685ed Fix duplicate preference window upon prefs import 2023-10-23 16:27:19 +02:00
SiboVG
09769dfe08 Only use macOS hack in light theme 2023-10-23 00:40:28 +02:00
SiboVG
8ea169dc90 Remove unused table columns instead of simply hiding them 2023-10-22 23:05:51 +02:00
JoePfeiffer
67b3256dbf Failed to add revised 3D printing example to repository before 2023-10-18 07:16:52 -06:00
JoePfeiffer
3ecb87c861 Clarify that only nose cone and fins of 3D printed example rocket are to be printed 2023-10-16 16:07:11 -06:00