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

631 Commits

Author SHA1 Message Date
Alexander Allen
107d987973 Implemented CD Override 2017-09-20 21:45:26 -04:00
Daniel_M_Williams
f1c9ebb25f [refactor] Merged configuration tabs for boosters and pods into the 'ComponentAssemblyConfig' class 2017-09-02 11:09:37 -04:00
ChrisMickelson
3997d08a45 update splashscreen 2017-06-05 01:40:42 -04:00
Matt Kendall
3642398b1a Remove opaque background from Tube Fin Component Icon 2016-11-05 23:55:31 +00:00
Kevin Ruland
6532743c3f Revising previous commit to include the missing files. 2016-10-10 19:50:17 -05:00
Kevin Ruland
f121def910 Significantly modified management of motor information provided by 
OpenRocket.  At build time, it will utilize the Thrustcurve.org xml api
to download the current information (curve files and supplemental
information).  OpenRocket uses the supplemental information to populate
case-info, propellant type, availability as well as correct diameters
and length. Modified motor search dialog to hide unavailable motors and
show case-info.
 2016-10-10 17:27:25 -05:00
Daniel_M_Williams
a6990dddc5 [Bugfix] Fixed additional Translation, Configuration Issues 
- Fixed translation messages
   - FlightConfiguration, MotorConfiguration
   - correctly display under debug & production
- Fixed exception throw when adding empty-MotorConfiguration to a FlightConfig
 2016-05-20 18:46:47 -04:00
Daniel_M_Williams
2ee7464038 [Bugfix] FlightConfiguration now uses i8n for its empty-motors description 2016-04-27 21:36:31 -04:00
Kevin Ruland
4b4a7c74fc Merge remote-tracking branch 'upstream/master' into unstable 
Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
 2016-04-02 16:49:15 -05:00
kruland2607
512f572879 Merge pull request #259 from wcravens/mass-info-both-with-and-without-motor 
Mass info both with and without motor - Includes IntelliJ CE Configuration files
 2016-03-24 17:36:30 -05:00
Wes Cravens
74d636bf33 Add concurrent mass info for both with and without motor configuration 2016-03-23 13:23:40 -05:00
Daniel_M_Williams
1226666a41 added missing (default) translation string 2016-01-17 13:05:24 -05:00
Daniel_M_Williams
0979cff505 fixed bugs in the Photo Renderer 2015-12-23 23:17:59 -05:00
Kevin Ruland
4c56c53135 Added CaseInfo enum and compatible case information to 
MotorInformationPanl.
 2015-12-13 10:58:47 -06:00
Daniel_M_Williams
238726f371 Merge branch 'master' of https://github.com/openrocket/openrocket into parallel_staging 
Conflicts:
	swing/src/net/sf/openrocket/gui/main/BasicFrame.java (resolved)
 2015-12-12 11:14:13 -05:00
Kevin Ruland
b415238a02 Changed Motor to support additional fields case info, prop info, and 
availability flag provided by Thrustcurve.org.  Change serialization
process to pull current files from Thrustcurve.org using the xml api,
use the corrected data for diameter and length, and use a consistent
motor designation.  Added fields to the Motor chooser - case info is a
column in the listing (replacing MotorType), the other info is in the
motor details tab.  Added toggle to hide motors which are OOP.
 2015-12-07 22:27:05 -06:00
Daniel_M_Williams
657c407ba5 [UI] fixed RailButton UI, file I/O 2015-11-23 23:54:07 -05:00
Daniel_M_Williams
1ce452265c [Feature] Implemented RailButton Shapes (2D only) 
RailButtons loaded, edited, and displayed (in 2d, and 3d)
 2015-11-23 14:40:57 -05:00
Daniel_M_Williams
82e3a7ff1c [Feature] Implemented more RailButton code: 
RailButtons can be loaded, and edited, but not really displayed.
    - data entry has defined file parameters, but needs some debugging.
    - added icons for component creation.  The button just needs to be uncommented
    - display works, but only for rotation = 0;
       - requires a new type of shape drawing.  Not inherently hard, just tedious.
 2015-11-22 22:28:51 -05:00
