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

1835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Ruland
17540d160c Oops forgot the webservice. 2015-12-07 22:29:51 -06: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
kruland2607
00d7e8715d Merge pull request #251 from kruland2607/save-dialogs 
Save dialogs
 2015-11-30 18:57:59 -06: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
kruland2607
f5786d8d90 Merge pull request #248 from Hoolean/master 
Adding missing Spanish translation
 2015-10-27 05:39:15 -05:00
Harry Dalton
39ec03370d Adding missing Spanish translation` 
(thanks to Carlos)
 2015-10-08 12:14:12 +01:00
kruland2607
1b27bad5d7 Merge pull request #240 from wcravens/markdown-release-notes 
Markdown release notes
 2015-09-26 08:27:52 -05:00
Wes Cravens
a208f46458 Placate finicky markdown renderers for Release Notes 2015-09-19 08:29:31 -05:00
Wes Cravens
5b7671cfd1 Remove trailing : from release headers - close #239 2015-09-19 08:17:44 -05:00
Wes Cravens
25d09cdc10 Add md file extension to ReleaseNotes 2015-09-19 08:13:43 -05:00
Wes Cravens
97901fd97f Switch to markdown heading and bullet lists in ReleaseNotes 2015-09-19 08:12:50 -05:00
kruland2607
9c911add2c Merge pull request #237 from kruland2607/master 
Work around bug in java's TimSort
 2015-09-12 08:58:22 -05:00
Kevin Ruland
cec7005e56 Work around reported bug concerning TimSort and comparators violating 
contract.
 2015-09-12 06:37:06 -05:00
Kevin Ruland
9493207e2b Merge remote-tracking branch 'upstream/master' 2015-09-11 17:00:08 -05:00
kruland2607
116d370447 Merge pull request #234 from teyrana/master 
Bugfix:  If configured wrong, booster stage recovery device would not deploy.
 2015-06-07 13:56:53 -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
cd3a149929 Merge pull request #232 from celeron533/master 
Update zh_CN translation
 2015-03-29 16:06:53 -05:00
kruland2607
30f716ede0 Merge pull request #233 from rodinia814/master 
Added support for Rocksim Tube Fin Set file elements (import and export)...
 2015-03-29 16:06:12 -05:00
Doug Pedrick
f1cf8c88bd Added support for Rocksim Tube Fin Set file elements (import and export). 2015-03-29 11:56:15 -05:00
celeron533
1c42de5540 Update zh_CN translation 
Update zh_CN translation file
 2015-03-28 18:03:56 +08:00
kruland2607
3d64b58144 Fix release number. 2015-03-27 18:39:44 -05: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
204e3e9159 Update documentation for 15.03. 2015-03-26 07:51:38 -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
release-15.03 		2015-03-26 06:52:22 -05:00
kruland2607
e6ba1e349c Updated documentation for 15.03. 2015-03-26 06:49:54 -05:00
kruland2607
3ed9a02356 Merge pull request #231 from openrocket/upstream-master 
Updated thrustcurves.
 2015-03-23 07:05:29 -05:00
kruland2607
13dc5289ff Updated thrustcurves. 2015-03-23 07:02:10 -05:00
kruland2607
e1cce52e3d Merge pull request #230 from kruland2607/feature-tubefins 
Feature tubefins
 2015-03-23 03:11:06 -05:00
kruland2607
87f328235f Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:17:08 -05:00
kruland2607
37225b04e2 Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:06:57 -05:00
plaa
77481d6612 Merge pull request #229 from plaa/feature/scripting 
Remove accidental debugging code
 2015-01-27 23:06:36 +02:00
Sampo Niskanen
13b2a37785 Remove debugging code 2015-01-27 23:01:10 +02:00
kruland2607
c51f51674f Merge pull request #228 from teyrana/master 
When using 'File > Save As..' dialog, update filename directly. (Minor patch)
 2015-01-21 07:00:53 -06: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
kruland2607
073c868a1e Merge pull request #226 from plaa/feature/scripting 
Feature/scripting
 2015-01-10 14:29:11 -06: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
Sampo Niskanen
45c41537ed Check that scripting engine supports Invocable before casting 2015-01-10 18:38:47 +02:00
Sampo Niskanen
8c00dbf159 Add unit tests for file version 1.7 (simulation extensions) 2015-01-10 18:36:24 +02:00
Sampo Niskanen
a6c2092379 Move TestScriptingUtil to test/ directory 2015-01-10 17:50:11 +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
31570a7a3b Presume a release to be made in 15.01 2015-01-09 18:59:45 +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
c2f44f97f6 Update example design of simulation extensions 2015-01-07 17:59:43 +02:00