version 1.0.1

mvdevs · Aug 11, 2015 · 680908e · 680908e
1 parent fb19ec4
commit 680908e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,9 +22,10 @@ project(${ProjectName})
 
 set(MV_MAJOR_VERSION 1)
 set(MV_MINOR_VERSION 0)
+set(MV_PATCH_VERSION 1)
 set(MV_EXT_VERSION "")
-set(MV_ECMP_VERSION 6) # increasing number to detect new version without parsing stuff like 1.0b1
-set(MV_VERSION "${MV_MAJOR_VERSION}.${MV_MINOR_VERSION}${MV_EXT_VERSION}")
+set(MV_ECMP_VERSION 7) # increasing number to detect new version without parsing stuff like 1.0b1
+set(MV_VERSION "${MV_MAJOR_VERSION}.${MV_MINOR_VERSION}.${MV_PATCH_VERSION}${MV_EXT_VERSION}")
 
 # Languages
 if(WIN32)

diff --git a/changelog.txt b/changelog.txt
@@ -3,6 +3,16 @@ JK2MV changelog
 Website: http://jk2mv.org
 --------------------------------------------------
 
+-----------------------------------
+1.0.1
+-----------------------------------
+- fixed auto-referencing pk3s from fs_game directories
+- yet another bug concerning gamma correction on linux fixed
+- internal http server returns correct error code on failure
+- fixed command autocompletion on pressing enter
+- fixed alignment of info message in connecting screen
+- single threaded http downloads
+
 -----------------------------------
 1.0
 -----------------------------------

diff --git a/res/NSIS.definitions.nsh.in b/res/NSIS.definitions.nsh.in
@@ -1,5 +1,6 @@
 !define VERSIONMAJOR @MV_MAJOR_VERSION@
 !define VERSIONMINOR @MV_MINOR_VERSION@
+!define VERSIONPATCH @MV_PATCH_VERSION@
 !define VERSION_EXT "@MV_EXT_VERSION@"
 !define VERSION_EASY_COMPARE @MV_ECMP_VERSION@
 

diff --git a/res/NSIS.template.in b/res/NSIS.template.in
@@ -65,7 +65,7 @@ patched:
 			StrCpy $1 $INSTDIR
 			ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString"
 			ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion"
-			MessageBox MB_ICONINFORMATION "${APPNAME} $R0 has been found. The installer will upgrade ${APPNAME} to ${VERSIONMAJOR}.${VERSIONMINOR}${VERSION_EXT}."
+			MessageBox MB_ICONINFORMATION "${APPNAME} $R0 has been found. The installer will upgrade ${APPNAME} to ${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}${VERSION_EXT}."
 		${EndIf}
 	${EndIf}
 functionEnd
@@ -107,9 +107,10 @@ section "install"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\mv.ico$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${APPNAME}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "${ABOUTURL}"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}${VERSION_EXT}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}${VERSION_EXT}"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionPatch" ${VERSIONPATCH}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EasyCompare" ${VERSION_EASY_COMPARE}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1