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

2031 Commits

Author SHA1 Message Date
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
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
3793eb19c6 Add equals check for new length 2022-08-22 09:54:37 +02:00
SiboVG
b7752cde70 Use auto length for RockSim export 2022-08-22 09:49:43 +02:00
SiboVG
bc69df1483 [#1315] Update auto length in MassObject 2022-08-21 22:26:55 +02:00
SiboVG
2632dda0f0
Merge pull request #1580 from SiboVG/issue-1405 
[#1405] Remove 'Show all compatible' in preset chooser
 2022-08-19 23:52:27 +02:00
SiboVG
5492029a69 Fix finset print resolution 2022-08-18 23:17:43 +02:00
SiboVG
a7a73e9949 Documentation 2022-08-18 22:47:08 +02:00
SiboVG
5df7f4f10d Include root points in fin tabs 2022-08-18 00:28:50 +02:00
SiboVG
d2b14e2a5d [#1227] Include root points in fin 3D view & export 2022-08-18 00:15:47 +02:00
SiboVG
685a1b0342 Add icons to buttons 2022-08-16 22:23:43 +02:00
SiboVG
9b4ccbf2e6 Fix exception when deleting config while PhotoStudio open 2022-08-14 10:34:00 +02:00
SiboVG
d4c07bce68 [#1405] Remove 'Show all compatible' in preset chooser 2022-08-10 22:32:52 +02:00
SiboVG
e3c7ccc035
Merge pull request #1573 from JoePfeiffer/optimize-drag 
Multiply component drag by number of instances
 2022-08-10 21:04:54 +02:00
JoePfeiffer
f993684f95 If we don't have any events left in the queue, shouldn't advance time 2022-08-09 19:33:53 -06:00
JoePfeiffer
24b316655e Instead of iterating through all instances of components in calculating drag, just multiply the component's pressure, friction, and base drag by the number of instances. 2022-08-02 19:53:57 -06:00
Joe Pfeiffer
e70b737fe1
Merge pull request #1504 from SiboVG/issue-1440 
[#1440] Add all context drags to component drag
 2022-08-02 15:03:28 -06:00
SiboVG
67d7eae42b
Merge pull request #1507 from thzero/scripting 
Resolving issue #1270, unexpected exception with simulation scripting
 2022-08-02 22:39:25 +02:00
thzero
3ed19060bd
Merge branch 'openrocket:unstable' into scripting 2022-08-02 09:22:08 -05:00
JoePfeiffer
2ad7cd1c95 When sitting on the ground, advance simulation time to next event time 2022-07-31 19:46:50 -06:00
Joe Pfeiffer
c0ba04edac
Merge pull request #1540 from SiboVG/railbutton-database 
Incorporate rail button database items
 2022-07-31 15:10:13 -06:00
Joe Pfeiffer
e313546a65
Merge pull request #1538 from SiboVG/issue-1537 
[#1537] Add additional configuration parameters for rail buttons
 2022-07-31 09:44:30 -06:00
SiboVG
39d56e6211 Nevermind, this is in fact necessary... 2022-07-27 22:59:26 +02:00
SiboVG
2be82ff36f Eureka! Use concurrent-safe collections 2022-07-27 22:50:28 +02:00
SiboVG
1123a5d4ea Ignore null stages 2022-07-27 22:12:10 +02:00
SiboVG
ce0eeda72f Use fireChangeEvent for toggling stages 
This causes toggling stages to have an undo-action.
 2022-07-26 13:42:06 +02:00
Jon Jagt
2badfe850d Change Diameter Filters to use Preferences 
Add preferences for "match diameter" filters in the Component Preset Chooser to Preferences; change filter pre-checks to use those preferences.
 2022-07-25 10:51:57 -05:00
SiboVG
f1a98bc776 Remove unneeded config update 
Selected config is present in configset
 2022-07-23 23:29:48 +02:00
SiboVG
cfb51d350a Remove updateconfigurations 
Not needed, as the about iterator already calls 'update' in Rocket (iterator returns the rocket itself)
 2022-07-23 21:50:43 +02:00
thzero
e35b7bda2d
Merge branch 'openrocket:unstable' into scripting 2022-07-20 08:28:17 -05:00
SiboVG
297123a7f2 Redo getActiveComponents 2022-07-20 00:17:22 +02:00
SiboVG
d2b13c6714 Change component change event for setCantAngle 2022-07-19 23:10:59 +02:00
SiboVG
57bc867789
Merge pull request #1500 from SiboVG/issue-1487 
[#1487] Fix configuration referencing after loadFrom rocket
 2022-07-19 22:19:00 +02:00
SiboVG
e1e3f89041 Don't include finish 2022-07-19 19:29:58 +02:00
SiboVG
57ee3bb177 Clear rail button presets after change 2022-07-19 13:27:09 +02:00
SiboVG
6b9e327508 Merge branch 'issue-1537' into railbutton-database 
# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RailButton.java
 2022-07-19 13:20:24 +02:00
SiboVG
2c401c47fc Implement rail button presets 2022-07-19 13:14:44 +02:00
SiboVG
7626e0801b Add import/save for new rail button parameters 2022-07-19 00:52:46 +02:00
SiboVG
1bf4486a63 [#1537] Add extra configuration parameters for rail button 2022-07-19 00:18:34 +02:00
SiboVG
ab9ace735e Remove redundant imports 2022-07-18 23:52:33 +02:00
SiboVG
2c67b80940
Merge pull request #1528 from SiboVG/issue-1524 
[#1524] Add sliders to PhotoStudio
 2022-07-18 16:35:43 +02:00
SiboVG
d0be2e5e07 Add preference for marker visibility 2022-07-18 00:28:05 +02:00
SiboVG
959bbfaac3 [#1146] Add 2D visualization for pod sets 2022-07-16 02:40:12 +02:00
SiboVG
74d21bfa3c [#1524] Add sliders to PhotoStudio 2022-07-12 13:00:09 +02:00
Joe Pfeiffer
173b332602
Merge pull request #1478 from SiboVG/issue-1477 
[#1477 & #1460] Don't include inactive stages in calculations
 2022-07-06 15:34:09 -06:00