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

585 Commits

Author SHA1 Message Date
Daniel_M_Williams
552706f6b9 Merge branch 'master' of https://github.com/openrocket/openrocket into child_staging 2015-09-16 16:09:58 -04:00
Daniel_M_Williams
6c11fb2751 [Bugfix] Refactored Configurations: 
-Configuration refactor
  -stages are toggled individually
  -removed set-up-to-stage method
-MotorInstance refactor: multiple Lists -> one map<MotorId,MotorInstance>
    moved most of the fields to MotorInstance.java
 2015-09-16 15:52:20 -04:00
Daniel_M_Williams
85dff39fb9 folded BasicMassCalculator into MassCalculator 2015-09-16 15:52:20 -04:00
Kevin Ruland
cec7005e56 Work around reported bug concerning TimSort and comparators violating 
contract.
 2015-09-12 06:37:06 -05:00
Daniel_M_Williams
54f1a4c672 added example rockets for Boosters and Pods 2015-08-29 14:45:36 -04:00
Daniel_M_Williams
ea8066f63c Fixed GUI elements & function f/Boosters/Pods 
Model
  Refactored code from AxialStage, BoosterSet, PodSet => ComponentAssembly

GUI
  BoosterSet: Fixed bugs, allowed boosters and pods to be correctly located.
 2015-08-27 08:54:35 -04:00
