diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj
index 9c895b1..bf7bc3b 100644
--- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj
+++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj
@@ -6,7 +6,7 @@
3.7
{c8096c47-e358-438c-a520-146d46b0637d}
2.0
- Fractorium_Beta_0.9.9.5
+ Fractorium_Beta_0.9.9.6
Package
$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets
$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets
diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs
index 910442f..07bcc09 100644
--- a/Builds/MSVC/Installer/Product.wxs
+++ b/Builds/MSVC/Installer/Product.wxs
@@ -1,6 +1,6 @@
-
+
@@ -13,7 +13,7 @@
-
+
.
+ -Make a lot more functions const where they should be.
+ -Remove save back to file in memory icon, document-hf-insert.png.
+ -Use raw array of floats in OpenCL for perlin noise, rather than float3/double3.
+ -Add some default cases to dc_perlin.
+ -Redo singleton pattern yet again.
+ -Pass XML_PARSE_HUGE to xmlReadMemory() to allow for reading large Xml files.
+ -Optimize Interpolater by making it a non-static class by adding some members used for caching values during interpolation.
+ -Cache values in SheepTools as well, which was already a non-static class.
+ -Use cerr in SheepTools instead of cout.
+ -Set m_SubBatchSize and m_FuseCount to default values in Ember::Clear().
+ -Make EmberOptionEntry::operator() return a const reference instead of a copy.
+ -General cleanup.
+
+b5341c7
+0.9.9.5 Beta 03/04/2016
--User changes
-None.
@@ -30,7 +131,7 @@
-Make CircleTrans1 a little safer by calling Zeps() on m_Sc during precalc.
-Major work on Qt Creator builds.
-0.9.9.4 02/21/2016
+0.9.9.4 Beta 02/21/2016
--User changes
-Allow for stopping the renderer in the main window. This makes it more efficient when entering many parameters, such as when following a tutorial.
-Add support for new variations: erf, gamma, jac_cn, jac_dn, jac_sn, logDB, pressure_wave, pRose3D, splits3D, w, waves2b, x, xerf, y, z.
@@ -97,7 +198,7 @@
-Cleanup warnings.
-General cleanup.
-0.9.9.3 01/17/2016
+0.9.9.3 Beta 01/17/2016
--User changes
-Add new variations: crackle, dc_perlin and post_smartcrop.
-Make default palette interp mode be linear instead of step.
@@ -146,7 +247,7 @@
-Replace fabs() with std::abs().
-General cleanup.
-0.9.9.2 11/22/2015
+0.9.9.2 Beta 11/22/2015
--User changes
-Add a new dialog for editing QSS stylesheets. Allow for saving, reloading and setting styles as default.
-Include a dark style with the installation called dark.qss.
diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h
index cc8cc69..ae9ba3d 100644
--- a/Source/Ember/EmberDefines.h
+++ b/Source/Ember/EmberDefines.h
@@ -40,7 +40,7 @@ static void sincos(float x, float* s, float* c)
namespace EmberNs
{
-#define EMBER_VERSION "0.9.9.5"
+#define EMBER_VERSION "0.9.9.6"
#define EPS6 T(1e-6)
#define EPS std::numeric_limits::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
#define ISAAC_SIZE 4
diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui
index ea1916e..f99aa03 100644
--- a/Source/Fractorium/AboutDialog.ui
+++ b/Source/Fractorium/AboutDialog.ui
@@ -58,7 +58,7 @@
QFrame::NoFrame
- <html><head/><body><p align="center"><br/>Fractorium 0.9.9.5 Beta</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html>
+ <html><head/><body><p align="center"><br/>Fractorium 0.9.9.6 Beta</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html>
Qt::RichText