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

3402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
hcraigmiller
530dc98016 Fin marking guide -- Fixes Issue #1259 No Rail Button location on Fin Marking Guide 2022-04-10 13:13:39 -07:00
hcraigmiller
46d01c6dc2 Fin marking guide -- Fixes Issue #1259 No Rail Button location on Fin Marking Guide 2022-04-10 12:56:24 -07:00
Joe Pfeiffer
507dbb7c36
Merge pull request #1288 from openrocket/revert-1273-normalize-CD-names 
Revert "Refer to drag coefficient consistently as CD"
 2022-04-10 09:41:35 -06:00
Joe Pfeiffer
4c82ec114a
Revert "Refer to drag coefficient consistently as CD" 2022-04-10 09:36:14 -06:00
Joe Pfeiffer
9f1346d44e
Merge pull request #1273 from JoePfeiffer/normalize-CD-names 
Refer to drag coefficient consistently as CD
 2022-04-05 19:34:01 -06:00
JoePfeiffer
4fd3f26c9e Refer to drag coefficient consistently as CD 2022-03-31 16:04:05 -06:00
SiboVG
9efe1a9569
Merge pull request #1272 from JoePfeiffer/allow-java-17 
Allow execution with Java 17
 2022-03-30 23:19:51 +02:00
JoePfeiffer
567fe568cb Allow execution with Java 17 2022-03-30 09:14:20 -06:00
SiboVG
b5110f7e34
Update release date release-22.02.beta.02 2022-03-26 18:43:31 +01:00
SiboVG
dc3a1d0741
Merge pull request #1268 from SiboVG/unstable 
Update install4j application name (once more)
 2022-03-26 13:05:31 +01:00
SiboVG
cfd4b8b519 Update install4j application name (once more) 2022-03-26 13:02:30 +01:00
SiboVG
55de22d827
Merge pull request #1267 from SiboVG/unstable 
Update install4j application name
 2022-03-25 22:59:33 +01:00
SiboVG
4f571743e0 Update install4j application name 2022-03-25 22:32:06 +01:00
SiboVG
8b815a70cc
Merge pull request #1266 from JoePfeiffer/update-version 
Update version
 2022-03-25 19:41:07 +01:00
JoePfeiffer
4890e0bcdd Merge branch 'unstable' into update-version 2022-03-25 12:38:38 -06:00
JoePfeiffer
66349d5996 Merge branch 'unstable' into update-version 2022-03-25 12:36:45 -06:00
JoePfeiffer
6dca84ebbf update version numbers in build.properties and install4j config 2022-03-25 12:34:56 -06:00
SiboVG
59697a310a
Fix bullet point formatting issue 2022-03-25 19:30:01 +01:00
SiboVG
5df119488d
Merge pull request #1263 from SiboVG/unstable 
Update DS_Store for 22.02.beta.02 macOS installer
 2022-03-25 03:18:02 +01:00
SiboVG
0c559dfe41 Merge remote-tracking branch 'origin/unstable' into unstable 2022-03-25 03:06:01 +01:00
SiboVG
85d7ca6254 Edit DS_Store for 22.02.beta.02 app name 2022-03-25 03:03:18 +01:00
SiboVG
ea7aa84a92
Merge pull request #1242 from neilweinstock/release-notes-b2 
Update release notes for beta2
 2022-03-25 01:39:12 +01:00
Neil Weinstock
4ef5a02322 Merge branch 'release-notes-b2' of https://github.com/neilweinstock/openrocket into release-notes-b2 2022-03-24 20:19:20 -04:00
Neil Weinstock
91de477def Final update for beta 2 2022-03-24 20:18:56 -04:00
Neil Weinstock
83415cedbc
Merge branch 'openrocket:unstable' into release-notes-b2 2022-03-24 20:17:09 -04:00
SiboVG
125d002e0a
Merge pull request #1261 from SiboVG/unstable 
Update motors
 2022-03-24 12:48:38 +01:00