Daniel_M_Williams
0c01123551 refactored Stages (Axial & Booster) now load correctly. 2015-08-25 22:38:13 -04:00
Daniel_M_Williams
c8a3d675d8 messy commit: refactored Stage => AxialStage, BoosterSet, PodSet 2015-08-25 09:57:23 -04:00
Daniel_M_Williams
c1c882eb00 cleaned up gui components in StageConfig 2015-08-24 10:53:50 -04:00
Daniel_M_Williams
29430218d5 Fixed example files, added descriptions 2015-08-24 10:52:43 -04:00
Daniel_M_Williams
d2793249a0 added example files for boosters and pods 2015-08-23 20:36:51 -04:00
Daniel_M_Williams
231fd1ffa5 Enforced minimum instance count of 2 for booster stages 2015-08-22 10:37:28 -04:00
Daniel_M_Williams
29ec764b61 fixed some visual display bugs improper auto-zoom. 2015-08-19 20:44:12 -04:00
Daniel_M_Williams
719db29a31 fixed shock-cord display 2015-08-14 18:04:09 -04:00
Daniel_M_Williams
1d879c2281 bugfix: motors now display correctly on clusters and booster clusters. 2015-08-14 12:12:18 -04:00
Daniel_M_Williams
0fbdc33188 Fixed numerous display bugs-- including stage placement, engine instancing. 2015-08-12 14:02:24 -04:00
Daniel_M_Williams
6f039a992b changing internal positioning back to top-top 2015-08-01 14:57:10 -04:00
Daniel_M_Williams
c1d9ff5d41 [Bugfix] Fins on Outside stages display correctly. 2015-07-25 11:45:10 -04:00
Daniel_M_Williams
b547084156 [cosmetic] deleted extra debug code, corrected indentation 2015-07-24 17:13:03 -04:00
Daniel_M_Williams
5f42a10c20 [Major Refactor] Parallel stages are children of centerline stages 2015-07-24 16:44:10 -04:00
Daniel_M_Williams
2f42594acb fixed many display issues relating to refactoring of RocketComponent axialOffset code. 2015-07-21 14:16:13 -04:00
Daniel_M_Williams
3b1de9c291 Gui now correctly initializes chosen relTo stage pulldown (minor) 2015-07-01 19:35:06 -04:00
Daniel_M_Williams
8755777924 implemented loading of stage parameters (and fixed stage xml writing 2015-07-01 19:20:19 -04:00
Daniel_M_Williams
177b24a667 implemented gui elements for locating a stage relative to another stage. 2015-06-30 17:57:14 -04:00
Daniel_M_Williams
d5de1cbac4 added save-to-ork code, removed stage rotation parameter. 2015-06-28 19:42:18 -04:00
Daniel_M_Williams
8b4c1c386b removed gui code for stage instance rotation. Meaning is ambiguous. 2015-06-27 16:57:49 -04:00
Daniel_M_Williams
2729c426b2 removed spurious debug println 2015-06-25 19:39:30 -04:00
Daniel_M_Williams
02cc32eb6e fixed more nosecone display issues 2015-06-25 19:31:36 -04:00
Daniel_M_Williams
df5b213d44 fixed conical nosecane display issue while instanced (i.e. off-axis) 2015-06-25 18:41:28 -04:00
Daniel_M_Williams
ee21c7ea0c parallel stage config: bugfixes and text correction. RelativeTo option still NYI 2015-06-25 17:34:25 -04:00
Daniel_M_Williams
0945961fc4 bugfix commits - fixed rearview display bug, implemented component.getPositionVector() 2015-06-25 17:12:27 -04:00
Daniel_M_Williams
56dec21824 [Large] Refactored RocketFigure drawing code to enable moving components by offset 2015-06-25 11:22:58 -04:00
Daniel_M_Williams
5e96288896 commented out dead code. private class FigureTypeAction is never used. 2015-06-23 13:13:44 -04:00
Daniel_M_Williams
6f4cba68ae refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints 2015-06-23 13:12:48 -04:00
Daniel_M_Williams
8e268a9a25 added gui and model elements for stage multiplicity 2015-06-22 16:10:13 -04:00
Daniel_M_Williams
c5d47cf806 implemented gui elements for controlling stage axial placement. + other Event refinements 2015-06-15 15:38:18 -04:00
Daniel_M_Williams
4f716b40af Updated GUI with axial stage position elements 2015-06-13 22:47:19 -04:00
Daniel_M_Williams
2cd5fe6306 removed pod code. This will be re-implemented later if appropriate. 2015-06-13 20:55:37 -04:00
Daniel_M_Williams
8371876718 ACTUAL bugfix commit: Stage Config dialog fixed. 2015-06-08 18:19:23 -04:00
Daniel_M_Williams
2a855ed2a4 bugfix -- stageconfig would not initialize with current values 2015-06-08 17:40:38 -04:00
Daniel_M_Williams
b8b1e6576e [GUI Options Implemented] Implemented GUI elements to change the position of external components. 
External Components are pods and parallel stages.  Slightly different UI options have been implemented for each.
 2015-06-03 15:48:13 -04:00
Daniel_M_Williams
7b6367b30b Bugfix: If configured wrong, booster stage recovery device would not deploy. This patch prevents the UI from showing those options. 2015-05-31 12:38:39 -04:00
kruland2607
e1cce52e3d Merge pull request #230 from kruland2607/feature-tubefins 
Feature tubefins
 2015-03-23 03:11:06 -05:00
kruland2607
37225b04e2 Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:06:57 -05:00
Daniel_M_Williams
b75d7e38c6 when using 'File > Save As..' dialog, this patch will update the filename extension directly within the dialog box, upon chanig the FileFilter type, in addition to after the dialog is accepted. 2015-01-20 13:39:26 -05:00
Sampo Niskanen
ab69cd9d3f Fix accidental change in swing/.classpath JRE definition 2015-01-10 18:57:20 +02:00
Sampo Niskanen
487da3a3fc Merge remote-tracking branch 'upstream/master' into feature/scripting 
Conflicts:
	swing/.settings/org.eclipse.jdt.core.prefs
 2015-01-10 18:44:55 +02:00
kruland2607
8f478f6eb7 Merge pull request #225 from enderw88/fin-fillets 
Fin fillets
 2015-01-09 21:37:00 -06:00
kruland2607
482f2b8462 Merge pull request #227 from kruland2607/upstreammaster 
Start using Java 1.7.
 2015-01-09 21:36:26 -06:00
kruland2607
9db83259dc Start using Java 1.7. 2015-01-09 21:33:16 -06:00