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

3533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
477096975d Include mass object auto radius in OR save/import 2022-04-27 21:42:56 +02:00
SiboVG
c6788c9594 Implement auto radius for all mass objects 2022-04-27 21:36:35 +02:00
SiboVG
3166dee81c Implement auto packed diameter for parachute 
Adds an Auto checkbox in the parachute configuration dialog that automatically sets the parachute's packed diameter equal to the inner diameter of its parent
 2022-04-27 21:31:39 +02:00
SiboVG
8018e3f3f9 Clean up Parachute 2022-04-27 18:11:21 +02:00
JoePfeiffer
57d6d44c4f Merge remote-tracking branch 'origin/unstable' into fix-1207a 2022-04-26 16:21:41 -06:00
hcraigmiller
2c5a449302 Additional parachute manufacturer products 
Adds b2Rocketry and Spherachutes product lines
 2022-04-26 03:39:53 -07:00
SiboVG
08324fbefb
Merge pull request #1308 from hcraigmiller/Parachute-Front-Range 
Additional parachute manufacturer's data
 2022-04-26 09:54:01 +02:00
JoePfeiffer
68c4330fa3 Create skeleton of Tube. For the moment, this is just enough to 
make it possible to use TubeCalc.
 2022-04-24 19:22:32 -06:00
JoePfeiffer
4477d9226e commit the work-in-progress drag calculations, including creating TubeCalc for calculations common to LaunchLugs and TubeFinSets 2022-04-20 15:42:19 -06:00
SiboVG
2c4ebabaa1
Merge pull request #1309 from SiboVG/issue-1304 
fixes #1304 Improve thrust curve import dialog
 2022-04-20 09:48:32 +02:00
SiboVG
b51fed39ed Use full file path for thrust curve import error message 2022-04-20 09:42:57 +02:00
SiboVG
3a434ed4ac Use modal type for thrust import error popup 2022-04-20 08:05:30 +02:00
hcraigmiller
0ee4e14727 Parachute Manufacturers 
Addition of Front Range Recovery and The Rocketman parachutes.
 2022-04-19 12:11:39 -07:00
SiboVG
a9dbc85a7e
Merge pull request #1282 from JoePfeiffer/generalize-automatic-tube-fin-radius 
generalize getOuterRadius() so automatic radius tubes touch for number of tubes greater than 2 (ie whenever possible)
 2022-04-19 17:39:42 +02:00
SiboVG
1fd4dffd6a
Merge pull request #1280 from JoePfeiffer/refactor-friction-drag 
Refactor friction drag
 2022-04-19 17:36:52 +02:00
SiboVG
2ad61ef437
Merge pull request #1307 from hcraigmiller/Parachute-Makers 
Parachute Manufacturers added to preset components
 2022-04-19 15:09:22 +02:00
hcraigmiller
87d7210a0e
Delete Rocketman.orc 2022-04-19 04:08:30 -07:00
hcraigmiller
53b0bb7b80
Delete Rocketman_Enhanced.orc 2022-04-19 04:08:15 -07:00
hcraigmiller
21695a5ac2
Delete Front_Range_Rocket_Recovery_Enhanced.orc 2022-04-19 04:06:26 -07:00
hcraigmiller
7d7a831e3b
Delete Fruity_Chutes.orc 2022-04-19 04:05:57 -07:00
hcraigmiller
b9213ce300
Delete Front_Range_Rocket_Recovery.orc 2022-04-19 04:05:39 -07:00
hcraigmiller
3fefca0c2c Parachute Manufacturers added to preset components 
Adds Front Range, FruityChutes, and The Rocketman parachutes.
 2022-04-19 04:01:35 -07:00
hcraigmiller
c3e1e85f1d
Delete Rocketman_Enhanced.orc 2022-04-19 03:24:06 -07:00
hcraigmiller
28c2799385
Delete Fruity_Chutes_Enhanced.orc 2022-04-19 03:23:44 -07:00
hcraigmiller
cf37764f29
Delete Fruity_Chutes.orc 2022-04-19 03:21:17 -07:00
hcraigmiller
3d6145cebc
Delete Front_Range_Rocket_Recovery.orc 2022-04-19 03:19:38 -07:00
hcraigmiller
5870278297
Delete Front_Range_Rocket_Recovery_Enhanced.orc 2022-04-19 03:18:02 -07:00
hcraigmiller
31bd111a1e Parachute configuration preset input enhancements 
Presets for selected parachute changes the Component Name to the parachute Description; input the parachute Cd; and input the override mass, checking the mass override box. The parachute packed values are also input, with the diameter of the parachute sized to the inner diameter of the parent component (where nose cones and transitions have inconsistent inner diameters, these components are sized to the largest diameter). Parachutes without a length and diameter (or without those fields) are sized using the default length and diameter. Once created, the parachute length and diameter do not automatically change if the parent diameter is changed, or the parachute is moved to a different component.
 2022-04-19 03:05:55 -07:00
