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

1853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luiz Victor Linhares Rocha
ecb467db36 fixes little bug found at github build and adds a little more docs 2016-10-13 15:42:08 -03:00
Luiz Victor Linhares Rocha
c9dadc10fa adds documentation to aerodynmics package and some refactoring of classes 2016-10-13 15:04:03 -03:00
kruland2607
aeb2a3cd97 Merge pull request #286 from Vicilu/addDoxy2 
adds doxyfile for doxygen documentation
 2016-10-10 17:27:46 -05:00
Luiz Victor Linhares Rocha
e05062e389 adds doxyfile for doxygen documentation 2016-10-10 18:02:48 -03:00
kruland2607
d837bbbe22 Merge pull request #279 from Vicilu/viciluChange 
fixes tests giving false negative for comma decimal locale
 2016-09-28 14:25:09 -05:00
Luiz Victor Linhares Rocha
a126d76e3a fixes false negative tests for comma decimal locale 2016-09-28 00:06:17 -03:00
kruland2607
a32d22a0f2 Merge pull request #271 from ChrisMickelson/master 
Add transparent render capability to RealisticRenderer.java
 2016-09-15 16:52:26 -05:00
ChrisMickelson
aa4f94be9f Merge pull request #1 from ChrisMickelson/ChrisMickelson-transparent-render 
Add transparent render capability to RealisticRenderer.java
 2016-06-09 13:48:10 -04: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
d565a776be Merge pull request #265 from wcravens/update-jetbrains-misc-file 
Update IntelliJ misc.xml file
 2016-03-30 10:03:26 -05:00
Wes Cravens
099fb04c4f Update IntelliJ misc file (probably due to a version upgrade) 2016-03-25 19:15:35 -05:00
Wes Cravens
95a0b41d23 Merge branch 'master' of github.com:openrocket/openrocket 2016-03-25 19:10:36 -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
d2d453a953 Merge branch 'intellij-ce-settings' into mass-info-both-with-and-without-motor 2016-03-23 21:35:08 -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
2d5dfc0909 Some random IntelliJ config it decided to save 2016-03-23 21:34:07 -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
b8c5604433 Add SerializeMotors run configuration 2016-03-23 21:26:16 -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
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