diff --git a/core/ReleaseNotes b/core/ReleaseNotes index b56b907e8d..bf888cfa81 100644 --- a/core/ReleaseNotes +++ b/core/ReleaseNotes @@ -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): ------------------------------ diff --git a/core/resources/build.properties b/core/resources/build.properties index 3b14a42019..086e229374 100644 --- a/core/resources/build.properties +++ b/core/resources/build.properties @@ -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 diff --git a/core/resources/datafiles/thrustcurves/thrustcurves.ser b/core/resources/datafiles/thrustcurves/thrustcurves.ser index e222292a51..0e09054181 100644 Binary files a/core/resources/datafiles/thrustcurves/thrustcurves.ser and b/core/resources/datafiles/thrustcurves/thrustcurves.ser differ diff --git a/core/web/html/actions/updates.php b/core/web/html/actions/updates.php index 94d57bdc61..ddbde52283 100644 --- a/core/web/html/actions/updates.php +++ b/core/web/html/actions/updates.php @@ -80,21 +80,33 @@ 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" . @@ -102,13 +114,16 @@ function getallheaders() { ""; } 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" . diff --git a/core/web/html/download.html b/core/web/html/download.html index 39c3a72a33..42a9bbe5a3 100644 --- a/core/web/html/download.html +++ b/core/web/html/download.html @@ -48,6 +48,12 @@

Download OpenRocket

Recent news:

+

21.03.2014: Version 14.03 is + released! 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. +

01.01.2014: Version 13.11.2 is released! This release contains bug fixes, usability improvements, and layout fixes. @@ -63,24 +69,6 @@

Recent news:

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.

-

6.10.2013: Version 13.09.1 is - released! This is a bug-fix release, - and includes updated 3D libraries and new thrust curves for - Aerotech C3 and D2.

-

8.9.2013: Version 13.09 is - released! This release contains - numerous bug fixes, updated 3D JOGL libraries, and separated - simulation edit and plot dialogs.

-

4.5.2013: Version 13.05 is - released! 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.

-

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.

Ready packages

@@ -101,20 +89,20 @@

Desktop version

Support This Project
- + Download now! - OpenRocket-13.11.2.jar + OpenRocket-14.03.jar - Release notes | - Source code + Release notes | + Source code

OpenRocket can be started in most graphical environments (including Windows) by double-clicking the package icon. No installation is required.

From the command line OpenRocket can be started by - java -jar OpenRocket-13.11.2.jar

+ java -jar OpenRocket-14.03.jar

Android version

The Android version allows opening OpenRocket files, viewing simulations and motors. Later versions will allow running diff --git a/core/web/html/index.html b/core/web/html/index.html index 5906022f9c..707cae586c 100644 --- a/core/web/html/index.html +++ b/core/web/html/index.html @@ -49,12 +49,12 @@

OpenRocket — an Open Source model rocket simulator

Introduction

@@ -108,6 +108,12 @@

Introduction

News

+

21.03.2014: Version 14.03 is + released! 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. +

01.01.2014: Version 13.11.2 is released! This release contains bug fixes, usability improvements, and layout fixes. diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def index a738a918f0..1554a5a824 100644 --- a/core/web/htp/htp.def +++ b/core/web/htp/htp.def @@ -1,4 +1,4 @@ - + diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp index 3f3cd529f9..edaea51d36 100644 --- a/core/web/htp/news.htp +++ b/core/web/htp/news.htp @@ -9,6 +9,13 @@ +

21.03.2014: Version 14.03 is + released! 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. +

+

01.01.2014: Version 13.11.2 is released! This release contains bug fixes, usability improvements, and layout fixes. @@ -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.

+ + +

6.10.2013: Version 13.09.1 is released! This is a bug-fix release, and includes updated 3D libraries and new thrust curves for @@ -50,9 +60,6 @@ by this version.

- - -

28.9.2012: Version 12.09.1 is released! This is a bug-fix release, fixing numerous bugs introduced in 12.09. The only new feature is diff --git a/swing/resources/datafiles/presets/system.ser b/swing/resources/datafiles/presets/system.ser index d7763e66fe..404e4735ad 100644 Binary files a/swing/resources/datafiles/presets/system.ser and b/swing/resources/datafiles/presets/system.ser differ