Updated version number and CHANGELOG for possible 0.6.1 release

4 files changed, 21 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4262317..383c5e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.6.1
+-----
+*Bugfixes*
+
+ - Fixed build script so controller images are actually included so UI doesn't crash
+ - Disabled most bindings when UI active (fixes crashes/wonkiness when pressing certain keys)
+ - Fixed Windows implementation of get_config_dir() so config file ends up in %localappdata%\blastem like it should
+ - Fixed the location of sticky_path on all platforms
+ - Added virtual root directory used by ROM UI to new Nuklear UI
+
 0.6.0
 -----
 *New Features*
@@ -15,6 +25,7 @@
 *Bugfixes*
 
  - Fixed a number of 68K decoder bugs (mostly illegal instruction decoding)
+ - Fixed implementation of the UNLK instruction when register is a7
  - Fixed a number of memory leaks
  
  *Accuracy/Completeness Improvements*
@@ -23,6 +34,13 @@
  - Implemented Z80 interrupt mode 2
  - Fixed the timing of a number of 68K instructions
  - Fixed the timing of the Z80 JP cc, nn instruction
+ - Fixed the order bytes of a word are written to VRAM from the FIFO (fixes minor corruption in Road Rash 3 bike menu)
+ 
+*Other Changes*
+ - Added support for Open GL ES in addition to the existing desktop GL support
+ - Some small optimizations
+ - Added ROM DB entry for Squirrel King to support it's copy protection
+ - Added support for float32 audio output (fixes an issue with defautl SDL2 driver in Windows when using more recent SDL2 versions)
  
 0.5.1
 -----
diff --git a/blastem.c b/blastem.c
index 7b27390..37ac3e3 100644
--- a/blastem.c
+++ b/blastem.c
@@ -30,7 +30,7 @@
 #include "nuklear_ui/blastem_nuklear.h"
 #endif
 
-#define BLASTEM_VERSION "0.6.0"
+#define BLASTEM_VERSION "0.6.1"
 
 #ifdef __ANDROID__
 #define FULLSCREEN_DEFAULT 1
diff --git a/menu.s68 b/menu.s68
index 0553862..d50a515 100644
--- a/menu.s68
+++ b/menu.s68
@@ -1251,7 +1251,7 @@ prev_str:
 	dc.b "Prev", 0
 	
 about_text:
-	dc.b "BlastEm v0.6.0", 0
+	dc.b "BlastEm v0.6.1", 0
 	dc.b "Copyright 2011-2017 Michael Pavone", 0
 	dc.b " ", 0
 	dc.b "BlastEm is a high performance, open", 0
diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c
index 57dd0af..87ebefa 100644
--- a/nuklear_ui/blastem_nuklear.c
+++ b/nuklear_ui/blastem_nuklear.c
@@ -160,7 +160,7 @@ void view_lock_on(struct nk_context *context)
 void view_about(struct nk_context *context)
 {
 	const char *lines[] = {
-		"BlastEm v0.6.0",
+		"BlastEm v0.6.1",
 		"Copyright 2012-2017 Michael Pavone",
 		"",
 		"BlastEm is a high performance open source",