Merge pull request etternagame#700 from etternagame/develop

0.68.0 merge

.changelog/Release_0-68.md

@@ -0,0 +1,23 @@
+# Release Changelog
+
+
+## [0.68.0] - 2020-02-17 - New Color Editor & Borderless Fullscreen
+
+### Added
+- AAAAA Grade, Midgrades, and SSRNormPercent prioritization - [#698](../../../pull/698)
+- Borderless Fullscreen & better Display Options - [#697](../../../pull/697)
+- ScreenColorEdit has been rewritten to allow for very fine control - [#695](../../../pull/695)
+- X11 Delete Window handler - [#677](../../../pull/677) [75e7aa5](../../../commit/75e7aa5c13c9ecea1e7bbbc80012a36e68a9bd18)
+
+### Changed
+- C exceptions causing crashes should give a more informative crash reason - [#687](../../../pull/687)
+- Default Judgment Textures updated to be higher resolution - [#674](../../../pull/674)
+- Upgraded Libtomcrypt to 1.18.2 - [#673](../../../pull/673)
+
+### Fixed
+- Crashed due to stack overflow when logging giant strings - [#681](../../../pull/681)
+- Fallback Lua errors when leaving out certain things - [#684](../../../pull/684)
+- Icons in ScreenSelectMaster never see the GainFocusCommand - [4048c28](../../../commit/4048c284dd76c1f0167219caee85758df1ace891)
+- Pack Downloader buttons always returned the mirror even if not clicking mirror - [9c00f34](../../../commit/9c00f3415955a390edd4bfd20bbe92a8d7d4a441)
+- Playlist creation overlay used to stop music - [7c0ddb9](../../../commit/7c0ddb993a2cbfb72e0a6635e61ebe5b5547596e)
+- Resolved around 200 simple coverity defects - [#683](../../../pull/683)

CHANGELOG.md

@@ -1,6 +1,24 @@
 # Changelog
 All releases of Etterna are listed in this file as well as links to files detailing all of the changes for each. All changes for each version apply in supplement to the ones below it. Changes are not in chronological order, only versions are.
 
+## [0.68.0] - 2020-02-17 - New Color Editor & Borderless Fullscreen
+
+Windows x64, Windows i386, and Mac installer release.
+- Color Editor rewritten, and borderless fullscreen added. Many small changes for stability.
+- [Notes](.changelog/Release_0-68.md)
+
+## [0.67.1] - 2019-12-23 - Hotfix
+
+Windows x64, Windows i386, and Mac installer release.
+- Chart Preview bugfixes, further Replay bugfixes, and an improvement to the Random Song picker.
+- [Notes](.changelog/Release_0-67-1.md)
+
+## [0.67.0] - 2019-12-16 - Til Death Translation Support, Replay Fixes, Practice Updates
+
+Windows x64 and Windows i386 installer release.
+- Most Replay bugs fixed, Chinese Til Death Translation added, and enhancements to Practice Mode to improve user experience.
+- [Notes](.changelog/Release_0-67-0.md)
+
 ## [0.66.1] - 2019-06-13 - Hotfix
 
 Windows x64, Windows i386, and Mac installer release.

CMake/CPack/Windows/ProductInfo.inc

@@ -6,7 +6,7 @@
 
 !define PRODUCT_ID "Etterna"
 ; TODO: This needs to be updated with the git rev hash
-!define PRODUCT_VER "v0.67.1"
+!define PRODUCT_VER "v0.68.0"
 !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ett"
 

CMake/Helpers/CMakeLinux.cmake

@@ -14,6 +14,7 @@ find_package(DLFCN REQUIRED)
 find_package(CURL REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(Xrandr REQUIRED)
+find_package(Xinerama)
 find_package(PulseAudio)
 find_package(ALSA)
 find_package(JACK)

CMake/Modules/FindXinerama.cmake

@@ -0,0 +1,52 @@
+# This is borrowed from FreeRDP. - Find XINERAMA Find the XINERAMA libraries
+#
+# This module defines the following variables: XINERAMA_FOUND        - true if
+# XINERAMA_INCLUDE_DIR & XINERAMA_LIBRARY are found XINERAMA_LIBRARIES    - Set
+# when XINERAMA_LIBRARY is found XINERAMA_INCLUDE_DIRS - Set when
+# XINERAMA_INCLUDE_DIR is found
+#
+# XINERAMA_INCLUDE_DIR  - where to find Xinerama.h, etc. XINERAMA_LIBRARY      -
+# the XINERAMA library
+#
+
+# =============================================================================
+# Copyright 2011 O.S. Systems Software Ltda. Copyright 2011 Otavio Salvador
+# <otavio@ossystems.com.br> Copyright 2011 Marc-Andre Moreau
+# <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+# =============================================================================
+
+find_path(XINERAMA_INCLUDE_DIR
+          NAMES X11/extensions/Xinerama.h
+          PATHS /opt/X11/include
+          PATH_SUFFIXES X11/extensions
+          DOC "The Xinerama include directory")
+
+find_library(XINERAMA_LIBRARY
+             NAMES Xinerama
+             PATHS /opt/X11/lib
+             DOC "The Xinerama library")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Xinerama
+                                  DEFAULT_MSG
+                                  XINERAMA_LIBRARY
+                                  XINERAMA_INCLUDE_DIR)
+
+if(XINERAMA_FOUND)
+  set(XINERAMA_LIBRARIES ${XINERAMA_LIBRARY})
+  set(XINERAMA_INCLUDE_DIRS ${XINERAMA_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(XINERAMA_INCLUDE_DIR XINERAMA_LIBRARY)

CMakeLists.txt

@@ -12,7 +12,7 @@ option(OPENSSL_ROOT_DIR "OpenSSL Root Directory" "")
 
 # PROJECT WIDE SETUP
 project(Etterna
-		VERSION 0.67.1
+		VERSION 0.68.0
         HOMEPAGE_URL https://github.com/etternagame/etterna/
         LANGUAGES C CXX ASM)
 

Docs/Building.md

@@ -66,7 +66,7 @@ While most dependencies for macOS and Windows are included in the repo, there ar
 
 ### macOS Dependencies
 
-macOS has no other unique dependencies.
+- `YASM` or `NASM`. They can be installed with brew commands `brew install yasm` or `brew install nasm`. They are not directly used for Etterna, though is required for ffmpeg to be built from source.
 
 ## Project Generation
 
@@ -122,6 +122,10 @@ cmake -DOPENSSL_ROOT_DIR="C:/OpenSSL-Win32" -G "Visual Studio 16 2019" -A Win32
 cmake -DOPENSSL_ROOT_DIR="C:/OpenSSL-Win64" -G "Visual Studio 16 2019" -A x64 ..    # 64bit Windows
 ```
 
+##### macOS Xcode Generation Note
+
+When generating a project for Xcode, you may see errors stating `No CMAKE_{C,CXX}_COMPILER could be found.` Ensure that you have the Xcode command line tools installed. The command line tools can be installed with `xcodeselect --install`. You may also have to run `xcode-select --reset` to ensure the correct command line tools are apart of the system path.
+
 ### GUI Project Generation
 
 In order to compile properly, you will want to make your CMake-GUI look similar to the above photo. The first text field is the location where you cloned Etterna, the second text field is where you want to place the build object files. The `OPENSSL_ROOT_DIR` was added by clicking the add entry button. It should look similar to the following image.