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

205 Commits

Author SHA1 Message Date
celeron533
78842ea283 Refine Simplified Chinese Translation 
- Restructure the zh-cn .properties file to sync the lines from the English one.
- Add missing translations and amend several existing items.
- Add my name to the AboutDialog which I forgot for years...
- Update the Copyright info to year 2017.
 2017-01-24 22:19:58 +08:00
ChrisMickelson
c0597e71a2 Add transparent render capability to RealisticRenderer.java 
Current limitations: Alpha value does not seem to be saved in .ork file, Depends on color chooser having alpha capability. Does not show up as transparent in "3D Unfinished"
 2016-06-09 13:45:20 -04: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
1c4bf57a0c Fix massWithoutMotors: Put back changes lost while tinkering with IntelliJ 2016-03-23 21:34:52 -05:00
Wes Cravens
9ffcad37c8 Merge branch 'mass-info-both-with-and-without-motor' into intellij-ce-settings 2016-03-23 21:26:50 -05:00
Wes Cravens
e2efefb296 IntelliJ CE integration and build 2016-03-23 17:15:26 -05:00
Wes Cravens
74d636bf33 Add concurrent mass info for both with and without motor configuration 2016-03-23 13:23:40 -05:00
Kevin Ruland
0caaf04e06 File Chooser object for save as. 2015-11-22 06:22:12 -06: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
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
Kevin Ruland
cec7005e56 Work around reported bug concerning TimSort and comparators violating 
contract.
 2015-09-12 06:37:06 -05: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
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
c2f44f97f6 Update example design of simulation extensions 2015-01-07 17:59:43 +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
Sampo Niskanen
a39a3fce15 Add support for multiple scripting languages 2014-12-27 23:50:54 +02:00
Sampo Niskanen
eb5321e82c Add script editor highlighting using RSyntaxTextArea 2014-12-27 20:20:32 +02:00
Sampo Niskanen
a2c0af3b7f Initial implementation of scripting extension 2014-12-27 19:18:53 +02:00
kruland2607
90480faa24 Merge pull request #219 from enderw88/set-color-defaults-in-options 
Rearrange preferences and add simulation and launch condition preferences
 2014-12-26 14:01:46 -06:00
Craig Earls
1f84c89006 Adjusted alignment of time step controls. 2014-12-26 10:33:56 -08:00
Craig Earls
7d95a36907 Moved wind direction below wind turbulence intensity. 2014-12-25 23:09:23 -08:00
Craig Earls
5c791eadad Added component tree icons for the new mass types. 2014-12-24 21:39:31 -08:00
Craig Earls
ba2590ee04 Removed display tab for now. Preference reorganization complete. 2014-12-24 18:07:13 -08:00
Craig Earls
ff2f68962c Finished simulation preferences panel. 2014-12-24 17:23:32 -08:00
Craig Earls
5cc403368e Split all panels, implement new launch preferences panel. 2014-12-24 15:43:12 -08:00
Craig Earls
f4fc41e506 Rearranged preferences tabs, added default custom Mach number, 2014-12-24 00:36:57 -08:00
Craig Earls
b8999349a9 Merge branch 'master' into set-color-defaults-in-options 2014-12-23 19:48:12 -08:00
Sampo Niskanen
7aca75f053 Implement launch velocity into AirStart extension 2014-12-23 23:49:37 +02:00
Sampo Niskanen
82af205e3e Merge remote-tracking branch 'upstream/master' into feature/simulationextensions 
Conflicts:
	core/src/net/sf/openrocket/simulation/SimulationStatus.java
 2014-12-23 21:01:48 +02:00
Craig Earls
45ba0e3bb0 Added additional panel for color defaults 2014-12-22 19:39:17 -08:00
Craig Earls
0d829c1c6b Wind and Launch rod decoupled. Initial UI complete 2014-12-21 20:56:15 -07:00
Craig Earls
b96277afa0 Launch rod is now 0 North and decoupled from wind direction. 2014-12-21 20:05:57 -07:00
Craig Earls
d07b2f6802 Merge branch 'master' into set-color-defaults-in-options 2014-12-21 19:02:58 -07:00
Craig Earls
5e9eca3715 Merge branch 'master' into Configure-wind-direction 2014-12-21 19:00:30 -07:00
kruland2607
ea07f91f5e Merge remote-tracking branch 'cearls/Auto-run-simulations' 
Conflicts:
	swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java

Manually resolved.
 2014-12-21 19:32:27 -06:00
Craig Earls
185f7f7528 Merge branch 'master' into set-color-defaults-in-options 2014-12-21 15:52:31 -07:00
Craig Earls
a6f00ccaba Merge branch 'master' into Configure-wind-direction 2014-12-21 15:34:39 -07:00
kruland2607
eaa6c32918 Merge pull request #216 from enderw88/Configure-design-window-font-size 
RocketInfo font size now configurable in options.
 2014-12-21 15:39:32 -06:00
Craig Earls
4ed373b07a Changed startup class to OpenRocket 2014-12-21 11:51:18 -07:00