Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / ChangeLog

diff --git a/core/ChangeLog b/core/ChangeLog
index d5b3de39c60d85dfa53d9c46ce1ff47713a5f2c8..7f0fa6f74761b491245fee72af141e047ccff011 100644 (file)
--- a/core/ChangeLog
+++ b/core/ChangeLog
@@ -1,6 +1,36 @@
+2012-08-28 Bill Kuker
+
+   * Removed late GL initialization, was causing issues with Java 7.
+   
+   * Added -Dopenrocket.3d.disable option for anyone experiencing crashes as a result of OpenGL.
+
+2012-08-01 Kevin Ruland
+
+   * Changed the loader to pull *.rkt files from zip containers.
+   
+   * Modified the BasicFrame so it doesn't automatically open the Rocket configuration dialog when opening a new rocket.
+   
+   * Unified the behavior for replacing (automatically closing) the base frame when opening a file, loading an example,
+   or picking from the Most-recently-used list.
+
+2012-06-24  Bill Kuker
+
+    * OSX UI Elements: Screen menu bar, Application name, Dock Icon, Quit, About & Preference
+    handlers. Stubs for the "Apple Java Extensions" to allow other platforms to compile provided
+    by https://github.com/ymasory/OrangeExtensions.
+
+2012-06-11  Bill Kuker
+
+    * Added a 3D view of the rocket to the figure panel.
+    
+2012-06-05  Doug Pedrick
+
+    * Most recently used design files added to File menu.
+
 2012-05-23  Doug Pedrick
 
     * Centering ring templates can now be chosen for printing.
+    * Calibration ruler added to printed templates.
 
 2012-05-09  Kevin Ruland