diff --git a/.changelog/Release_0-66-0.md b/.changelog/Release_0-66-0.md new file mode 100644 index 0000000000..25ad984621 --- /dev/null +++ b/.changelog/Release_0-66-0.md @@ -0,0 +1,91 @@ +# Release Changelog + + +## [0.66.0] - 2019-06-03 - Codebase Restructure & Quality of Life Patch 2 + +Windows x64, Windows i386, and Mac installer release. + +### Added +- Asset Settings to pick Toasties, Judgments, and Avatars - [#538](../../../pull/538) [3162b2e](../../../commit/3162b2e4334538eeca413ed3419cd3d28bfb2b57) [615d748](../../../commit/615d748605aa77eea93f87986055c800f9f27093) [35c7505](../../../commit/35c7505da16d3e17fbcbcdd5dd0976334df47f21) [471b205](../../../commit/471b20506c1b23bd9130f076c2556ceb4b42105a) [21062e7](../../../commit/21062e74e0ec01f6e6e91a16d4a1352289feca41) [12515ef](../../../commit/12515ef64edb48c03f4f2aa43d09a819bea24e29) [dbebb58](../../../commit/dbebb58659d939980ae86fb6f0a71aa5044ae1c8) [0f2da81](../../../commit/0f2da81b60417056032055bc4a402ae14ced2384) +- Button to enter sort mode - [a1dbd45](../../../commit/a1dbd4515ecca6e2e0f3266a0bb03b3ceb945468) +- Chord Cohesion Filter Toggle on Chart Leaderboards - [592b158](../../../commit/592b1581a9ddb526a3a395dfa0d36ea9d0ed4a13) +- Combo Text Hiding option is now available in Player Options - [5bc8790](../../../commit/5bc8790dad5c64fcfbf1b9c4a644bafded151358) +- Debug Menu has a new Misc Page with many new options - [339b91b](../../../commit/339b91b3b30403e1ca35d9a192e23e636d90f6fc) [efa0767](../../../commit/efa0767a3a0912854264bc98f8050efc0725ce20) [5738f17](../../../commit/5738f17fdb04350bb708ca945e4306b186a65310) +- Hotkey to toggle Practice Mode in SelectMusic on `Ctrl+O` - [a47f233](../../../commit/a47f233d9da291841c030d9abb3d32fa5e8fd8fe) +- Lane Cover is added to the Color Config - [a4a122a](../../../commit/a4a122a4aa762d5a3fd96a6f8f5d1d983c9d05e8) +- Legacy Toasty & Default 2x6 Judgment - [a54a46e](../../../commit/a54a46e9a1c682f66128289ab3284c17e487a2de) +- Lua access to Pack Download URL - [56c5d61](../../../commit/56c5d61e8d41dc6205ec511d150112b3d1094f74) +- Minanyms - [03e0704](../../../commit/03e0704f93575dbd40d7ebe868e5100e76c7a4f7) [a686ff1](../../../commit/a686ff14b9c6e02736cff4864c252ac68eb7b218) +- NowPlaying text file output for Streamers - [2015e2b](../../../commit/2015e2bd39505ca1aa4a66285f03931c6020f83e) [22b8522](../../../commit/22b8522c982f383c22bf14b274ef10e3b995cdb1) [f17f954](../../../commit/f17f954c0be92b96a8d348168a2cec7ce3ae529f) +- Pack Name text in the Group Sort functions as a Random Song Button for that group - [26fa5ef](../../../commit/26fa5ef3e8aac33f52fcf8dfcaa404060d1a0ea7) +- Preference for toggling the Lifts at the end of Osu Holds - [315cca5](../../../commit/315cca5b071d58370354a982da6cf5b5a25360d9) [4bfada0](../../../commit/4bfada032c155f514e8fd5e14c82dcd20b3221e6) +- "Select Music" text in any Sort functions as a Random Song Button for any song - [26fa5ef](../../../commit/26fa5ef3e8aac33f52fcf8dfcaa404060d1a0ea7) +- Support for building with Ninja & VS 2019 - [#514](../../../pull/514) +- Support for 2x6 Judgments (Early/Late Dots) - [73d0dcf](../../../commit/73d0dcfd03bd4040b779697f7da7e54ffb47cbf9) +### Changed +- Avatar Select now leads directly to Asset Settings - [4986a69](../../../commit/4986a69fd7394c2b9b2b8664d501cb28a7adc51b) [70dfee2](../../../commit/70dfee26b3becb28030f090c5548c17dd54ddc15) [615d748](../../../commit/615d748605aa77eea93f87986055c800f9f27093) +- Chart Leaderboard Entries have a mouse hover for extra decimal precision - [02da394](../../../commit/02da394ea4bbe9754d50d260df057bc45d9e62dc) +- Chart Preview will no longer have a 0.05 second delay to regenerate when changing style - [211f1e2](../../../commit/211f1e230f752baab77d4d5e70224461cb524ebe) [211f1e2](../../../commit/211f1e230f752baab77d4d5e70224461cb524ebe) +- Deleting entries from the Favorites Playlist fails due to internal issues. Disable the ability - [20e94f0](../../../commit/20e94f0ab3368a87c577e6e7826dae1863d39c10) +- Explanation Text for several Player Options have been updated - [a15c5e3](../../../commit/a15c5e31ac18c4e14efb306f9424fabe42df6803) +- Help Screen (F12) has been updated - [30f5ac8](../../../commit/30f5ac8f0dae2f8b4563737c846ab5bf286d2798) +- Hidden & Sudden should properly slowly fade Taps, not instantly - [e12144e](../../../commit/e12144ea68f5c147a38ba1accf6c63851cbb068c) +- "Judgement" has been globally replaced with "Judgment" - [7c6d0af](../../../commit/7c6d0af21822da28cbd06a4dad575eae2df808fa) +- Miscellaneous Options Buttons on SelectMusic now highlight - [ec51a8c](../../../commit/ec51a8ce89e0fbb163fb8a334a215d2af0b55a06) +- Notedata Cache Output to File slightly restructured - [bd66ea5](../../../commit/bd66ea59d916424563e885af3f35dd8d2ae925fd) +- NoGlow Metrics option is now a Preference, in the Appearance Options - [df47749](../../../commit/df4774992db4c334cfe26f72a20968ba35f7b3dc) +- Pack Downloads can always be instantly left by pressing Escape - [2449295](../../../commit/24492955bc87adee045be1e19477b86db926056c) +- Packs about to be downloaded will open a browser link if they are too large - [564e041](../../../commit/564e041d20dd99eb10900395df8ca3a8fb77a6f9) [e828140](../../../commit/e8281404528635cbe675515c3d8ce7ea0afe7da9) +- Practice Mode should stay ingame after the song ends - [8045bce](../../../commit/8045bcee99fde317a1c504a0885eaf830c335a17) +- Rates can be set as low as 0.5x now - [9a03a39](../../../commit/9a03a39deb22a8cd76061eb715c155faa9467127) [c07940c](../../../commit/c07940ce85dc4f6e78e1c57b3d3f7ffbe98ff288) +- Redid the face of the repo - [#513](../../../pull/513) [eba134d](../../../commit/eba134d48af64881b1601501360e39a9f923e10c) +- Reorganize the source file structure to match the VS Project Layout - [#455](../../../pull/455) +- Rewrote all old changelogs to be more comprehensive and have a somewhat standard format - [#522](../../../pull/522) +- Rewrote json and websockets code to rapidjson for speed & to reduce "bloat" - [#547](../../../pull/547) +- Rewrote the CMake system & Building Instructions - [#481](../../../pull/481) [#468](../../../pull/468) [#520](../../../pull/520) +- RString has been replaced by std string in various XML, Gameplay, and Scorekeeping files - [#552](../../../pull/552) +- Some submodules are replaced by subtrees - [#481](../../../pull/481) +- Textbox in Pack Downloads is autofocused when entering the screen - [17ae528](../../../commit/17ae528b5a43da20c13cdddebf021091ff2793c1) +- Toasties may linger on screen if they are too large when exiting. Just fade them out - [7123243](../../../commit/71232430058fc225ca6fae5cbcf50813f3b60b6f) +- Use stb image to write images (Screenshots) - [#489](../../../pull/489) +- Windows installer is now generated by CPack, which basically means we don't manually define everything for it - [#481](../../../pull/481) +### Removed +- AttackMines - [8b42207](../../../commit/8b42207b111be1f98962aafb271f783492d68b36) +- EZSockets - [b1ec80b](../../../commit/b1ec80b0aef22036bef9b8399c484ba98a484074) +- Force Crashing from the Debug Menu - [5fa6d9c](../../../commit/5fa6d9c670c1fe35bfeacc6db3e2265b338c0cbd) +- Libjpeg replaced by stbi_write_jpg - [#489](../../../pull/489) +- Jsoncpp - [7b5c562](../../../commit/7b5c562af4eaaea6a07cd87a679541badcfbb2a0) +- Nlohmann Json - [2c5fbfe](../../../commit/2c5fbfedd47cb3825976af63ddfe4fda223cb959) [79f3d33](../../../commit/79f3d330614d011b141f300ca8d2f6715d0a717b) +- References to para, techno, and lights except for controller support - [#531](../../../pull/531) +- Show_Skips for lag logger in the Metrics - [8a30ce8](../../../commit/8a30ce87d4b4f53c445a7f10a59cb6daa67eba5e) +- Some references to Player 2, Routine, Couple, and Versus - [#531](../../../pull/531) +- Unused Lights file "Parallel_lights_io.dll" - [5b83340](../../../commit/5b833401ad048e8ec672eb9232bee2052b0078cf) +- Unused Noteskin Folders (kickbox, para, techno, lights) - [7e18897](../../../commit/7e188972c442ea9c2b8925de17248da1db0e0c19) +- Unused Stepmania files - [08adaec](../../../commit/08adaec016efa5895627d8594da60b8b052c5b22) +### Fixed +- Banners didn't show up for some autocomplete cases - [edf8a72](../../../commit/edf8a7257c0955f503c3aa31c5b42e73ed948b4a) +- Changing Judges on Evaluation didn't update CB Counts per hand - [4a3ec19](../../../commit/4a3ec190b8d14eafd97d6f905d3f68b93c332c51) +- Chart Preview appeared again even after being turned off when changing style - [20bc0d4](../../../commit/20bc0d4d9e634d1a2e9c8f44e9a525aaf2bf4a0a) +- Current Rate Sort on Chart Leaderboards was not sorted by Wife Percent - [12d1520](../../../commit/12d152073c5f14609dce3f610561e81c2bb475ff) +- Differential Reloading disconnected the user from Multiplayer if it took more than 10 seconds - [#516](../../../pull/516) +- Game was hanging sometimes due to the Audio Visualizer (Deadlocks) - [#536](../../../pull/536) +- Game was stuttering when plugging or unplugging devices on Windows ([Issue 537](../../../issues/537)) - [#539](../../../pull/539) +- Game crashed when decompressing zip files (Pack Downloads) larger than 2GB - [2deae2d](../../../commit/2deae2db37c581cb4bc7f52aae66658a5a73dc0a) +- Game crashed when opening Player Options if not hovering a Song - [e42c304](../../../commit/e42c3049a1f6a563304e3a12030767cc2c368811) +- Game crashed when Songs picked in Multiplayer if the picked Song is filtered out by some means - [17dcfbc](../../../commit/17dcfbc4d0f54cb81bd7c26110a6939f31760c62) [f19b168](../../../commit/f19b1686a09aead81a32856368c16127b2cf18f3) +- Mac always hanged when disconnecting from multi ([Issue 475](../../../issues/475)) +- Mac-specific cleanup functions for loading Songs broke some stuff - [1a31e74](../../../commit/1a31e7441fe9e53476897b22e43f2bd5eb05e560) +- Multiplayer Chat disappeared when minimizing after scrolling up - [3efd130](../../../commit/3efd13082a0ddde8c0f3626cb65099d9aa4b8422) +- Multiplayer Evaluation Scoreboard entries didn't always work ([Issue 462](../../../issues/462)) - [#549](../../../pull/549) [3b4b2a1](../../../commit/3b4b2a1a94ac96f4a2bee95b0b5e408b6cf37fda) +- Multiplayer Evaluation Scoreboard entries showed an invalid date - [7dbd00c](../../../commit/7dbd00c5851355996eae4b3af95d7ed0fac30980) +- Multiplayer Ready & Force buttons had weird Font issues for some builds - [45cd0a0](../../../commit/45cd0a02672423e4a515dc956c54a6deac6f3e4a) +- MusicWheel Scrollbar was able to be clicked through the Til Death frame - [7bff5c3](../../../commit/7bff5c3a0b713a20246314af2cf7a021c9de1162) +- Nonzero Visual Delay settings were affected by Song Rates ([Issue 485](../../../issues/485)) - [#534](../../../pull/534) +- Osu files with the Standard difficulty wouldn't load - [ed0c393](../../../commit/ed0c39396a7e0d6885462238289ba69bedafa0ff) +- Practice Mode kept Judgment counts at all times, causing weird issues. - [4a5968d](../../../commit/4a5968d8c50436c04af278eec29d30078d7343d7) [17ed183](../../../commit/17ed1830974e91c2570c4d0ccee0d9614fa1f9f3) +- Practice Mode instantly judged every Tap since the beginning of the file every time you seek as a Miss - [72dbeb0](../../../commit/72dbeb0e8730ea7dbe84c7d47f91203db132793c) +- Profile Stats (Play Time...) never updated unless finishing a Practice Mode play - [c1b8e06](../../../commit/c1b8e06c80b8e5cc203ddfcf94ad8b44567bf8d4) +- Rare crash occurred when exiting Practice Mode due to Fail settings - [c16a0f5](../../../commit/c16a0f5e63592ed56967a573b64b481eda20afc5) [6271e50](../../../commit/6271e50c139369373a7bb8e56a3eccfa3fbb89aa) +- Replays used to have a slider that worked. It stopped working. - [14744f4](../../../commit/14744f430e79f89e299b8cca6553460df8d35cdc) +- Replay Viewing Buttons were functional in Multiplayer, which is impossible - [997d844](../../../commit/997d8448fa1a7f1a58bc8462d585f0d4c4e36ca0) +- Widescreen caused the target tracker, progress bar, and judgments to be offset in Gameplay - [3b27bf6](../../../commit/3b27bf6fca39997732767a28b287040d31faa9f3) diff --git a/.changelog/Release_0-66-1.md b/.changelog/Release_0-66-1.md new file mode 100644 index 0000000000..04a21e0bce --- /dev/null +++ b/.changelog/Release_0-66-1.md @@ -0,0 +1,30 @@ +# Release Changelog + + +## [0.66.1] - 2019-06-13 - Hotfix + +Windows x64, Windows i386, and Mac installer release. + +### Added +- Basic support for 10k (Pump Doubles) - [56c4123](../../../commit/56c4123f29eb4dee941f3d69db528bcd6e027df1) +- MA/PA ratio indicators on the Evaluation Screen - [#569](../../../pull/569) +- More specific information on Generators in the Building documentation - [#565](../../../pull/565) +### Changed +- Chord Cohesion indicator text on the Evaluation Screen appears only when it's on - [#569](../../../pull/569) +- DisplayName entry allowed blank names to be put in, which isn't proper. Disallow it - [a5a5446](../../../commit/a5a544636fdc9b69de20b7eefe4333c2813c879f) +- Pressing Start on the Pack Downloader Screen shouldn't exit it - [18be076](../../../commit/18be076d7698e054a1ebacab81c62b87ab467c42) +- Pressing Start on the Bundle Select Screen shouldn't exit it - [18be076](../../../commit/18be076d7698e054a1ebacab81c62b87ab467c42) +- Random BG Preference is defaulted to Off since this apparently works now - [c4acf2a](../../../commit/c4acf2a52edf2841ceb26f424e5959282289feb0) +- Random Song Pickers shouldn't seed every click with OS clock seconds because it produces the same number every time second - [151c76e](../../../commit/151c76e6f9dd4a87c2bcf6df9d8c6a075150783b) +- ScreenTextEntry's question and answer text needs to be aligned properly to cope with newlines - [7340889](../../../commit/7340889485d602d796b37e78088f6f39bb00a28e) +- Toasties in the Asset Picker shouldn't play the sound if the item is already selected - [0381772](../../../commit/0381772cfa0c0588e21d339dccba03de9ec2e3ce) +### Fixed +- ALSA didn't load basically ever - [b77e7d4](../../../commit/b77e7d435da1b952cea781c1a0150b9a7c8f84a5) +- Blank DisplayNames for Profiles stopped prompting users to set a name - [b84d391](../../../commit/b84d391c14f501bcc8a7fc36c23d12b91ed2b61d) +- Build order for CMake caused issues for everything but Windows - [#561](../../../pull/561) +- DirectSound-sw didn't load basically ever - [96517f7](../../../commit/96517f7afb435ea10da8da683a0143b0b1b1b904) +- Colors for some Pump Difficulties caused errors due to removed code - [ddd57aa](../../../commit/ddd57aab828152033ecc7f40a19c67571c7197a7) +- DownloadManager had broken logic which made updating Online rankings impossible - [68be106](../../../commit/68be106bf14bdebe4b416b5abfe500fce3c3b61c) +- Linux builds failed due to a last minute CMake change - [#559](../../../pull/559) +- Multiplayer Evaluation Scoreboard had lua errors due to a removed Actor - [03e3436](../../../commit/03e3436e0b74b988b4b1081d193db342ca4bea46) +- Window Icon for the game was gigantic in the Windows Audio Mixer - [d740f49](../../../commit/d740f499ea444943d58fbf5802639ead0da02379) diff --git a/.changelog/Release_0-66.md b/.changelog/Release_0-66.md deleted file mode 100644 index 862f9c088e..0000000000 --- a/.changelog/Release_0-66.md +++ /dev/null @@ -1,91 +0,0 @@ -# Release Changelog - - -## [0.66.0] - 2019-06-03 - Codebase Restructure & Quality of Life Patch 2 - -Windows x64, Windows i386, and Mac installer release. - -### Added -- Asset Settings to pick Toasties, Judgments, and Avatars - [#538](../../pull/538) [3162b2e](../../commit/3162b2e4334538eeca413ed3419cd3d28bfb2b57) [615d748](../../commit/615d748605aa77eea93f87986055c800f9f27093) [35c7505](../../commit/35c7505da16d3e17fbcbcdd5dd0976334df47f21) [471b205](../../commit/471b20506c1b23bd9130f076c2556ceb4b42105a) [21062e7](../../commit/21062e74e0ec01f6e6e91a16d4a1352289feca41) [12515ef](../../commit/12515ef64edb48c03f4f2aa43d09a819bea24e29) [dbebb58](../../commit/dbebb58659d939980ae86fb6f0a71aa5044ae1c8) [0f2da81](../../commit/0f2da81b60417056032055bc4a402ae14ced2384) -- Button to enter sort mode - [a1dbd45](../../commit/a1dbd4515ecca6e2e0f3266a0bb03b3ceb945468) -- Chord Cohesion Filter Toggle on Chart Leaderboards - [592b158](../../commit/592b1581a9ddb526a3a395dfa0d36ea9d0ed4a13) -- Combo Text Hiding option is now available in Player Options - [5bc8790](../../commit/5bc8790dad5c64fcfbf1b9c4a644bafded151358) -- Debug Menu has a new Misc Page with many new options - [339b91b](../../commit/339b91b3b30403e1ca35d9a192e23e636d90f6fc) [efa0767](../../commit/efa0767a3a0912854264bc98f8050efc0725ce20) [5738f17](../../commit/5738f17fdb04350bb708ca945e4306b186a65310) -- Hotkey to toggle Practice Mode in SelectMusic on `Ctrl+O` - [a47f233](../../commit/a47f233d9da291841c030d9abb3d32fa5e8fd8fe) -- Lane Cover is added to the Color Config - [a4a122a](../../commit/a4a122a4aa762d5a3fd96a6f8f5d1d983c9d05e8) -- Legacy Toasty & Default 2x6 Judgment - [a54a46e](../../commit/a54a46e9a1c682f66128289ab3284c17e487a2de) -- Lua access to Pack Download URL - [56c5d61](../../commit/56c5d61e8d41dc6205ec511d150112b3d1094f74) -- Minanyms - [03e0704](../../commit/03e0704f93575dbd40d7ebe868e5100e76c7a4f7) [a686ff1](../../commit/a686ff14b9c6e02736cff4864c252ac68eb7b218) -- NowPlaying text file output for Streamers - [2015e2b](../../commit/2015e2bd39505ca1aa4a66285f03931c6020f83e) [22b8522](../../commit/22b8522c982f383c22bf14b274ef10e3b995cdb1) [f17f954](../../commit/f17f954c0be92b96a8d348168a2cec7ce3ae529f) -- Pack Name text in the Group Sort functions as a Random Song Button for that group - [26fa5ef](../../commit/26fa5ef3e8aac33f52fcf8dfcaa404060d1a0ea7) -- Preference for toggling the Lifts at the end of Osu Holds - [315cca5](../../commit/315cca5b071d58370354a982da6cf5b5a25360d9) [4bfada0](../../commit/4bfada032c155f514e8fd5e14c82dcd20b3221e6) -- "Select Music" text in any Sort functions as a Random Song Button for any song - [26fa5ef](../../commit/26fa5ef3e8aac33f52fcf8dfcaa404060d1a0ea7) -- Support for building with Ninja & VS 2019 - [#514](../../pull/514) -- Support for 2x6 Judgments (Early/Late Dots) - [73d0dcf](../../commit/73d0dcfd03bd4040b779697f7da7e54ffb47cbf9) -### Changed -- Avatar Select now leads directly to Asset Settings - [4986a69](../../commit/4986a69fd7394c2b9b2b8664d501cb28a7adc51b) [70dfee2](../../commit/70dfee26b3becb28030f090c5548c17dd54ddc15) [615d748](../../commit/615d748605aa77eea93f87986055c800f9f27093) -- Chart Leaderboard Entries have a mouse hover for extra decimal precision - [02da394](../../commit/02da394ea4bbe9754d50d260df057bc45d9e62dc) -- Chart Preview will no longer have a 0.05 second delay to regenerate when changing style - [211f1e2](../../commit/211f1e230f752baab77d4d5e70224461cb524ebe) [211f1e2](../../commit/211f1e230f752baab77d4d5e70224461cb524ebe) -- Deleting entries from the Favorites Playlist fails due to internal issues. Disable the ability - [20e94f0](../../commit/20e94f0ab3368a87c577e6e7826dae1863d39c10) -- Explanation Text for several Player Options have been updated - [a15c5e3](../../commit/a15c5e31ac18c4e14efb306f9424fabe42df6803) -- Help Screen (F12) has been updated - [30f5ac8](../../commit/30f5ac8f0dae2f8b4563737c846ab5bf286d2798) -- Hidden & Sudden should properly slowly fade Taps, not instantly - [e12144e](../../commit/e12144ea68f5c147a38ba1accf6c63851cbb068c) -- "Judgement" has been globally replaced with "Judgment" - [7c6d0af](../../commit/7c6d0af21822da28cbd06a4dad575eae2df808fa) -- Miscellaneous Options Buttons on SelectMusic now highlight - [ec51a8c](../../commit/ec51a8ce89e0fbb163fb8a334a215d2af0b55a06) -- Notedata Cache Output to File slightly restructured - [bd66ea5](../../commit/bd66ea59d916424563e885af3f35dd8d2ae925fd) -- NoGlow Metrics option is now a Preference, in the Appearance Options - [df47749](../../commit/df4774992db4c334cfe26f72a20968ba35f7b3dc) -- Pack Downloads can always be instantly left by pressing Escape - [2449295](../../commit/24492955bc87adee045be1e19477b86db926056c) -- Packs about to be downloaded will open a browser link if they are too large - [564e041](../../commit/564e041d20dd99eb10900395df8ca3a8fb77a6f9) [e828140](../../commit/e8281404528635cbe675515c3d8ce7ea0afe7da9) -- Practice Mode should stay ingame after the song ends - [8045bce](../../commit/8045bcee99fde317a1c504a0885eaf830c335a17) -- Rates can be set as low as 0.5x now - [9a03a39](../../commit/9a03a39deb22a8cd76061eb715c155faa9467127) [c07940c](../../commit/c07940ce85dc4f6e78e1c57b3d3f7ffbe98ff288) -- Redid the face of the repo - [#513](../../pull/513) [eba134d](../../commit/eba134d48af64881b1601501360e39a9f923e10c) -- Reorganize the source file structure to match the VS Project Layout - [#455](../../pull/455) -- Rewrote all old changelogs to be more comprehensive and have a somewhat standard format - [#522](../../pull/522) -- Rewrote json and websockets code to rapidjson for speed & to reduce "bloat" - [#547](../../pull/547) -- Rewrote the CMake system & Building Instructions - [#481](../../pull/481) [#468](../../pull/468) [#520](../../pull/520) -- RString has been replaced by std string in various XML, Gameplay, and Scorekeeping files - [#552](../../pull/552) -- Some submodules are replaced by subtrees - [#481](../../pull/481) -- Textbox in Pack Downloads is autofocused when entering the screen - [17ae528](../../commit/17ae528b5a43da20c13cdddebf021091ff2793c1) -- Toasties may linger on screen if they are too large when exiting. Just fade them out - [7123243](../../commit/71232430058fc225ca6fae5cbcf50813f3b60b6f) -- Use stb image to write images (Screenshots) - [#489](../../pull/489) -- Windows installer is now generated by CPack, which basically means we don't manually define everything for it - [#481](../../pull/481) -### Removed -- AttackMines - [8b42207](../../commit/8b42207b111be1f98962aafb271f783492d68b36) -- EZSockets - [b1ec80b](../../commit/b1ec80b0aef22036bef9b8399c484ba98a484074) -- Force Crashing from the Debug Menu - [5fa6d9c](../../commit/5fa6d9c670c1fe35bfeacc6db3e2265b338c0cbd) -- Libjpeg replaced by stbi_write_jpg - [#489](../../pull/489) -- Jsoncpp - [7b5c562](../../commit/7b5c562af4eaaea6a07cd87a679541badcfbb2a0) -- Nlohmann Json - [2c5fbfe](../../commit/2c5fbfedd47cb3825976af63ddfe4fda223cb959) [79f3d33](../../commit/79f3d330614d011b141f300ca8d2f6715d0a717b) -- References to para, techno, and lights except for controller support - [#531](../../pull/531) -- Show_Skips for lag logger in the Metrics - [8a30ce8](../../commit/8a30ce87d4b4f53c445a7f10a59cb6daa67eba5e) -- Some references to Player 2, Routine, Couple, and Versus - [#531](../../pull/531) -- Unused Lights file "Parallel_lights_io.dll" - [5b83340](../../commit/5b833401ad048e8ec672eb9232bee2052b0078cf) -- Unused Noteskin Folders (kickbox, para, techno, lights) - [7e18897](../../commit/7e188972c442ea9c2b8925de17248da1db0e0c19) -- Unused Stepmania files - [08adaec](../../commit/08adaec016efa5895627d8594da60b8b052c5b22) -### Fixed -- Banners didn't show up for some autocomplete cases - [edf8a72](../../commit/edf8a7257c0955f503c3aa31c5b42e73ed948b4a) -- Changing Judges on Evaluation didn't update CB Counts per hand - [4a3ec19](../../commit/4a3ec190b8d14eafd97d6f905d3f68b93c332c51) -- Chart Preview appeared again even after being turned off when changing style - [20bc0d4](../../commit/20bc0d4d9e634d1a2e9c8f44e9a525aaf2bf4a0a) -- Current Rate Sort on Chart Leaderboards was not sorted by Wife Percent - [12d1520](../../commit/12d152073c5f14609dce3f610561e81c2bb475ff) -- Differential Reloading disconnected the user from Multiplayer if it took more than 10 seconds - [#516](../../pull/516) -- Game was hanging sometimes due to the Audio Visualizer (Deadlocks) - [#536](../../pull/536) -- Game was stuttering when plugging or unplugging devices on Windows ([Issue 537](../../issues/537)) - [#539](../../pull/539) -- Game crashed when decompressing zip files (Pack Downloads) larger than 2GB - [2deae2d](../../commit/2deae2db37c581cb4bc7f52aae66658a5a73dc0a) -- Game crashed when opening Player Options if not hovering a Song - [e42c304](../../commit/e42c3049a1f6a563304e3a12030767cc2c368811) -- Game crashed when Songs picked in Multiplayer if the picked Song is filtered out by some means - [17dcfbc](../../commit/17dcfbc4d0f54cb81bd7c26110a6939f31760c62) [f19b168](../../commit/f19b1686a09aead81a32856368c16127b2cf18f3) -- Mac always hanged when disconnecting from multi ([Issue 475](../../issues/475)) -- Mac-specific cleanup functions for loading Songs broke some stuff - [1a31e74](../../commit/1a31e7441fe9e53476897b22e43f2bd5eb05e560) -- Multiplayer Chat disappeared when minimizing after scrolling up - [3efd130](../../commit/3efd13082a0ddde8c0f3626cb65099d9aa4b8422) -- Multiplayer Evaluation Scoreboard entries didn't always work ([Issue 462](../../issues/462)) - [#549](../../pull/549) [3b4b2a1](../../commit/3b4b2a1a94ac96f4a2bee95b0b5e408b6cf37fda) -- Multiplayer Evaluation Scoreboard entries showed an invalid date - [7dbd00c](../../commit/7dbd00c5851355996eae4b3af95d7ed0fac30980) -- Multiplayer Ready & Force buttons had weird Font issues for some builds - [45cd0a0](../../commit/45cd0a02672423e4a515dc956c54a6deac6f3e4a) -- MusicWheel Scrollbar was able to be clicked through the Til Death frame - [7bff5c3](../../commit/7bff5c3a0b713a20246314af2cf7a021c9de1162) -- Nonzero Visual Delay settings were affected by Song Rates ([Issue 485](../../issues/485)) - [#534](../../pull/534) -- Osu files with the Standard difficulty wouldn't load - [ed0c393](../../commit/ed0c39396a7e0d6885462238289ba69bedafa0ff) -- Practice Mode kept Judgment counts at all times, causing weird issues. - [4a5968d](../../commit/4a5968d8c50436c04af278eec29d30078d7343d7) [17ed183](../../commit/17ed1830974e91c2570c4d0ccee0d9614fa1f9f3) -- Practice Mode instantly judged every Tap since the beginning of the file every time you seek as a Miss - [72dbeb0](../../commit/72dbeb0e8730ea7dbe84c7d47f91203db132793c) -- Profile Stats (Play Time...) never updated unless finishing a Practice Mode play - [c1b8e06](../../commit/c1b8e06c80b8e5cc203ddfcf94ad8b44567bf8d4) -- Rare crash occurred when exiting Practice Mode due to Fail settings - [c16a0f5](../../commit/c16a0f5e63592ed56967a573b64b481eda20afc5) [6271e50](../../commit/6271e50c139369373a7bb8e56a3eccfa3fbb89aa) -- Replays used to have a slider that worked. It stopped working. - [14744f4](../../commit/14744f430e79f89e299b8cca6553460df8d35cdc) -- Replay Viewing Buttons were functional in Multiplayer, which is impossible - [997d844](../../commit/997d8448fa1a7f1a58bc8462d585f0d4c4e36ca0) -- Widescreen caused the target tracker, progress bar, and judgments to be offset in Gameplay - [3b27bf6](../../commit/3b27bf6fca39997732767a28b287040d31faa9f3) diff --git a/CHANGELOG.md b/CHANGELOG.md index 952468a50d..29e13dabbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # 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.66.1] - 2019-06-13 - Hotfix + +Windows x64, Windows i386, and Mac installer release. +- Bugfixes for various changes from the previous release. +- [Notes](.changelog/Release_0-66-1.md) + ## [0.66.0] - 2019-06-03 - Codebase Restructure & Quality of Life Patch 2 -Windows x64, Windows i386, and Mac installer future release. +Windows x64, Windows i386, and Mac installer release. - Restructure of the Repository. Added Asset Picker. Cleaned up code & multiplayer. -- [Notes](.changelog/Release_0-66.md) +- [Notes](.changelog/Release_0-66-0.md) ## [0.65.1] - 2019-03-10 - Quality of Life Patch diff --git a/CMake/CPack/Windows/ProductInfo.inc b/CMake/CPack/Windows/ProductInfo.inc index 54daccf74e..1bc349e21b 100644 --- a/CMake/CPack/Windows/ProductInfo.inc +++ b/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.66.0" +!define PRODUCT_VER "v0.66.1" !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}" !define PRODUCT_BITMAP "ett" diff --git a/CMakeLists.txt b/CMakeLists.txt index dbb00762a3..0f6ec6f732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ option(OPENSSL_ROOT_DIR "OpenSSL Root Directory" "") # PROJECT WIDE SETUP project(Etterna - VERSION 0.66.0 + VERSION 0.66.1 HOMEPAGE_URL https://github.com/etternagame/etterna/ LANGUAGES C CXX ASM) @@ -25,8 +25,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Export compile com set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo") # What configurations types do we want to support? (Changes what shows up in Visual Studio) set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Enable folders/filters within IDE's +## Ninja specific setup (Different compilers required different color force commands) if(CMAKE_GENERATOR STREQUAL "Ninja") - set(CMAKE_CXX_FLAGS "-fcolor-diagnostics") # Required flag to get color output from Ninja + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options("-fcolor-diagnostics") + elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_compile_options("-fdiagnostics-color=always") + endif() endif() ## Extern Library Variables @@ -43,12 +48,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CMake/Modules) # Tell CMake whe # Project Build Targets add_executable(Etterna) -## Source - Add source to the Etterna target -add_subdirectory(extern EXCLUDE_FROM_ALL) # EXCLUDE_FROM_ALL so those install components are not in out install compnenets -add_subdirectory(src/Etterna) -add_subdirectory(src/arch) -add_subdirectory(src/archutils) -add_subdirectory(src/RageUtil) +# Load external libraries +add_subdirectory(extern EXCLUDE_FROM_ALL) # EXCLUDE_FROM_ALL to exclude from cpack binary ## Setting Target Properties ### TODO: Temp output directories. Switch to out-of-source @@ -102,6 +103,12 @@ elseif(UNIX) include(CMake/Helpers/CMakeLinux.cmake) endif() +## Source - Add source to the Etterna target +add_subdirectory(src/Etterna) +add_subdirectory(src/arch) +add_subdirectory(src/archutils) +add_subdirectory(src/RageUtil) + # Static Analysis include(CMake/Helpers/StaticAnalysis.cmake) diff --git a/Data/splash.png b/Data/splash.png index ecb7c1977d..b1317da585 100644 Binary files a/Data/splash.png and b/Data/splash.png differ diff --git a/Docs/Building.md b/Docs/Building.md index 267aa2c26a..5071df24b6 100644 --- a/Docs/Building.md +++ b/Docs/Building.md @@ -124,17 +124,21 @@ cmake -DOPENSSL_ROOT_DIR="C:/OpenSSL-Win64" -G "Visual Studio 16 2019" -A x64 .. ### GUI Project Generation -![CMake Generation Window](images/cmake-gui-01.png "CMake Generation Window") - 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. +![CMake Generation Window](images/cmake-gui-01.png "CMake Generation Window") + **NOTE**: Setting `OPENSSL_ROOT_DIR` is unnecessary for linux users as CMake will find the location of OpenSSL on it's own. ![CMake Add Cache Entry Window](images/cmake-gui-02.png "CMake Add Cache Entry Window") **Windows Users**: Remember to change the value to correspond to the correct 32bit or 64bit version of the OpenSSL library. -Once `OPENSSL_ROOT_DIR` is added, click the buttons labeled `Configure` then `Generate` and you are ready to start coding. +Once `OPENSSL_ROOT_DIR` is added, click the buttons labeled `Configure`. The first time this button is clicked (and a `CMakeCache.txt` does not exit in the build directory), CMake will ask about what generator you would like to use. If a Visual Studio generator is chosen, you should also ensure the `Optional platform for generator` field is not empty. Select `x64` for 64bit and `Win32` for 32bit. Once `Finish` is clicked, the project will begin configuring. + +![CMakeSetup Window](images/cmake-gui-03.png "CMakeSetup Window") + +Finally, click `Generate` and you are ready to start coding. ## Compiling @@ -219,4 +223,4 @@ Doxygen within CMake is able to use [graphviz](https://www.graphviz.org/download ### LDoc -Etterna uses [LDoc](https://github.com/stevedonovan/LDoc) to generate Lua documentation. We reccomend installing [LuaRocks](https://github.com/luarocks/luarocks), and then installing LDoc through LuaRocks. Similar to Doxygen, it will only create the `ldoc` target if it can find the `ldoc` command in your system path. \ No newline at end of file +Etterna uses [LDoc](https://github.com/stevedonovan/LDoc) to generate Lua documentation. We reccomend installing [LuaRocks](https://github.com/luarocks/luarocks), and then installing LDoc through LuaRocks. Similar to Doxygen, it will only create the `ldoc` target if it can find the `ldoc` command in your system path. diff --git a/Docs/images/cmake-gui-03.png b/Docs/images/cmake-gui-03.png new file mode 100644 index 0000000000..8ecde21d27 Binary files /dev/null and b/Docs/images/cmake-gui-03.png differ diff --git a/Themes/Til Death/BGAnimations/MPscoreboard.lua b/Themes/Til Death/BGAnimations/MPscoreboard.lua index 0f0baa4965..fd1dcd4342 100644 --- a/Themes/Til Death/BGAnimations/MPscoreboard.lua +++ b/Themes/Til Death/BGAnimations/MPscoreboard.lua @@ -15,7 +15,6 @@ local function SetActivePlayer(locaIndex) item:GetChild("wife"):visible(not item:GetChild("wife"):GetVisible()) item:GetChild("combo"):visible(not item:GetChild("combo"):GetVisible()) item:GetChild("judge"):visible(not item:GetChild("judge"):GetVisible()) - item:GetChild("date"):visible(not item:GetChild("date"):GetVisible()) item:GetChild("option"):visible(not item:GetChild("option"):GetVisible()) end --Input event for mouse clicks @@ -47,7 +46,6 @@ local function Update(self) item:GetChild("combo"):visible(true) item:GetChild("judge"):visible(true) item:GetChild("clear"):visible(true) - item:GetChild("date"):visible(false) item:GetChild("option"):visible(false) end end diff --git a/Themes/Til Death/BGAnimations/ScreenAssetSettings underlay.lua b/Themes/Til Death/BGAnimations/ScreenAssetSettings underlay.lua index 5446bee44e..5b1054dd13 100644 --- a/Themes/Til Death/BGAnimations/ScreenAssetSettings underlay.lua +++ b/Themes/Til Death/BGAnimations/ScreenAssetSettings underlay.lua @@ -198,7 +198,7 @@ local function moveCursor(x, y) -- move the cursor end lastClickedIndex = curIndex if curPage == nextPage then - MESSAGEMAN:Broadcast("CursorMoved",{index = curIndex}) + MESSAGEMAN:Broadcast("CursorMoved",{index = curIndex, prevIndex = oldIndex}) else curPage = nextPage MESSAGEMAN:Broadcast("PageMoved",{index = curIndex, page = curPage}) @@ -410,9 +410,10 @@ local function assetBox(i) if lastClickedIndex == i then confirmPick() end + local prev = curIndex lastClickedIndex = i curIndex = i - MESSAGEMAN:Broadcast("CursorMoved",{index = i}) + MESSAGEMAN:Broadcast("CursorMoved",{index = i, prevIndex = prev}) end end } @@ -463,7 +464,7 @@ local function assetBox(i) end, CursorMovedMessageCommand = function(self, params) - if params.index == i and curType == 1 then + if params.index == i and curType == 1 and params.prevIndex ~= i then self:play() end end diff --git a/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua index e3bbd3a638..2db7077770 100644 --- a/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua @@ -504,23 +504,93 @@ function scoreBoard(pn, position) } end - t[#t + 1] = + if score:GetChordCohesion() == true then + t[#t + 1] = LoadFont("Common Large") .. + { + InitCommand = function(self) + self:xy(frameX + 3, frameY + 210):zoom(0.25):halign(0) + self:maxwidth(capWideScale(get43size(100), 160)/0.25) + end, + BeginCommand = function(self) + self:queuecommand("Set") + end, + ScoreChangedMessageCommand = function(self) + self:queuecommand("Set") + end, + SetCommand = function(self) + self:settext("Chord Cohesion on") + end + } + end + + --[[ + The following section first adds the ratioText and the maRatio. Then the paRatio is added and positioned. The right + values for maRatio and paRatio are then filled in. Finally ratioText and maRatio are aligned to paRatio. + --]] + local ratioText, maRatio, paRatio, marvelousTaps, perfectTaps, greatTaps + t[#t + 1] = + LoadFont("Common Large") .. { InitCommand = function(self) - self:xy(frameX + 40, frameY * 2.49):zoom(0.25):halign(0) - end, - BeginCommand = function(self) - self:queuecommand("Set") - end, - ScoreChangedMessageCommand = function(self) - self:queuecommand("Set") + ratioText = self + self:settext("MA/PA ratio:"):zoom(0.25):halign(1) + end + } + t[#t + 1] = + LoadFont("Common Large") .. + { + InitCommand = function(self) + maRatio = self + self:zoom(0.25):halign(1):diffuse(byJudgment(judges[1])) + end + } + t[#t + 1] = + LoadFont("Common Large") .. + { + InitCommand = function(self) + paRatio = self + self:xy(frameWidth + frameX, frameY + 210):zoom(0.25):halign(1):diffuse(byJudgment(judges[2])) + marvelousTaps = score:GetTapNoteScore(judges[1]) + perfectTaps = score:GetTapNoteScore(judges[2]) + greatTaps = score:GetTapNoteScore(judges[3]) + self:playcommand("Set") end, SetCommand = function(self) + -- Fill in maRatio and paRatio + maRatio:settextf("%.1f:1", marvelousTaps / perfectTaps) + paRatio:settextf("%.1f:1", perfectTaps / greatTaps) + + -- Align ratioText and maRatio to paRatio (self) + maRatioX = paRatio:GetX() - paRatio:GetZoomedWidth() - 10 + maRatio:xy(maRatioX, paRatio:GetY()) + + ratioTextX = maRatioX - maRatio:GetZoomedWidth() - 10 + ratioText:xy(ratioTextX, paRatio:GetY()) if score:GetChordCohesion() == true then - self:settext("Chord Cohesion: Yes") - else - self:settext("Chord Cohesion: No") + maRatio:maxwidth(maRatio:GetZoomedWidth()/0.25) + self:maxwidth(self:GetZoomedWidth()/0.25) + ratioText:maxwidth(capWideScale(get43size(65), 85)/0.27) + end + end, + CodeMessageCommand = function(self, params) + if params.Name == "PrevJudge" or params.Name == "NextJudge" then + if enabledCustomWindows then + marvelousTaps = getRescoredCustomJudge(dvt, customWindow.judgeWindows, 1) + perfectTaps = getRescoredCustomJudge(dvt, customWindow.judgeWindows, 2) + greatTaps = getRescoredCustomJudge(dvt, customWindow.judgeWindows, 3) + else + marvelousTaps = getRescoredJudge(dvt, judge, 1) + perfectTaps = getRescoredJudge(dvt, judge, 2) + greatTaps = getRescoredJudge(dvt, judge, 3) + end + self:playcommand("Set") + end + if params.Name == "ResetJudge" then + marvelousTaps = score:GetTapNoteScore(judges[1]) + perfectTaps = score:GetTapNoteScore(judges[2]) + greatTaps = score:GetTapNoteScore(judges[3]) + self:playcommand("Set") end end } diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua index 3e8b7c130f..ac9bfd734b 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua @@ -86,7 +86,6 @@ t[#t + 1] = end, MouseLeftClickMessageCommand = function(self) if group_rand ~= "" and isOver(self) then - math.randomseed(os.time()) local t = SONGMAN:GetSongsInGroup(group_rand) local random_song = t[math.random(#t)] SCREENMAN:GetTopScreen():GetMusicWheel():SelectSong(random_song) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua index d433d876dd..14031ae8e5 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua @@ -81,7 +81,6 @@ t[#t + 1] = end, MouseLeftClickMessageCommand = function(self) if isOver(self) then - math.randomseed(os.time()) local t = SONGMAN:GetAllSongs() local random_song = t[math.random(#t)] SCREENMAN:GetTopScreen():GetMusicWheel():SelectSong(random_song) diff --git a/Themes/Til Death/BGAnimations/_PlayerInfo.lua b/Themes/Til Death/BGAnimations/_PlayerInfo.lua index 39747aa022..175b0e567a 100644 --- a/Themes/Til Death/BGAnimations/_PlayerInfo.lua +++ b/Themes/Til Death/BGAnimations/_PlayerInfo.lua @@ -16,9 +16,11 @@ local AvatarY = SCREEN_HEIGHT - 50 local playerRating = 0 local setnewdisplayname = function(answer) - profile:RenameProfile(answer) - profileName = answer - MESSAGEMAN:Broadcast("ProfileRenamed", {doot = answer}) + if answer ~= "" then + profile:RenameProfile(answer) + profileName = answer + MESSAGEMAN:Broadcast("ProfileRenamed", {doot = answer}) + end end local function highlight(self) @@ -94,7 +96,7 @@ t[#t + 1] = end, SetCommand = function(self) self:settextf("%s: %5.2f", profileName, playerRating) - if profileName == "Default Profile" then + if profileName == "Default Profile" or profileName == "" then easyInputStringWithFunction( "Choose a profile display name\nClicking your name will allow you to change it:", 64, diff --git a/Themes/Til Death/Scripts/01 color_config.lua b/Themes/Til Death/Scripts/01 color_config.lua index 90bbb9444f..38327c112a 100644 --- a/Themes/Til Death/Scripts/01 color_config.lua +++ b/Themes/Til Death/Scripts/01 color_config.lua @@ -47,6 +47,12 @@ local defaultConfig = { Hard = "#ff6666", -- red Challenge = "#c97bff", -- Purple Edit = "#666666", -- gray + Difficulty_Crazy = "#cc66ff", + Difficulty_Freestyle = "#666666", + Difficulty_Nightmare = "#666666", + Crazy = "#cc66ff", + Freestyle = "#666666", + Nightmare = "#666666" }, difficultyVivid = { Difficulty_Beginner = "#0099ff", -- light blue @@ -61,6 +67,12 @@ local defaultConfig = { Hard = "#ff0000", -- red Challenge = "#cc66ff", -- Purple Edit = "#666666", -- gray + Difficulty_Crazy = "#cc66ff", + Difficulty_Freestyle = "#666666", + Difficulty_Nightmare = "#666666", + Crazy = "#cc66ff", + Freestyle = "#666666", + Nightmare = "#666666" }, grade = { Grade_Tier01 = "#66ccff", -- AAAA diff --git a/Themes/Til Death/Scripts/01 player_config.lua b/Themes/Til Death/Scripts/01 player_config.lua index d60579590a..9d7ac49ade 100644 --- a/Themes/Til Death/Scripts/01 player_config.lua +++ b/Themes/Til Death/Scripts/01 player_config.lua @@ -93,14 +93,16 @@ local defaultConfig = { ["5K"] = DeepCopy(defaultGameplayCoordinates), ["6K"] = DeepCopy(defaultGameplayCoordinates), ["7K"] = DeepCopy(defaultGameplayCoordinates), - ["8K"] = DeepCopy(defaultGameplayCoordinates) + ["8K"] = DeepCopy(defaultGameplayCoordinates), + ["10K"] = DeepCopy(defaultGameplayCoordinates) }, GameplaySizes = { ["4K"] = DeepCopy(defaultGameplaySizes), ["5K"] = DeepCopy(defaultGameplaySizes), ["6K"] = DeepCopy(defaultGameplaySizes), ["7K"] = DeepCopy(defaultGameplaySizes), - ["8K"] = DeepCopy(defaultGameplaySizes) + ["8K"] = DeepCopy(defaultGameplaySizes), + ["10K"] = DeepCopy(defaultGameplaySizes) } } @@ -120,6 +122,7 @@ playerConfig.load = function(self, slot) defaultConfig.GameplaySizes["6K"] = sizes defaultConfig.GameplaySizes["7K"] = sizes defaultConfig.GameplaySizes["8K"] = sizes + defaultConfig.GameplaySizes["10K"] = sizes end if coords and not coords["4K"] then defaultConfig.GameplayXYCoordinates["4K"] = coords @@ -127,6 +130,7 @@ playerConfig.load = function(self, slot) defaultConfig.GameplayXYCoordinates["6K"] = coords defaultConfig.GameplayXYCoordinates["7K"] = coords defaultConfig.GameplayXYCoordinates["8K"] = coords + defaultConfig.GameplayXYCoordinates["10K"] = coords end force_table_elements_to_match_type = tmp return tmp2(self, slot) diff --git a/Themes/Til Death/metrics.ini b/Themes/Til Death/metrics.ini index 20ddca7a01..3d717dba15 100644 --- a/Themes/Til Death/metrics.ini +++ b/Themes/Til Death/metrics.ini @@ -174,6 +174,7 @@ PrevScreen=Branch.LeavePackDownloader() ShowStyleIcon=false TimerSeconds=-1 ShowHelp=false +AllowStartToSkip=false [ScreenBundleSelect] Class="ScreenSplash" @@ -183,6 +184,7 @@ PrevScreen=Branch.LeavePackDownloader() ShowStyleIcon=false TimerSeconds=-1 ShowHelp=false +AllowStartToSkip=false [ScreenCoreBundleSelect] Class="ScreenSplash" diff --git a/Themes/_fallback/Graphics/Common splash.png b/Themes/_fallback/Graphics/Common splash.png index ecb7c1977d..b1317da585 100644 Binary files a/Themes/_fallback/Graphics/Common splash.png and b/Themes/_fallback/Graphics/Common splash.png differ diff --git a/Themes/_fallback/Graphics/Common window icon.png b/Themes/_fallback/Graphics/Common window icon.png index 08329dea34..302037112f 100644 Binary files a/Themes/_fallback/Graphics/Common window icon.png and b/Themes/_fallback/Graphics/Common window icon.png differ diff --git a/Themes/_fallback/Scripts/00 Utility.lua b/Themes/_fallback/Scripts/00 Utility.lua index 34bceb26f6..18a6811b38 100644 --- a/Themes/_fallback/Scripts/00 Utility.lua +++ b/Themes/_fallback/Scripts/00 Utility.lua @@ -298,6 +298,7 @@ function getCurrentKeyMode() StepsType_Dance_Solo = "6K", StepsType_Kb7_Single = "7K", StepsType_Dance_Double = "8K", + StepsType_Pump_Double = "10K" } local stepstype = GAMESTATE:GetCurrentSteps(PLAYER_1):GetStepsType() return keys[stepstype] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 48955a7fc7..5b36d14f96 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1187,12 +1187,12 @@ RowStartY=SCREEN_CENTER_Y-30 RowEndX=SCREEN_RIGHT-100 RowEndY=SCREEN_BOTTOM-96 QuestionX=SCREEN_CENTER_X -QuestionY=SCREEN_CENTER_Y-40 -QuestionOnCommand=wrapwidthpixels,600 +QuestionY=SCREEN_CENTER_Y-20 +QuestionOnCommand=wrapwidthpixels,600;valign,1 QuestionOffCommand= AnswerX=SCREEN_CENTER_X -AnswerY=SCREEN_CENTER_Y+20 -AnswerOnCommand=zoom,1.5;shadowlength,0 +AnswerY=SCREEN_CENTER_Y+10 +AnswerOnCommand=zoom,1.5;shadowlength,0;valign,0 AnswerOffCommand= CursorOnCommand= CursorOffCommand= diff --git a/src/Etterna/Actor/Gameplay/Background.cpp b/src/Etterna/Actor/Gameplay/Background.cpp index 04a0c99545..ac9c7afb5f 100644 --- a/src/Etterna/Actor/Gameplay/Background.cpp +++ b/src/Etterna/Actor/Gameplay/Background.cpp @@ -45,7 +45,7 @@ static Preference g_bShowDanger("ShowDanger", false); static Preference g_fBGBrightness("BGBrightness", 0.2f); static Preference g_RandomBackgroundMode( "RandomBackgroundMode", - BGMODE_RANDOMMOVIES); + BGMODE_OFF); static Preference g_iNumBackgrounds("NumBackgrounds", 10); static Preference g_bSongBackgrounds("SongBackgrounds", true); @@ -230,7 +230,7 @@ BackgroundImpl::Init() // bool bOneOrMoreChars = false; // if (bOneOrMoreChars && SHOW_DANCING_CHARACTERS) - // m_pDancingCharacters = new DancingCharacters; + // m_pDancingCharacters = new DancingCharacters; RageColor c = GetBrightnessColor(0); @@ -938,8 +938,8 @@ bool BackgroundImpl::IsDangerAllVisible() { // The players are never in danger in FAIL_OFF. - if (GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState) == - FailType_Off) return false; + if (GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState) == FailType_Off) + return false; if (!g_bShowDanger) return false; @@ -955,9 +955,11 @@ BrightnessOverlay::BrightnessOverlay() { float fQuadWidth = (RIGHT_EDGE - LEFT_EDGE); - m_quadBGBrightness.StretchTo( RectF(LEFT_EDGE,TOP_EDGE,LEFT_EDGE+fQuadWidth,BOTTOM_EDGE) ); - m_quadBGBrightnessFade.StretchTo( RectF(LEFT_EDGE+fQuadWidth,TOP_EDGE,RIGHT_EDGE-fQuadWidth,BOTTOM_EDGE) ); - + m_quadBGBrightness.StretchTo( + RectF(LEFT_EDGE, TOP_EDGE, LEFT_EDGE + fQuadWidth, BOTTOM_EDGE)); + m_quadBGBrightnessFade.StretchTo(RectF( + LEFT_EDGE + fQuadWidth, TOP_EDGE, RIGHT_EDGE - fQuadWidth, BOTTOM_EDGE)); + m_quadBGBrightness.SetName("BrightnessOverlay"); ActorUtil::LoadAllCommands(m_quadBGBrightness, "Background"); this->AddChild(&m_quadBGBrightness); @@ -982,8 +984,10 @@ BrightnessOverlay::Update(float fDeltaTime) void BrightnessOverlay::SetActualBrightness() { - float fLeftBrightness = 1-GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover; - float fRightBrightness = 1-GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover; + float fLeftBrightness = + 1 - GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover; + float fRightBrightness = + 1 - GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover; float fBaseBGBrightness = g_fBGBrightness; @@ -1005,9 +1009,9 @@ BrightnessOverlay::SetActualBrightness() RageColor LeftColor = GetBrightnessColor(fLeftBrightness); RageColor RightColor = GetBrightnessColor(fRightBrightness); - m_quadBGBrightness.SetDiffuse( LeftColor ); - m_quadBGBrightnessFade.SetDiffuseLeftEdge( LeftColor ); - m_quadBGBrightnessFade.SetDiffuseRightEdge( RightColor ); + m_quadBGBrightness.SetDiffuse(LeftColor); + m_quadBGBrightnessFade.SetDiffuseLeftEdge(LeftColor); + m_quadBGBrightnessFade.SetDiffuseRightEdge(RightColor); } void diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp index d325e36e2e..917690acd3 100644 --- a/src/Etterna/Singletons/DownloadManager.cpp +++ b/src/Etterna/Singletons/DownloadManager.cpp @@ -963,7 +963,7 @@ DownloadManager::UploadScore(HighScore* hs) } if (d.HasMember("data") && d["data"].IsObject() && d["data"].HasMember("type") && d["data"]["type"].IsString() && - d["data"]["type"].GetString() == "ssrResults") { + std::strcmp(d["data"]["type"].GetString(), "ssrResults") == 0) { hs->AddUploadedServer(serverURL.Get()); } }; @@ -1048,9 +1048,10 @@ DownloadManager::UploadScoreWithReplayData(HighScore* hs) return; } } + LOG->Trace(("fasdfsdafs request response: " + req.result).c_str()); if (d.HasMember("data") && d["data"].IsObject() && d["data"].HasMember("type") && d["data"]["type"].IsString() && - d["data"]["type"].GetString() == "ssrResults" && + std::strcmp(d["data"]["type"].GetString(), "ssrResults") == 0 && d["data"].HasMember("attributes") && d["data"]["attributes"].IsObject() && d["data"]["attributes"].HasMember("diff") && @@ -1172,7 +1173,7 @@ DownloadManager::UploadScoreWithReplayDataFromDisk(const string& sk, } if (d.HasMember("data") && d["data"].IsObject() && d["data"].HasMember("type") && d["data"]["type"].IsString() && - d["data"]["type"].GetString() == "ssrResults" && + std::strcmp(d["data"]["type"].GetString(), "ssrResults") == 0 && d["data"].HasMember("attributes") && d["data"]["attributes"].IsObject() && d["data"]["attributes"].HasMember("diff") && diff --git a/src/Etterna/Singletons/GameState.h b/src/Etterna/Singletons/GameState.h index 466590727d..c4bd234b27 100644 --- a/src/Etterna/Singletons/GameState.h +++ b/src/Etterna/Singletons/GameState.h @@ -175,13 +175,14 @@ class GameState * @return true if we do, or false otherwise. */ bool ShowW1() const; - - BroadcastOnChange m_sPreferredSongGroup; // GROUP_ALL denotes no preferred group - bool m_bFailTypeWasExplicitlySet; // true if FailType was changed in the song options screen - BroadcastOnChange m_PreferredStepsType; - BroadcastOnChange m_PreferredDifficulty; - BroadcastOnChange m_SortOrder; // set by MusicWheel - SortOrder m_PreferredSortOrder; // used by MusicWheel + BroadcastOnChange + m_sPreferredSongGroup; // GROUP_ALL denotes no preferred group + bool m_bFailTypeWasExplicitlySet; // true if FailType was changed in the + // song options screen + BroadcastOnChange m_PreferredStepsType; + BroadcastOnChange m_PreferredDifficulty; + BroadcastOnChange m_SortOrder; // set by MusicWheel + SortOrder m_PreferredSortOrder; // used by MusicWheel int m_iNumStagesOfThisSong; // Used by GameplayScreen to know if it needs to call NSMAN @@ -217,7 +218,7 @@ class GameState bool m_bLoadingNextSong; int GetLoadingCourseSongIndex() const; - RString GetEtternaVersion() { return "0.66.0"; } + RString GetEtternaVersion() { return "0.66.1"; } bool isplaylistcourse = false; bool IsPlaylistCourse() { return isplaylistcourse; } bool CountNotesSeparately(); diff --git a/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp b/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp index c67714fc93..ea5f979975 100644 --- a/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp +++ b/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp @@ -14,7 +14,9 @@ #include #include -REGISTER_SOUND_DRIVER_CLASS2(ALSA - sw, ALSA9_Software); +// clang-format off +REGISTER_SOUND_DRIVER_CLASS2(ALSA-sw, ALSA9_Software); +// clang-format on static const int channels = 2; static const int samples_per_frame = channels; diff --git a/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/src/arch/Sound/RageSoundDriver_DSound_Software.cpp index 84ce843333..e515ed56ca 100644 --- a/src/arch/Sound/RageSoundDriver_DSound_Software.cpp +++ b/src/arch/Sound/RageSoundDriver_DSound_Software.cpp @@ -8,7 +8,9 @@ #include "Etterna/Singletons/PrefsManager.h" #include "archutils/Win32/ErrorStrings.h" -REGISTER_SOUND_DRIVER_CLASS2(DirectSound - sw, DSound_Software); +// clang-format off +REGISTER_SOUND_DRIVER_CLASS2(DirectSound-sw, DSound_Software); +// clang-format on static const int channels = 2; static const int bytes_per_frame = channels * 2; /* 16-bit */