hcraigmiller
1b7c065654 Parachute Manufacturers added to preset components 
Adds Front Range, FruityChutes, and The Rocketman.
 2022-04-16 21:20:04 -07:00
Joe Pfeiffer
29827ec67a
Merge pull request #1299 from Licone7/unstable 
Fix the invalid link to CONTRIBUTING.MD in the README
 2022-04-16 16:32:01 -06:00
Joe Pfeiffer
cf5190c010
Merge pull request #1297 from hcraigmiller/Split-fin-mass-correction 
[Fixes Issue #1292]  Calculates per fin mass when splitting a set of fins with a mass override
 2022-04-16 16:22:57 -06:00
Joe Pfeiffer
bdcbb3cc99
Merge pull request #1296 from hcraigmiller/Fin-marking-guide-tube-fins 
Adds tube fin sets to fin marking guide.
 2022-04-16 16:10:18 -06:00
JoePfeiffer
3ef3bdcbab Fix typo in FinSetCalc 2022-04-15 17:04:36 -06:00
JoePfeiffer
827da6d73a Merge branch 'unstable' into refactor-friction-drag 2022-04-14 17:00:07 -06:00
L'icône7
2fd8a3bc53
Fix the invalid link to CONTRIBUTING.MD 2022-04-14 13:51:15 -04:00
L'icône7
38cde2110a
Update README.md 2022-04-14 13:50:37 -04:00
L'icône7
2bd984659d
Update README.md 2022-04-14 13:47:01 -04:00
hcraigmiller
cb3343dd78 Augment parachute manufactures and parachute components 
Adds Front Range and FruityChutes parachutes to preset components list
 2022-04-14 10:19:32 -07:00
hcraigmiller
736b1c1193 [Fixes Issue #1292] Calculates per fin mass when splitting a set of fins with a mass override. 
If a set of fins has an overriden mass, then, if the set is split into individual fins, the overridden mass is divided by the number of fins in the set and the quotient is set as the mass override for each individual fin.
 2022-04-14 03:05:29 -07:00
hcraigmiller
f2190977dc
Merge branch 'unstable' into Fin-marking-guide-tube-fins 2022-04-14 00:16:48 -07:00
hcraigmiller
60bb0a925e Adds tube fin sets to fin marking guide. 
Creates a guide if and only if a fin set or tube fin set exists. Allows for multiple fin and/or tube fin sets and multiple launch lugs and/or rail buttons. But, not without overlaping labels when dissimilar components and/or similar components with dissimilar names have the same rotation.
 2022-04-13 23:48:27 -07:00
SiboVG
868f37d78f
Merge pull request #1295 from SiboVG/unstable 
Remove import comment FinMarkingGuide
 2022-04-14 05:45:21 +02:00
SiboVG
bf16d1b7c5 Remove import comment FinMarkingGuide 2022-04-14 05:42:30 +02:00
Joe Pfeiffer
48d804b58f
Merge pull request #1289 from hcraigmiller/Fin-marking-guide-Rail-Guides 
Fin marking guide -- Fixes Issue #1259 No Rail Button location on Fin Marking Guide
 2022-04-13 20:59:33 -06:00
JoePfeiffer
45e0f40e1e Merge branch 'unstable' into refactor-friction-drag 2022-04-13 16:49:26 -06:00
JoePfeiffer
e8ae279dd3 Instead of getTubesTouching() returning a boolean telling whether tubes are touching, use getTubeSeparation() returning the actual separation between tubes. This'll work just as well for the current effort, and will be more useful when we consider tubes with separation. 2022-04-13 14:11:15 -06:00
Joe Pfeiffer
f0d7566690
Merge branch 'openrocket:unstable' into generalize-automatic-tube-fin-radius 2022-04-13 11:58:43 -06:00
SiboVG
3bfa737ba8
Merge pull request #1293 from JoePfeiffer/normalize-CD-names 
Refer to drag coefficient consistently as CD
 2022-04-13 19:19:34 +02:00
JoePfeiffer
6f0a6f4127 Refer to drag coefficient consistently as CD 2022-04-13 10:22:30 -06:00
hcraigmiller
4663dd2201 Merge branch 'Fin-marking-guide-Rail-Guides' of https://github.com/hcraigmiller/openrocket into Fin-marking-guide-Rail-Guides 2022-04-10 13:14:05 -07:00