Kevin Ruland
4924773c3a Changed to using Import/Export file menu functions to handle RockSim 
formatted files.  Save & Save As will only save in ork format.
 2015-11-21 21:37:57 -06:00
Daniel_M_Williams
2501bc2b8f [Bugfix] Enabled auto-positioning of parallel stages 
AutoRadialOffset is a boolean flag on parallel stages
    - when enabled, the radialOffset is automatically
    - auto radius is based on the max radius of contained components
 2015-11-21 10:02:16 -05:00
Daniel_M_Williams
4e8838aa4c Merge branch 'master' of https://github.com/openrocket/openrocket into child_staging 2015-11-14 11:23:48 -05:00
Kevin Ruland
e8167ac159 Added message properties and prefs for showing warning dialogs. 
Restored auto-open last design preference.
 2015-10-28 06:27:55 -05:00
Harry Dalton
39ec03370d Adding missing Spanish translation` 
(thanks to Carlos)
 2015-10-08 12:14:12 +01:00
Daniel_M_Williams
0a55f59548 [Minor] Harmonized interface for instanceable components 
Implemented 'Instanceable' Interface
    - MotorMount implements instanceable
        - BodyTube
        - Innertube
    -RingInstance interface
        - BoosterSet
        - PodSet
    -LineInstanceable interface [This feature is not exposed in UI)
        - LaunchLug
        - LaunchButton (Stub only, ATT)
        - RingComponent (abstract ancestor class)
-Reverted MotorMount Function names to "[is|set]MotorMount"
 2015-10-06 12:02:57 -04:00
Daniel_M_Williams
a6be346c8d Fixed Load/Save Issues for Boosters and Pods 
Fixed hiearchy / naming issues, mostly
    mv StageSaver.java => AxialStageSaver.java
    populate ComponentAssemblySaver.java
    fixed method class refs in DocumentConfig.java
 2015-08-27 11:52:31 -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
2f42594acb fixed many display issues relating to refactoring of RocketComponent axialOffset code. 2015-07-21 14:16:13 -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
8371876718 ACTUAL bugfix commit: Stage Config dialog fixed. 2015-06-08 18:19:23 -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
celeron533
1c42de5540 Update zh_CN translation 
Update zh_CN translation file
 2015-03-28 18:03:56 +08:00
kruland2607
25a2279073 Change to dev. 2015-03-26 08:01:05 -05:00
kruland2607
b15afb3709 Changing release version back to 15.03 to get the tag in the correct place. 2015-03-26 08:00:10 -05:00
kruland2607
a631f39483 Prepare for 15.03dev 2015-03-26 06:57:13 -05:00
kruland2607
f3440bac68 Merge branch 'master' of https://github.com/openrocket/openrocket 
Conflicts:
	core/fileformat.txt
 2015-03-26 06:52:22 -05:00
kruland2607
e6ba1e349c Updated documentation for 15.03. 2015-03-26 06:49:54 -05:00
kruland2607
13dc5289ff Updated thrustcurves. 2015-03-23 07:02:10 -05:00
kruland2607
37225b04e2 Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:06:57 -05: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
Sampo Niskanen
bf71296794 Merge remote-tracking branch 'upstream/master' into feature/scripting 
Conflicts:
	swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
 2015-01-07 18:03:57 +02:00
Sampo Niskanen
0eef08ae41 Fine-tune UI 2015-01-07 17:37:14 +02:00
Sampo Niskanen
78d282f56f Add possibility to copy simulation extensions from other simulations 2015-01-07 17:13:41 +02:00
Sampo Niskanen
a1f6782195 Disable untrusted scripts on loading files 2015-01-06 19:25:13 +02:00
Craig Earls
bc28fc58c5 Fin fillet UI complete, radius and material are saved to file and reloaded. 2014-12-27 20:11:09 -08:00