Skip to content

Commit

Permalink
Changes for 14.03 Release.
Browse files Browse the repository at this point in the history
  • Loading branch information
kruland2607 committed Mar 19, 2014
1 parent ddc04b0 commit ae36404
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 34 deletions.
10 changes: 10 additions & 0 deletions core/ReleaseNotes
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
OpenRocket 14.03 (2014-03-20):
------------------------------

New Features:
* Photo Realistic 3d rocket renderer

Bug Fixes:
* Fixes to the flight configuration tab and motor selection dialog
* Updated thrustcurves

OpenRocket 13.11.2 (2014-01-01):
------------------------------

Expand Down
2 changes: 1 addition & 1 deletion core/resources/build.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# The OpenRocket build version

build.version=13.11.2dev
build.version=14.03


# The source of the package. When building a package for a specific
Expand Down
Binary file modified core/resources/datafiles/thrustcurves/thrustcurves.ser
Binary file not shown.
21 changes: 18 additions & 3 deletions core/web/html/actions/updates.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,35 +80,50 @@ function getallheaders() {
$version = $_GET["version"];
$updates = "";

$unstable = "13.11.2";
$unstable = "14.03";
$stable = "1.0.0";


if (preg_match("/^13.11.1$/", $version)) {
if (preg_match("/^13.11.2$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"4: Bug fixes\n".
"";
} else if (preg_match("/^13.11.1$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"4: Bug fixes - Various fixes to motor selection\n".
"";
} else if (preg_match("/^13.11$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"4: Bug fixes - Tube Coupler configuration among other things\n".
"4: Bug fixes - Various fixes to motor selection\n".
"";
} else if (preg_match("/^13.09.1$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"6: Simplified flight configuration process\n" .
"4: New translations for Chinese\n" .
"4: Updated 3D libraries\n" .
"4: Bug fixes\n" .
"";
} else if (preg_match("/^13.09$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"6: New thrustcurves for Aerotech C3 and D2\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"4: Updated Translations to Russian\n" .
"4: Updated 3D libraries\n" .
"4: Bug fixes\n" .
"";
} else if (preg_match("/^13.05$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Realistic in flight 3D photo construction\n" .
"6: Updated thrustcurves\n".
"6: Simplified flight configuration process\n" .
"6: New thrustcurves for Aerotech C3 and D2\n" .
"4: New translations for Chinese\n" .
Expand Down
34 changes: 11 additions & 23 deletions core/web/html/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ <h1>Download OpenRocket</h1>
<div class="content">
<div class="news">
<h2>Recent news:</h2>
<p><span class="date">21.03.2014:</span> Version 14.03 is
<a href="download.html">released</a>! This release contains the
new photo realistic renderer (in the Tools menu) which allows one to visualize
the rocket in the air. There are various bug fixes in the configuration
and motor selection windows as well.
</p>
<p><span class="date">01.01.2014:</span> Version 13.11.2 is
<a href="download.html">released</a>! This release contains bug fixes,
usability improvements, and layout fixes.
Expand All @@ -63,24 +69,6 @@ <h2>Recent news:</h2>
tab. Motor filtering in the motor chooser dialog has been enhanced.
Chineese translations have been added and Russian translations updated.
Updated the 3D libraries, and squashed some bugs introduced by Java 1.7.0_45-b18.</p>
<p><span class="date">6.10.2013:</span> Version 13.09.1 is
<a href="download.html">released</a>! This is a bug-fix release,
and includes updated 3D libraries and new thrust curves for
Aerotech C3 and D2.</p>
<p><span class="date">8.9.2013:</span> Version 13.09 is
<a href="download.html">released</a>! This release contains
numerous bug fixes, updated 3D JOGL libraries, and separated
simulation edit and plot dialogs.</p>
<p><span class="date">4.5.2013:</span> Version 13.05 is
<a href="download.html">released</a>! This release contains a huge
number of improvements, the main ones including realistic 3D
rendering with decals, flight configurations, lower stage descent
simulation, boosted dart support and new translations for
Portuguese and Japanese. These are thanks to many
contributors.</p>
<p>Version 13.05 also changes the file format to be ZIP-based.
Versions earlier than 12.03 will not be able to read files saved
by this version.</p>
</div>
<div class="contentholder">
<h2>Ready packages</h2>
Expand All @@ -101,20 +89,20 @@ <h3>Desktop version</h3>
<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
</div>
<div class="downloadbox">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/13.11.2/OpenRocket-13.11.2.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/14.03/OpenRocket-14.03.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-13.11.2.jar</span>
<span>OpenRocket-14.03.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/13.11.2/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/13.11.2/OpenRocket-13.11.2-src.zip/download">Source code</a>
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.03/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.03/OpenRocket-14.03-src.zip/download">Source code</a>
</span>
</div>
<p>OpenRocket can be started in most graphical environments (including
Windows) by double-clicking the package icon. No installation is
required.</p>
<p>From the command line OpenRocket can be started by
<span class="command">java -jar OpenRocket-13.11.2.jar</span></p>
<span class="command">java -jar OpenRocket-14.03.jar</span></p>
<h3>Android version</h3>
<p>The Android version allows opening OpenRocket files, viewing
simulations and motors. Later versions will allow running
Expand Down
12 changes: 9 additions & 3 deletions core/web/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ <h1>OpenRocket &mdash; an Open Source model rocket simulator</h1>
<h2>Introduction</h2>
<div class="rightpane">
<div class="downloadbox">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/13.11.2/OpenRocket-13.11.2.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/14.03/OpenRocket-14.03.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-13.11.2.jar</span>
<span>OpenRocket-14.03.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/13.11.2/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.03/ReleaseNotes/view">Release notes</a> |
<a href="download.html">Other versions</a>
</span>
</div>
Expand Down Expand Up @@ -108,6 +108,12 @@ <h2>Introduction</h2>
<div class="clear"></div>
<div class="news">
<h2>News</h2>
<p><span class="date">21.03.2014:</span> Version 14.03 is
<a href="download.html">released</a>! This release contains the
new photo realistic renderer (in the Tools menu) which allows one to visualize
the rocket in the air. There are various bug fixes in the configuration
and motor selection windows as well.
</p>
<p><span class="date">01.01.2014:</span> Version 13.11.2 is
<a href="download.html">released</a>! This release contains bug fixes,
usability improvements, and layout fixes.
Expand Down
2 changes: 1 addition & 1 deletion core/web/htp/htp.def
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<set version="13.11.2">
<set version="14.03">
<set androidversion="12.09">

<def name="downloadbox">
Expand Down
13 changes: 10 additions & 3 deletions core/web/htp/news.htp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

<!--- Remember to move the position of "onlyrecent" below! --->

<p><span class="date">21.03.2014:</span> Version 14.03 is
<a href="download.html">released</a>! This release contains the
new photo realistic renderer (in the Tools menu) which allows one to visualize
the rocket in the air. There are various bug fixes in the configuration
and motor selection windows as well.
</p>

<p><span class="date">01.01.2014:</span> Version 13.11.2 is
<a href="download.html">released</a>! This release contains bug fixes,
usability improvements, and layout fixes.
Expand All @@ -27,6 +34,9 @@
Chineese translations have been added and Russian translations updated.
Updated the 3D libraries, and squashed some bugs introduced by Java 1.7.0_45-b18.</p>

<if not onlyrecent><!--- Older items not shown on download page: --->


<p><span class="date">6.10.2013:</span> Version 13.09.1 is
<a href="download.html">released</a>! This is a bug-fix release,
and includes updated 3D libraries and new thrust curves for
Expand All @@ -50,9 +60,6 @@
by this version.</p>


<if not onlyrecent><!--- Older items not shown on download page: --->


<p><span class="date">28.9.2012:</span> Version 12.09.1 is
<a href="download.html">released</a>! This is a bug-fix release,
fixing numerous bugs introduced in 12.09. The only new feature is
Expand Down
Binary file modified swing/resources/datafiles/presets/system.ser
Binary file not shown.

0 comments on commit ae36404

Please sign in to comment.