Skip to content

Commit

Permalink
updates to make the 14.06 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
kruland2607 committed Jun 25, 2014
1 parent c49896f commit 3859528
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 13 deletions.
5 changes: 4 additions & 1 deletion core/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
2013-05-21 Kevin Ruland
2014-06-26 Kevin Ruland
* Released version 14.06 See Release Notes for changes.

2014-05-21 Kevin Ruland
* Released version 14.05 See Release Notes for changes.

2013-11-07 Kevin Ruland
Expand Down
11 changes: 11 additions & 0 deletions core/ReleaseNotes
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
OpenRocket 14.06 (2014-06-25):
------------------------------

New Features:
* Klima motor textures
* Added knots to windspeed and velocity units
* Updated thrustcurves

Bug Fixes:
* Fixed annoying IndexOutOfBounds bug in tables.

OpenRocket 14.05 (2014-05-21):
------------------------------

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=14.05dev
build.version=14.06


# The source of the package. When building a package for a specific
Expand Down
11 changes: 9 additions & 2 deletions core/web/html/actions/updates.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,18 @@ function getallheaders() {
$version = $_GET["version"];
$updates = "";

$unstable = "14.05";
$unstable = "14.06";
$stable = "1.0.0";


if (preg_match("/^14.03$/", $version)) {
if (preg_match("/^14.05$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Added Knots to windspeed and velocity units\n" .
"6: Updated thrustcurves\n" .
"4: Added Klima motor texture\n" .
"4: Fixed annoying table bug\n" .
"";
} else if (preg_match("/^14.03$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Simulations will now compute the optimum delay for the sustainer\n" .
"10: CG and Mass overrides are now indicated in the component tree\n" .
Expand Down
13 changes: 8 additions & 5 deletions core/web/html/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ <h1>Download OpenRocket</h1>
<div class="content">
<div class="news">
<h2>Recent news:</h2>
<p><span class="date">25.06.2014:</span> Version 14.06 is
<a href="download.html">released</a>! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
</p>
<p><span class="date">21.05.2014:</span> Version 14.05 is
<a href="download.html">released</a>! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern
Expand Down Expand Up @@ -96,20 +99,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/14.05/OpenRocket-14.05.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/14.06/OpenRocket-14.06.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-14.05.jar</span>
<span>OpenRocket-14.06.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.05/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.05/OpenRocket-14.05-src.zip/download">Source code</a>
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.06/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.06/OpenRocket-14.06-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-14.05.jar</span></p>
<span class="command">java -jar OpenRocket-14.06.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
9 changes: 6 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/14.05/OpenRocket-14.05.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/14.06/OpenRocket-14.06.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-14.05.jar</span>
<span>OpenRocket-14.06.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.05/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/14.06/ReleaseNotes/view">Release notes</a> |
<a href="download.html">Other versions</a>
</span>
</div>
Expand Down Expand Up @@ -108,6 +108,9 @@ <h2>Introduction</h2>
<div class="clear"></div>
<div class="news">
<h2>News</h2>
<p><span class="date">25.06.2014:</span> Version 14.06 is
<a href="download.html">released</a>! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
</p>
<p><span class="date">21.05.2014:</span> Version 14.05 is
<a href="download.html">released</a>! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern
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="14.05">
<set version="14.06">
<set androidversion="12.09">

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

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

<p><span class="date">25.06.2014:</span> Version 14.06 is
<a href="download.html">released</a>! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
</p>

<p><span class="date">21.05.2014:</span> Version 14.05 is
<a href="download.html">released</a>! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern
Expand Down

0 comments on commit 3859528

Please sign in to comment.