Merge branch 'develop' into tracyprofiler

.changelog/Release_0-70-1.md

@@ -0,0 +1,36 @@
+# Release Changelog
+
+
+## [0.70.1] - 2020-07-09 - Hotfix
+
+### Added
+- Filtered list of Highscores by Game - [8c2f738](../../../commit/8c2f738c024e40ef0274dbbe6f2667b654ae8ec1)
+- Functions for checking if a Steps is playable in a Game - [41c5f6f](../../../commit/41c5f6f3859e690e5e794457c656bd7ad5068176)
+- NoteField Column Spacing in CustomizeGameplay - [#822](../../../pull/822) [2ff47a4](../../../commit/2ff47a41de5de5b687ec9e8954085a562ca5e197)
+- Profile Tab has a Recent Scores tab - [924213d](../../../commit/924213d9df0c9e9b911e528626706b695c4ea8c2)
+
+### Changed
+- Cache Iteration - [b79b37c](../../../commit/b79b37c17db6b87aeb6522714c25e3aa4c3f0976)
+- Calculator Debug Display color/text changes, lower pagination - [bc1f997](../../../commit/bc1f997042fffdb65e3ad35a825d67067485a42a) [9f95af4](../../../commit/9f95af4ca4cd221f69e52d5ac4fcdb45a795560a) [152a32b](../../../commit/152a32b27696f7364ba25ddd97f7d9c34129cdd8) [2417615](../../../commit/24176151b26bfb860393b683fb7028ffe5555694) [edab953](../../../commit/edab953eb27145e969c368dbc8bfa7208d594111) [fa0c630](../../../commit/fa0c630873ea9a7627a098578658301a63bb50ca) [ae447f6](../../../commit/ae447f69c8556e40db7675967476488a1a801fb0) [1dc1d9d](../../../commit/1dc1d9d21f4a60b56f10d5d4064fff2b8a6496f9)
+- Common Fallback Mines are now dots - [56038d4](../../../commit/56038d44a7cfabd062551dd95015c7930a123ae9)
+- Disabled automatic score upload - [88ceddf](../../../commit/88ceddfe9133429ca87ff5e7cef57c35d724e16e)
+- First/LastSecond is now used for Gameplay and graphs - [fbd35bb](../../../commit/fbd35bb6e62dc38ef959dc1e544a419ff5527362) [9a4d04a](../../../commit/9a4d04a03b46ae17c7b1e206b1bc016179a6eb80) [1f44dae](../../../commit/1f44dae42faf1251450596d6f0f4ed70390ce419) [3130e40](../../../commit/3130e402dd32660b10d02bf00ecee37fae850ede) [4cffbec](../../../commit/4cffbec00a54fc9548f416e79a67fcb29a2c553b) [872b54c](../../../commit/872b54cbb997ade3167a7bcef6008d93e4312f47)
+- General Code Maintenance (Tidy/Resharper/Includes) - [#823](../../../pull/823) [d313c91](../../../commit/d313c918f55a0936e43dd15f28d9ad80f2b57d65) [0b56dc2](../../../commit/0b56dc29970bc0e39ded847d13e8508dee704f5e) [9e9bb32](../../../commit/9e9bb3212b8f1c9c8b3e23a31600f3ce796a51e7) [f35a3ed](../../../commit/f35a3ed53d482633eba7e63f9593596be83c12aa)
+- Grade Sort had minor changes - [288c6a9](../../../commit/288c6a9e60edd484be9d188cbee322a87a6a53d5) [fa53de0](../../../commit/fa53de0956f40269e35fd1dffea02abf4a9810f9) [798e6bf](../../../commit/798e6bf91b1d98496ced092c366377944e955d47) [42ffff0](../../../commit/42ffff0d4e05ae7b023f9998d37775c2501088a6)
+- Length Sort uses Steps Length instead of Song Length - [a8728a2](../../../commit/a8728a28dc70563000480cc9f9457cb5298d0f30) [b3c2724](../../../commit/b3c2724f6d2bc7aa103e4abbf287c6fdfa90dede) [70c75dc](../../../commit/70c75dcb659e94bcec8e2880dc3c040483395369)
+- MinaCalc updates (to CJ/OHJ primarily) - [2aded1e](../../../commit/2aded1e3fc00e030182f697cd14ba4979a6acc93)
+- Profile Tab Score clicking sets current rate - [94e319b](../../../commit/94e319b9367450145bc571e62074f175c02ac378)
+- Profile Tab Shows only Scores from current Game - [df361ea](../../../commit/df361ea8427c5147250e51974efb142036a56bda)
+- Steps first/lastsecond values are properly set and cached - [1b238a5](../../../commit/1b238a52421ae1dea4b54331a915b3c712bb3fa7) [c74a71b](../../../commit/c74a71b87f4aedaf7942d68e83e181beef74ac39) [b79b37c](../../../commit/b79b37c17db6b87aeb6522714c25e3aa4c3f0976) [2eb8005](../../../commit/2eb8005c1798d83c2732fbf42f69297d40a78280) [1b941b4](../../../commit/1b941b47c63f0e0e24469d8b98e70b0c2873d856)
+
+### Removed
+- CreateZip - [#817](../../../pull/817)
+- PlayerState SongPosition - [37cf739](../../../commit/37cf7392171582be56e715175360e5b8423771c6)
+- RString references - [19501c3](../../../commit/19501c3418a6854b870b6a4df1cc4b372044114a)
+- RageString - [a98c809](../../../commit/a98c80947cfc9439e8fdce23c17bb4bfeae05b07)
+- Unused metrics - [0b9242c](../../../commit/0b9242cade6309e587d583e2a9e1b7a9ce42099e)
+
+### Fixed
+- Menutimers worked in some rare instances - [86564d1](../../../commit/86564d1e30cc0f51bc1fa86d611b4e94f025fc4f)
+- Taps and Holds draw orders swapped - [ba85ec7](../../../commit/ba85ec71715fa8f384876f6479e919d1f750a391)
+- Unrecognized StepsType Cache Crash - [f4a698e](../../../commit/f4a698e88a971489366e9ce7c56362e829d0ebd2)

.changelog/Release_0-70-2.md

@@ -0,0 +1,20 @@
+# Release Changelog
+
+
+## [0.70.2] - 2020-07-13 - MSD Update
+
+### Changed
+- MinaCalc updates (to Jacks & JS primarily) - [74eed96](../../../commit/74eed96cb0f4f0575c5973bf2b263d0e138fc70d) [0fa0117](../../../commit/0fa0117fdee473a5ca93438581d82e3927ee68b2) [b3f25ad](../../../commit/b3f25adcaa3749add7cbd12c24015fd535e4f2d7) [92518e5](../../../commit/92518e5fa00832ec8afb9eae929ab441dc68b753) [82b67dd](../../../commit/82b67ddb8ccec93f526020bffbd59bff1b46b24d) [6a5a06d](../../../commit/6a5a06d2bc7680580eae6ea9792c6467e64cf409) [79797de](../../../commit/79797dea45b853ebc7ebdd4ba995e821bc98addc)
+- Profile will now save after score upload but before reaching Evaluation - [c62833f](../../../commit/c62833ff2a695594d57ece1e976465e234bd05e4) [be84d66](../../../commit/be84d669bbfcbbdf140dead164082c3c357f1d1c)
+
+### Removed
+- PlayMode - [3b966eb](../../../commit/3b966ebe82f8576f7c2bc0a6e0f6303efed26d2e)
+
+### Fixed
+- Crash on sortorder iteration via metrics - [79defd0](../../../commit/79defd01be938862de6afc140186dcf48a4c671a)
+- Filtering will actually remove all charts that don't match - [e6b1a44](../../../commit/e6b1a44af626c0578d06c303dc122b3971e74b81) [adeb392](../../../commit/adeb392fcff5c598a186b8c82875dbfe76633b61) [c52443b](../../../commit/c52443b3b674069729495eee740431a4710f7be5)
+- Highest-Only filtering will properly filter strictly to the Highest-Only charts - [#833](../../../pull/833) [e6b1a44](../../../commit/e6b1a44af626c0578d06c303dc122b3971e74b81)
+- Linux crashing due to muFFT visualizer usage - [#837](../../../pull/837)
+- Profile Tab scores set rates even if the song was not present - [8119385](../../../commit/811938555cc166ccbd077d7d072da75799d9737b)
+- Sortmode buttons suddenly centered themselves - [fa81da6](../../../commit/fa81da68f5780253b4aaa9bb22d352ea9f199c95)
+- Top Grade sort breaks for D and F grades - [337277f](../../../commit/337277fa4f8d57519e4ff3aeb5051f93a35dbf62)

.changelog/Release_0-70-3.md

@@ -0,0 +1,18 @@
+# Release Changelog
+
+
+## [0.70.3] - 2020-07-17 - MSD Update
+
+### Added
+- bare-frames Theme - [#853](../../../pull/853)
+
+### Changed
+- Default Sound Driver changed back to WaveOut - [6f112d0](../../../commit/6f112d05e3db71aa016af1a45415b11206ba7463)
+- MinaCalc (changes to Jacks, HS) - [92e71f2](../../../commit/92e71f2d1838a49b17f818e86c84fd74de4f6daa) [5899f8d](../../../commit/5899f8d39877c76f62f0d0ff3714b63eb352ca81) [ccaf31a](../../../commit/ccaf31a473bf10338e542bf3c88a26381d9c0279) [7c221af](../../../commit/7c221af0154c573da29d8730371b242565423460) [119894c](../../../commit/119894cc414858606f2b97fe5cf6573ba741f719) [b8bda9c](../../../commit/b8bda9c9d9957e5c0a52b68ff6c642d287fd5ae1) [d6521cd](../../../commit/d6521cd288e1a88d8e9231a1c5dd3368e5fc9e3b) [127d2fb](../../../commit/127d2fb4e27feaf67e70f673369f00b5e599ad9b) [c64e291](../../../commit/c64e2917c048c8857ee577eeab5de17af9e70dbf)
+- Filter Tab reset button resets all the Filter buttons - [f12ce12](../../../commit/f12ce12f2875615d21c3651302f0412cf83cf7ac)
+
+### Fixed
+- Calculator debug graphs did not consider rates properly in some cases - [0a13a8b](../../../commit/0a13a8bcf3f3bac3a85f07e6a46db2f397495fa3)
+- Crashing when selecting RandomBGMovies option - [f30cff2](../../../commit/f30cff2a6f0f5c2b860705820f8d5a116d137d54)
+- Filtering crashed on some rates - [8f2201b](../../../commit/8f2201b6da70cd05b7aed5368f403a7868d524f3)
+- Rare crash when calculating Replay Snapshots - [8b5b489](../../../commit/8b5b489909af7879464687a99862a4a0ec7be31d)

.github/workflows/ci-workflow.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install apt packages
-        run: sudo apt install ${{ matrix.cfg.cpp-version }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev
+        run: sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev
 
       - name: Print gcc + clang version
         run: ${{matrix.cfg.cpp-version}} --version

.github/workflows/coverity-scan.yml

@@ -17,7 +17,7 @@ jobs:
           path: main
 
       - name: Install apt dependencies
-        run: sudo apt-get install ninja-build nasm libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev
+        run: sudo apt update && sudo apt-get install ninja-build nasm libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev
 
       - name: Download Coverity Build Tool
         run: |

.gitignore

@@ -7,77 +7,81 @@
 
 # Ignore executables (Linux, macOS, Windows)
 /Etterna
+/Etterna-debug
+/Etterna-MinSizeRelease
+/Etterna-RelWithDebInfo
 *.app
 *.exe
 
 # Etterna Related Ignore
-Cache/
-Logs/
-Program/
-Save/
-Screenshots/
-Songs/
+/Cache/
+/Logs/
+/Program/
+/Save/
+/Screenshots/
+/Songs/
 
 # Misc Ignores
-crashinfo.txt
-nowplaying.txt
+/crashinfo.txt
+/nowplaying.txt
 
 ## Specific Ignores (To allow playing on development builds)
 # Some not included here because pending removal or not frequently changing (user assets)
-Announcers/*
-!Announcers/instructions.txt
+/Announcers/*
+!/Announcers/instructions.txt
 
-Assets/Avatars/*
-!Assets/Avatars/_fallback.png
-!Assets/Avatars/Divide By Zero.png
-!Assets/Avatars/Take Control.png
-!Assets/Avatars/takemetothepromisedland.png
+/Assets/Avatars/*
+!/Assets/Avatars/_fallback.png
+!/Assets/Avatars/Divide By Zero.png
+!/Assets/Avatars/Take Control.png
+!/Assets/Avatars/takemetothepromisedland.png
 
-Assets/Judgments/*
-!Assets/Judgments/default 1x6 (Doubleres).png
-!Assets/Judgments/Judgment Normal 2x6 (Doubleres).png
+/Assets/Judgments/*
+!/Assets/Judgments/default 1x6 (Doubleres).png
+!/Assets/Judgments/Judgment Normal 2x6 (Doubleres).png
 
-Assets/Toasties/*
-!Assets/Toasties/default/
-!Assets/Toasties/legacy/
+/Assets/Toasties/*
+!/Assets/Toasties/default/
+!/Assets/Toasties/legacy/
 
-NoteSkins/*
-!NoteSkins/instructions.txt
-!NoteSkins/beat/default/
-!NoteSkins/common/
+/NoteSkins/*
+!/NoteSkins/instructions.txt
+!/NoteSkins/beat/default/
+!/NoteSkins/common/
 
-!NoteSkins/dance/default/
-!NoteSkins/dance/DivideByInf/
-!NoteSkins/dance/DivideByZero_halved/
-!NoteSkins/dance/DivideByZero_semihalved/
-!NoteSkins/dance/DivideByZeroHollow/
-!NoteSkins/dance/MultiplyByZero/
-!NoteSkins/dance/MultiplyByZeroDoubleRes/
-!NoteSkins/dance/SubtractByZero/
+!/NoteSkins/dance/default/
+!/NoteSkins/dance/DivideByInf/
+!/NoteSkins/dance/DivideByZero_halved/
+!/NoteSkins/dance/DivideByZero_semihalved/
+!/NoteSkins/dance/DivideByZeroHollow/
+!/NoteSkins/dance/MultiplyByZero/
+!/NoteSkins/dance/MultiplyByZeroDoubleRes/
+!/NoteSkins/dance/SubtractByZero/
 
-!NoteSkins/kb7/default/
-!NoteSkins/kb7/orbital/
-!NoteSkins/kb7/retrobar/
-!NoteSkins/kb7/retrobar-iidx/
-!NoteSkins/kb7/retrobar-o2jam/
-!NoteSkins/kb7/retrobar-razor/
-!NoteSkins/kb7/retrobar-razor_o2/
+!/NoteSkins/kb7/default/
+!/NoteSkins/kb7/orbital/
+!/NoteSkins/kb7/retrobar/
+!/NoteSkins/kb7/retrobar-iidx/
+!/NoteSkins/kb7/retrobar-o2jam/
+!/NoteSkins/kb7/retrobar-razor/
+!/NoteSkins/kb7/retrobar-razor_o2/
 
-!NoteSkins/pump/cmd/
-!NoteSkins/pump/cmd-routine-p1/
-!NoteSkins/pump/cmd-routine-p2/
-!NoteSkins/pump/complex/
-!NoteSkins/pump/default/
-!NoteSkins/pump/delta/
-!NoteSkins/pump/delta-note/
-!NoteSkins/pump/delta-routine-p1/
-!NoteSkins/pump/delta-routine-p2/
-!NoteSkins/pump/frame5p/
-!NoteSkins/pump/newextra/
-!NoteSkins/pump/pad/
-!NoteSkins/pump/rhythm/
-!NoteSkins/pump/simple/
+!/NoteSkins/pump/cmd/
+!/NoteSkins/pump/cmd-routine-p1/
+!/NoteSkins/pump/cmd-routine-p2/
+!/NoteSkins/pump/complex/
+!/NoteSkins/pump/default/
+!/NoteSkins/pump/delta/
+!/NoteSkins/pump/delta-note/
+!/NoteSkins/pump/delta-routine-p1/
+!/NoteSkins/pump/delta-routine-p2/
+!/NoteSkins/pump/frame5p/
+!/NoteSkins/pump/newextra/
+!/NoteSkins/pump/pad/
+!/NoteSkins/pump/rhythm/
+!/NoteSkins/pump/simple/
 
-Themes/*
-!Themes/_fallback/
-!Themes/Til Death
+/Themes/*
+!/Themes/_fallback/
+!/Themes/Til Death
+!/Themes/bare-frames

CMake/Helpers/CMakeWindows.cmake

@@ -7,14 +7,17 @@ set_directory_properties(PROPERTIES VS_STARTUP_PROJECT Etterna)
 set_target_properties(Etterna PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<1:${PROJECT_SOURCE_DIR}/Program>")
 
 # Universal Build Options
-set_target_properties(Etterna PROPERTIES 
+set_target_properties(Etterna PROPERTIES
 	COMPILE_FLAGS "/W3 /MP8 /INCREMENTAL /D_HAS_STD_BYTE=0"
 	LINK_FLAGS "/SUBSYSTEM:WINDOWS /SAFESEH:NO /INCREMENTAL"
 	COMPILE_DEFINITIONS "GLEW_STATIC")
 
 # By default MSVC has a 2^16 limit on the number of sections in an object file, and this needs more than that.
 set_source_files_properties(src/Etterna/Singletons/NetworkSyncManager.cpp PROPERTIES COMPILE_FLAGS /bigobj)
 
+# Ignore the safer function variants provided by VC++. They are not portable.
+target_compile_definitions(Etterna PRIVATE _CRT_SECURE_NO_WARNINGS)
+
 # Linking - Windows Only
 target_link_libraries(Etterna PUBLIC ffmpeg)
 

CMakeLists.txt

@@ -19,7 +19,7 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 # PROJECT WIDE SETUP
 project(Etterna
-		VERSION 0.70.1
+		VERSION 0.71.0
         HOMEPAGE_URL https://github.com/etternagame/etterna/
         LANGUAGES C CXX ASM)
 
@@ -84,8 +84,6 @@ target_link_libraries(Etterna PRIVATE rapidjson)
 target_link_libraries(Etterna PRIVATE websocketpp)
 target_link_libraries(Etterna PRIVATE luajit)
 target_link_libraries(Etterna PRIVATE discord-rpc)
-target_link_libraries(Etterna PRIVATE tomcrypt)
-target_link_libraries(Etterna PRIVATE libtommath)
 target_link_libraries(Etterna PRIVATE muFFT)
 target_link_libraries(Etterna PRIVATE glfw)
 target_link_libraries(Etterna PRIVATE ogg)
@@ -95,6 +93,8 @@ target_link_libraries(Etterna PRIVATE libmad)
 target_link_libraries(Etterna PRIVATE stb)
 target_link_libraries(Etterna PRIVATE libcurl)
 target_link_libraries(Etterna PRIVATE tracy)
+target_link_libraries(Etterna PRIVATE fmt::fmt)
+target_link_libraries(Etterna PRIVATE plog::plog)
 
 # OS Specific Initialization
 if(WIN32)
@@ -111,6 +111,7 @@ add_subdirectory(src/Etterna)
 add_subdirectory(src/arch)
 add_subdirectory(src/archutils)
 add_subdirectory(src/RageUtil)
+add_subdirectory(src/Core)
 
 ## The source_group line creates the full visual studio filter layout
 get_target_property(sources Etterna SOURCES)

Docs/legacy/Luadoc/Lua.xml

@@ -1109,6 +1109,7 @@
 		<Class base='WheelBase' name='MusicWheel'>
 			<Function name='ChangeSort'/>
 			<Function name='FilterByStepKeys'/>
+			<Function name='FilterByAndAgainstStepKeys' />
 			<Function name='GetSelectedSection'/>
 			<Function name='IsRouletting'/>
 			<Function name='Move'/>

README.md

@@ -27,6 +27,7 @@ Etterna is a cross-platform rhythm game similar to [Dance Dance Revolution](http
 - [Bug Reporting](#Bug-Reporting)
 - [Contributing](#Contributing)
 - [License](#License)
+- [Special Thanks](#Special-Thanks)
 
 ## Installing
 
@@ -69,4 +70,10 @@ Etterna uses the MIT License, as is required since we are derivative of StepMani
 
 In short, you are free to modify, sell, distribute, and sublicense this project. We ask that you include a reference to this github repository in your derivative, and do not hold us liable when something breaks.
 
-Etterna uses the [MAD library](http://www.underbit.com/products/mad/) and [FFMPEG codecs](https://www.ffmpeg.org/). Those libraries, when built, use the [GPL license](http://www.gnu.org).
+Etterna uses the [MAD library](http://www.underbit.com/products/mad/) and [FFMPEG codecs](https://www.ffmpeg.org/). Those libraries, when built, use the [GPL license](http://www.gnu.org).
+
+## Special Thanks
+
+- All original SM devs/contributors
+- [Jet Brains](https://www.jetbrains.com/?from=Etterna) for giving us free licenses
+- [Coverity](https://scan.coverity.com/) for giving us free scans