From db8880f53b6b3cefed81daa31e16006a6b5b746e Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Sun, 30 Jul 2023 16:23:49 -0400 Subject: [PATCH] Low Res Icon Improvements + Misc. Fixes & Additions (#515) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update issue template to include .riq/.zip info (#483) Co-authored-by: patata * Pull release 1 (#484) * Squashed commit of the following: commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Squashed commit of the following: commit 0d25221b71c3797a7447663f62e5b620898754fe Merge: 5869d212 9163085d Author: minenice55 Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit 9163085d7ab5bea1ab36d6c5659e08c968ecd87e Merge: 6592a5f2 5869d212 Author: minenice55 Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit 5869d212bcc3de47aff18e0334f1919d54cd7fa2 Author: patata Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit 6592a5f202f70bf483dd7274054dc0e9c6dd7b7f Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit 11a4c090a1ee0122d369d61ebb1637a86bb433f6 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit 45e7d81b0f32afc05022983e071ec8eab3b1d407 Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit 47efa3e4f38930b4bea2d6c04514603a97522e1b Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commit c6fb8880a0e8529e87b7f3b6dc4255ec676890db Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit 16ce508b03536aa82f2e3dbc616481d573c7d8bc Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit 37b80a33c7d242f35ca3dd65a8adc27f17c659e5 Author: minenice55 Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Editor Additions (#479) * favoriting and pick block favoriting needs to not break after previewing (maybe make it persistent in the settings file?) pick block needs to pick the icon, too. and preferably scroll to it as well * final star anim + automatic icon game switching before i make any more changes im making a checkpoint here cuz i know it works * i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block) * i'll have to figure out how to auto scroll to the game when the icon is selected * the star now fully works, even between preview switches :+1: * fix the rest of the stuff the event name gets colored correctly and hidden games are skipped over, but still loaded. also i built mm ass buns * tweaks + zoom and sorting this stuff will be in the pr desc so it doesn't matter * oop one more thing * icons look better now :D mipmaps to the rescue * double date fix * Merge pull request #486 from RHeavenStudio/actions_rework Rework GitHub Actions and build script * add ab meta to gitignore (#489) * Sound Scheduling Improvements (#491) * port conductor adjustments * scheduled sounds prebake * allow aiff files to be imported add vbr mp3 warning to readme * improve wording * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * new sorting stuff + better(?) icons also munchy monk sorting layer bug fixed and those useless folders deleted :) * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * Games fixes/reworks patch (#501) * ghosts are scaled now * Lockstep fully reworked * mr. bach has been implemented * Space dance fixes * oops * Tap trial rework part 1 * tap trial rework part 2 * oopsie * Gramps Talk Update * Space Dance Voice Offsets * Giraffe done! (Except miss anim) * bg is not showing up for some reason * bg not rendering fixed + giraffe fixed * scrolling done * fixed space dance and space soccer bg scrolls * fixed rockers bugs * adjustment * fixed el inaccuracies * particle fix * changed pitch and volume of monkey tap * miss anim * megamix face for girl * Proper miss anim implementation * Added force stepping event * miss anim fix --------- Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * Mahou Tsukai Rework (#502) * fixed not being able to whiff in tap trial * bored meeting fixes * more board meeting fix * ww now uses z axis instead of scale * Inputs are now reworked in mahou tsukai * Fixed the particle effect * Game Switch Black Flash is now beat-based. (#503) * Game switch flashes are now 0.25 beats long * ambient glow now turns black when the game switch flash is on * you can now set the void color, it doesn't work with game switch flashes * black * fixed! (#504) * Quiz Show and Tambourine Reworks (#505) * Tambourine fully reworked * quiz show rework part 1 * quiz show rework part 2 * oopsie doopsie * el fix numbah two * In CheerReaders.cs, quotation marks were aptly added, and references … (#506) * Update issue template to include .riq/.zip info (#483) Co-authored-by: patata * Pull release 1 (#484) * Squashed commit of the following: commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Squashed commit of the following: commit 0d25221b71c3797a7447663f62e5b620898754fe Merge: 5869d212 9163085d Author: minenice55 Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit 9163085d7ab5bea1ab36d6c5659e08c968ecd87e Merge: 6592a5f2 5869d212 Author: minenice55 Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit 5869d212bcc3de47aff18e0334f1919d54cd7fa2 Author: patata Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit 6592a5f202f70bf483dd7274054dc0e9c6dd7b7f Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit 11a4c090a1ee0122d369d61ebb1637a86bb433f6 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit 45e7d81b0f32afc05022983e071ec8eab3b1d407 Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit 47efa3e4f38930b4bea2d6c04514603a97522e1b Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commit c6fb8880a0e8529e87b7f3b6dc4255ec676890db Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit 16ce508b03536aa82f2e3dbc616481d573c7d8bc Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit 37b80a33c7d242f35ca3dd65a8adc27f17c659e5 Author: minenice55 Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Editor Additions (#479) * favoriting and pick block favoriting needs to not break after previewing (maybe make it persistent in the settings file?) pick block needs to pick the icon, too. and preferably scroll to it as well * final star anim + automatic icon game switching before i make any more changes im making a checkpoint here cuz i know it works * i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block) * i'll have to figure out how to auto scroll to the game when the icon is selected * the star now fully works, even between preview switches :+1: * fix the rest of the stuff the event name gets colored correctly and hidden games are skipped over, but still loaded. also i built mm ass buns * tweaks + zoom and sorting this stuff will be in the pr desc so it doesn't matter * oop one more thing * icons look better now :D mipmaps to the rescue * double date fix * Merge pull request #486 from RHeavenStudio/actions_rework Rework GitHub Actions and build script * add ab meta to gitignore (#489) * Sound Scheduling Improvements (#491) * port conductor adjustments * scheduled sounds prebake * allow aiff files to be imported add vbr mp3 warning to readme * improve wording * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * Games fixes/reworks patch (#501) * ghosts are scaled now * Lockstep fully reworked * mr. bach has been implemented * Space dance fixes * oops * Tap trial rework part 1 * tap trial rework part 2 * oopsie * Gramps Talk Update * Space Dance Voice Offsets * Giraffe done! (Except miss anim) * bg is not showing up for some reason * bg not rendering fixed + giraffe fixed * scrolling done * fixed space dance and space soccer bg scrolls * fixed rockers bugs * adjustment * fixed el inaccuracies * particle fix * changed pitch and volume of monkey tap * miss anim * megamix face for girl * Proper miss anim implementation * Added force stepping event * miss anim fix --------- Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * In CheerReaders.cs, quotation marks were aptly added, and references to the girls were more-so neutralized. Consider this my cheer. * revert capitalization and quotations while keeping grammar changes --------- Co-authored-by: minenice55 Co-authored-by: patata Co-authored-by: AstrlJelly Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * oops * add manually triggering build action to workflows (#507) * finally. FixIcons is real (+ a few things) * import icons at 256x256 -at 1080p and default zoom they are roughly 70 pixels wide. they do NOT need 1024x1024 to do what they need to do, and they look better anyways * offbeat lightbulb sfx fix for karate man * the way i did bopping for pajama party was stupid. i fixed that * added a check in AnimationHelpers.cs for looping animations -tbh crazy it wasn't added sooner cuz ive come across this problem so many times before * oops messed up seesaw's material * account for icons added during runtime as long as an icon is added through AddIcon() in Editor.cs it will be account for in the searching/sorting code * oops messed up on the mg.inferred * fix object ref in inspector --------- Co-authored-by: minenice55 Co-authored-by: patata Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> Co-authored-by: Xylon <40894547+scriptorluminary@users.noreply.github.com> --- Animations.meta | 8 - Assets/Resources/Games/munchyMonk.prefab | 8 +- .../Editor/GameIcons/RhythmTweezers.png.meta | 8 +- .../GameIcons/RhythmTweezers_mask.png.meta | 8 +- .../Editor/GameIcons/Tram&Pauline.png.meta | 8 +- .../GameIcons/Tram&Pauline_mask.png.meta | 8 +- .../Editor/GameIcons/airRally.png.meta | 8 +- .../Editor/GameIcons/airRally_mask.png.meta | 10 +- .../Editor/GameIcons/blueBear.png.meta | 8 +- .../Editor/GameIcons/blueBear_mask.png.meta | 10 +- .../Editor/GameIcons/boardMeeting.png.meta | 10 +- .../GameIcons/boardMeeting_mask.png.meta | 12 +- .../Editor/GameIcons/builtToScaleDS.png.meta | 8 +- .../GameIcons/builtToScaleDS_mask.png.meta | 10 +- .../Editor/GameIcons/catchyTune.png.meta | 8 +- .../Editor/GameIcons/catchyTune_mask.png.meta | 10 +- .../Editor/GameIcons/cheerReaders.png.meta | 8 +- .../GameIcons/cheerReaders_mask.png.meta | 10 +- .../Editor/GameIcons/clappyTrio.png.meta | 8 +- .../Editor/GameIcons/clappyTrio_mask.png.meta | 10 +- .../Editor/GameIcons/coinToss.png.meta | 8 +- .../Editor/GameIcons/coinToss_mask.png.meta | 10 +- .../Sprites/Editor/GameIcons/countIn.png.meta | 8 +- .../Editor/GameIcons/countIn_mask.png.meta | 8 +- .../Editor/GameIcons/cropStomp.png.meta | 10 +- .../Editor/GameIcons/cropStomp_mask.png.meta | 10 +- .../Editor/GameIcons/djSchool.png.meta | 10 +- .../Editor/GameIcons/djSchool_mask.png.meta | 10 +- .../Editor/GameIcons/dogNinja.png.meta | 12 +- .../Editor/GameIcons/dogNinja_Mask.png.meta | 12 +- .../Editor/GameIcons/doubleDate.png.meta | 10 +- .../Editor/GameIcons/doubleDate_mask.png.meta | 10 +- .../GameIcons/drummingPractice.png.meta | 10 +- .../GameIcons/drummingPractice_mask.png.meta | 10 +- .../Sprites/Editor/GameIcons/fanClub.png.meta | 8 +- .../Editor/GameIcons/fanClub_mask.png.meta | 8 +- .../Editor/GameIcons/fireworks.png.meta | 8 +- .../Editor/GameIcons/fireworks_mask.png.meta | 8 +- .../Editor/GameIcons/firstContact.png.meta | 8 +- .../GameIcons/firstContact_mask.png.meta | 8 +- .../Editor/GameIcons/flipperFlop.png.meta | 10 +- .../GameIcons/flipperFlop_mask.png.meta | 10 +- .../Editor/GameIcons/forkLifter.png.meta | 8 +- .../Editor/GameIcons/forkLifter_mask.png.meta | 8 +- .../Editor/GameIcons/gameManager.png.meta | 10 +- .../GameIcons/gameManager_mask.png.meta | 8 +- .../Editor/GameIcons/gleeClub.png.meta | 8 +- .../Editor/GameIcons/gleeClub_mask.png.meta | 8 +- .../Editor/GameIcons/karateman.png.meta | 8 +- .../Editor/GameIcons/karateman_mask.png.meta | 8 +- .../Sprites/Editor/GameIcons/kitties.jpg.meta | 10 +- .../Sprites/Editor/GameIcons/kitties.png.meta | 8 +- .../Editor/GameIcons/kitties_mask.png.meta | 8 +- .../GameIcons/launch party_mask.png.meta | 8 +- .../Editor/GameIcons/launchParty.png.meta | 10 +- .../GameIcons/launchParty_mask.png.meta | 10 +- .../Editor/GameIcons/lockstep.png.meta | 8 +- .../Editor/GameIcons/lockstep_mask.png.meta | 8 +- .../Editor/GameIcons/marchingOrders.png.meta | 8 +- .../GameIcons/marchingOrders_mask.png.meta | 8 +- .../Editor/GameIcons/meatGrinder.png.meta | 10 +- .../GameIcons/meatGrinder_mask.png.meta | 10 +- .../Editor/GameIcons/mrUpbeat.png.meta | 8 +- .../Editor/GameIcons/mrUpbeat_mask.png.meta | 8 +- .../Editor/GameIcons/munchyMonk.png.meta | 10 +- .../Editor/GameIcons/munchyMonk_mask.png.meta | 10 +- .../Editor/GameIcons/octopusMachine.png.meta | 10 +- .../GameIcons/octopusMachine_mask.png.meta | 10 +- .../Editor/GameIcons/oldGameManager.png.meta | 8 +- .../Editor/GameIcons/pajamaParty.png.meta | 8 +- .../GameIcons/pajamaParty_mask.png.meta | 8 +- .../Editor/GameIcons/quizShow.png.meta | 10 +- .../Editor/GameIcons/quizShow_mask.png.meta | 10 +- .../Editor/GameIcons/rhythmRally.png.meta | 8 +- .../GameIcons/rhythmRally_mask.png.meta | 8 +- .../Editor/GameIcons/rhythmSomen.png.meta | 8 +- .../GameIcons/rhythmSomen_mask.png.meta | 8 +- .../Editor/GameIcons/ringside.png.meta | 8 +- .../Editor/GameIcons/ringside_mask.png.meta | 8 +- .../Sprites/Editor/GameIcons/rockers.png.meta | 10 +- .../Editor/GameIcons/rockers_mask.png.meta | 10 +- .../Editor/GameIcons/samuraiSliceNtr.png.meta | 8 +- .../GameIcons/samuraiSliceNtr_mask.png.meta | 8 +- .../Sprites/Editor/GameIcons/seeSaw.png.meta | 10 +- .../Editor/GameIcons/seeSaw_mask.png.meta | 10 +- .../Editor/GameIcons/sneakySpirits.png.meta | 8 +- .../GameIcons/sneakySpirits_mask.png.meta | 8 +- .../Editor/GameIcons/spaceDance.png.meta | 8 +- .../Editor/GameIcons/spaceDance_mask.png.meta | 8 +- .../Editor/GameIcons/spaceSoccer.png.meta | 8 +- .../GameIcons/spaceSoccer_mask.png.meta | 8 +- .../Editor/GameIcons/spaceball.png.meta | 8 +- .../Editor/GameIcons/spaceball_mask.png.meta | 8 +- .../Editor/GameIcons/tambourine.png.meta | 8 +- .../Editor/GameIcons/tambourine_mask.png.meta | 8 +- .../Editor/GameIcons/tapTrial.png.meta | 8 +- .../Editor/GameIcons/tapTrial_mask.png.meta | 8 +- .../Editor/GameIcons/tapTroupe.png.meta | 8 +- .../Editor/GameIcons/tapTroupe_mask.png.meta | 8 +- .../Editor/GameIcons/theDazzles.png.meta | 8 +- .../Editor/GameIcons/theDazzles_mask.png.meta | 8 +- .../Editor/GameIcons/tossBoys.png.meta | 10 +- .../Editor/GameIcons/tossBoys_mask.png.meta | 10 +- .../Editor/GameIcons/trickClass.png.meta | 8 +- .../Editor/GameIcons/trickClass_mask.png.meta | 8 +- .../Sprites/Editor/GameIcons/tunnel.png.meta | 8 +- .../Editor/GameIcons/tunnel_mask.png.meta | 8 +- .../Sprites/Editor/GameIcons/vfx.png.meta | 8 +- .../Editor/GameIcons/vfx_mask.png.meta | 8 +- .../Editor/GameIcons/wizardsWaltz.png.meta | 8 +- .../GameIcons/wizardsWaltz_mask.png.meta | 8 +- .../Editor/GameIcons/workingDough.png.meta | 8 +- .../GameIcons/workingDough_mask.png.meta | 8 +- Assets/Resources/Sprites/Editor/UI/a-z.png | Bin 0 -> 10768 bytes .../Resources/Sprites/Editor/UI/a-z.png.meta | 123 ++ Assets/Resources/Sprites/Editor/UI/clock.png | Bin 0 -> 16054 bytes .../Sprites/Editor/UI/clock.png.meta | 123 ++ Assets/Resources/Sprites/Editor/UI/sort.png | Bin 6042 -> 11338 bytes Assets/Scenes/Editor.unity | 1086 ++++++++++++++++- Assets/Scripts/Games/KarateMan/KarateMan.cs | 7 +- .../Scripts/Games/PajamaParty/PajamaParty.cs | 31 +- Assets/Scripts/LevelEditor/Editor.cs | 17 +- .../EventSelector/EventParameterManager.cs | 2 +- .../EventSelector/GridGameSelector.cs | 183 ++- Assets/Scripts/Util/AnimationHelpers.cs | 8 +- Effects.meta | 8 - ProjectSettings/QualitySettings.asset | 2 +- 127 files changed, 1920 insertions(+), 658 deletions(-) delete mode 100644 Animations.meta create mode 100644 Assets/Resources/Sprites/Editor/UI/a-z.png create mode 100644 Assets/Resources/Sprites/Editor/UI/a-z.png.meta create mode 100644 Assets/Resources/Sprites/Editor/UI/clock.png create mode 100644 Assets/Resources/Sprites/Editor/UI/clock.png.meta delete mode 100644 Effects.meta diff --git a/Animations.meta b/Animations.meta deleted file mode 100644 index 05bb8aa1..00000000 --- a/Animations.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d5334cc15a6008848a27a1314dca7d3f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Games/munchyMonk.prefab b/Assets/Resources/Games/munchyMonk.prefab index bfd8837a..5411885c 100644 --- a/Assets/Resources/Games/munchyMonk.prefab +++ b/Assets/Resources/Games/munchyMonk.prefab @@ -4720,7 +4720,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 160 + m_SortingOrder: 180 m_Sprite: {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4804,7 +4804,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 180 m_Sprite: {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5222,7 +5222,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 200 m_Sprite: {fileID: 1229315381013837462, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6760,7 +6760,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 250 m_Sprite: {fileID: -5862641300611582602, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta index c82d2335..fb3e7961 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta index 1f6551b2..27f2adf3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta index e5655bae..f5acf090 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta index 1b418c0e..9ef7875b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta index 75cfab9d..de5c15d2 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta index 7732774b..88e9f4a3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/blueBear.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/blueBear.png.meta index f20c7cac..956efff5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/blueBear.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/blueBear.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta index c04f1e3d..a3adef01 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting.png.meta index 39979dee..91f22bf9 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting_mask.png.meta index f23caa29..7aa45776 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/boardMeeting_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta index 23f8146e..d391d035 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta index ccfd4a90..bc309fea 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png.meta index 00671f93..f985a346 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta index 23bbd47d..28999b74 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta index b65b6d76..6edeb3a5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta index 02add5ce..213ce7cd 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio.png.meta index ef5ed88e..e6f7f589 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta index 577bdd6b..d722299a 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta index 5ad30002..32df0441 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta index 7e4f26cd..a88a57ef 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta @@ -5,16 +5,16 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta index 6b487610..5f56d128 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta index 0795ca5e..9b9999ca 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -14,7 +14,7 @@ TextureImporter: mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceEnd: 0 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp.png.meta index ef290cf6..61b76a5d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta index bb2a56e6..4dada19b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/djSchool.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/djSchool.png.meta index 9517d951..c527f7cd 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/djSchool.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/djSchool.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta index 8bb0fa4c..dd210ec3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/dogNinja.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/dogNinja.png.meta index acb98ac5..da50ce32 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/dogNinja.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/dogNinja.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/dogNinja_Mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/dogNinja_Mask.png.meta index 170eac6c..32001bb6 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/dogNinja_Mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/dogNinja_Mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta index c6623a2d..8eeaa635 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta index 79f6086b..ead0cac3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta index 46c1f810..df25c116 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta index 5855c00c..081f4839 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 8 mipBias: 0 wrapU: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta index 8d7cfdd0..5f0cd6e5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta index 914393d8..92c6a7fc 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fireworks.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fireworks.png.meta index a176edca..432d0ef4 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/fireworks.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/fireworks.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta index b8ac63c7..09cf546b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta index 68af3f28..7ba847d4 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta index a25bbb54..1b402893 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop.png.meta index 809dcfdc..251f49e6 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop_mask.png.meta index 766d9862..c6aa12b1 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/flipperFlop_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png.meta index 2b3e57ce..fc0df8ba 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta index 373d178f..89b445ee 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta index cdbf9e40..68861589 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta index 66db232b..8cca6583 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gleeClub.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gleeClub.png.meta index 73dbbb42..5453790d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/gleeClub.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/gleeClub.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gleeClub_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gleeClub_mask.png.meta index 686742ba..f92af36f 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/gleeClub_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/gleeClub_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/karateman.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/karateman.png.meta index 4c8aa8f4..0f2cbdbc 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/karateman.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/karateman.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta index 44e0f64f..980c1fd5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties.jpg.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties.jpg.meta index c8764515..ccdfb7e2 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/kitties.jpg.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties.jpg.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta index d518d638..107b03c5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta index 79cf7cd7..fbbf885c 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta index 21d90c78..f5ccfafb 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launchParty.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launchParty.png.meta index 99b13237..ec31ea9d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/launchParty.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/launchParty.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launchParty_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launchParty_mask.png.meta index d11254fa..ffc8c8f1 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/launchParty_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/launchParty_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta index fc578878..1d1be107 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta index 35cdf8fc..2aabbde7 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta index aae3344f..7c3b8fd1 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta index fa24f324..0b2500cb 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder.png.meta index 05bcfbca..cae465f0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder_mask.png.meta index 39d5b158..e495376b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/meatGrinder_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta index c51fcff3..60a3c011 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta index 425919f1..890fec9e 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk.png.meta index 7eb6412e..dc5b3027 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta index 0687e075..c8d70daf 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine.png.meta index 34719637..a5276445 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine_mask.png.meta index 0ebd3e43..a49f9bf2 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/octopusMachine_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/oldGameManager.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/oldGameManager.png.meta index 56a406f5..742d1444 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/oldGameManager.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/oldGameManager.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta index bbeb0532..a24cbf31 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta index 608387ec..d58fc5be 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/quizShow.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/quizShow.png.meta index 25396c9a..2cfab106 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/quizShow.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/quizShow.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/quizShow_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/quizShow_mask.png.meta index 6247f6a0..8fa55153 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/quizShow_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/quizShow_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta index a7d06af7..f0addc46 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta index 6a82ce29..edc23e5c 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta index 141e97c5..8360c9c5 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta index 040d0c04..a41d0219 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/ringside.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/ringside.png.meta index 284ea6da..b01a6c2b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/ringside.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/ringside.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/ringside_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/ringside_mask.png.meta index dc7b5e9f..be170476 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/ringside_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/ringside_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rockers.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rockers.png.meta index edbe319a..b42d1fe4 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rockers.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rockers.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rockers_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rockers_mask.png.meta index 28297b99..4ce6ae9d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rockers_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rockers_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta index 1248052c..17ea0dd7 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta index 9844e90d..69db09bb 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/seeSaw.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/seeSaw.png.meta index 643d253e..39de858f 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/seeSaw.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/seeSaw.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/seeSaw_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/seeSaw_mask.png.meta index 48dd3276..bc63fd19 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/seeSaw_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/seeSaw_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta index de095a26..9de7135e 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta index 2c326318..e51b3e1c 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance.png.meta index e91f82e7..c4a80722 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta index 16ecc315..25706949 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer.png.meta index 68bf3e08..bdcfbbff 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta index ed08db75..2a5e69d0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png.meta index 048a34a4..be7a0592 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta index 51059de4..2715765d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tambourine.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tambourine.png.meta index 85f8f97e..816f2deb 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tambourine.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tambourine.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tambourine_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tambourine_mask.png.meta index 79efc914..77ce16f0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tambourine_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tambourine_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial.png.meta index eedf7218..2d67c1a2 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta index 7e663c5f..0773af77 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe.png.meta index 0cc00589..7a9b6cfb 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe_mask.png.meta index 476a3ffa..09dda05a 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tapTroupe_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/theDazzles.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/theDazzles.png.meta index 63160e85..56956fc4 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/theDazzles.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/theDazzles.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/theDazzles_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/theDazzles_mask.png.meta index c4061ba5..eb7ace15 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/theDazzles_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/theDazzles_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tossBoys.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tossBoys.png.meta index b0f77281..9a1a030a 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tossBoys.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tossBoys.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tossBoys_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tossBoys_mask.png.meta index 5ad8f84a..d722d7c0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tossBoys_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tossBoys_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta index 9a4cd993..45a1a673 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta index 2612d5c8..8088e7a8 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta index 39249620..9e9b791e 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta index 599a1cd8..2ec48865 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta index ab07f827..13ace5a3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta index 4883a28a..f0fd4e29 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta index ac221a30..9b420054 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta index 57ae3dd3..a84a3527 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta index 3a8f900b..2f128bcf 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/workingDough_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/workingDough_mask.png.meta index 303fa6b4..ecc49498 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/workingDough_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/workingDough_mask.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 0 linearTexture: 0 @@ -13,8 +13,8 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 0 - mipMapFadeDistanceEnd: 2 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/UI/a-z.png b/Assets/Resources/Sprites/Editor/UI/a-z.png new file mode 100644 index 0000000000000000000000000000000000000000..d9357dc19e03cc7f7594f35058d021723c028e5f GIT binary patch literal 10768 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 q1gq>rZhv0^XIq# literal 6042 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.SetBulbColor(c); else mobj.GetComponent().SetBulbColor(LightBulbColors[type]); + + string outSound = "karateman/" + ((beat + 0.5) % 1 == 0 ? "offbeatLightbulbOut" : "lightbulbOut"); SoundByte.PlayOneShotGame(outSound, forcePlay: true); } diff --git a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs index 2ff7dfe9..0ca7b329 100644 --- a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs +++ b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs @@ -184,22 +184,27 @@ namespace HeavenStudio.Games public void Bop(double beat, double length, bool doesBop, bool autoBop) { - void Bops(bool bop) { - Mako.shouldBop = bop; - for (int y = 0; y < 5; y++) { - for (int x = 0; x < 5; x++) { - if (!(y == 0 && x == 2)) monkeys[x, y].shouldBop = bop; - } + Mako.shouldBop = autoBop; + for (int y = 0; y < 5; y++) { + for (int x = 0; x < 5; x++) { + if (!(y == 0 && x == 2)) monkeys[x, y].shouldBop = autoBop; } } - Bops(autoBop || doesBop); - if (!autoBop && doesBop) { - BeatAction.New(gameObject, new List() { - new BeatAction.Action(beat + length, delegate { - Bops(false); - }) - }); + if (doesBop) { + var actions = new List(); + for (int i = 0; i < length; i++) + { + actions.Add(new BeatAction.Action(beat + i, delegate { + Mako.anim.DoScaledAnimationAsync("MakoBeat", 0.5f); + for (int y = 0; y < 5; y++) { + for (int x = 0; x < 5; x++) { + if (!(y == 0 && x == 2)) monkeys[x, y].anim.DoScaledAnimationAsync("MonkeyBeat", 0.5f); + } + } + })); + } + BeatAction.New(gameObject, actions); } } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 8ae6633a..670855b9 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -35,7 +35,7 @@ namespace HeavenStudio.Editor [Header("Rect")] [SerializeField] private RenderTexture ScreenRenderTexture; [SerializeField] private RawImage Screen; - [SerializeField] private RectTransform GridGameSelector; + [SerializeField] private RectTransform GridGameSelectorRect; public RectTransform eventSelectorBG; [Header("Components")] @@ -55,7 +55,10 @@ namespace HeavenStudio.Editor [SerializeField] private Button TempoFinderBTN; [SerializeField] private Button SnapDiagBTN; [SerializeField] private Button ChartParamBTN; - [SerializeField] private Button SortGamesBTN; + [SerializeField] private Button SortAlphabetBTN; + [SerializeField] private Button SortFavoritesBTN; + [SerializeField] private Button SortChronologicBTN; + [SerializeField] private TMP_InputField SearchBar; [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button EditorSettingsBTN; @@ -112,7 +115,10 @@ namespace HeavenStudio.Editor Tooltip.AddTooltip(TempoFinderBTN.gameObject, "Tempo Finder"); Tooltip.AddTooltip(SnapDiagBTN.gameObject, "Snap Settings"); Tooltip.AddTooltip(ChartParamBTN.gameObject, "Remix Properties"); - Tooltip.AddTooltip(SortGamesBTN.gameObject, "Sort By Favorite"); + Tooltip.AddTooltip(SortAlphabetBTN.gameObject, "Sort Alphabetically"); + Tooltip.AddTooltip(SortFavoritesBTN.gameObject, "Sort By Favorite"); + Tooltip.AddTooltip(SortChronologicBTN.gameObject, "Sort Chronologically"); + Tooltip.AddTooltip(SearchBar.gameObject, "Search Games"); Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings [Ctrl+Shift+O]"); UpdateEditorStatus(true); @@ -126,12 +132,15 @@ namespace HeavenStudio.Editor public void AddIcon(Minigames.Minigame minigame) { if (minigame.hidden) return; - GameObject GameIcon_ = Instantiate(GridGameSelector.GetChild(0).gameObject, GridGameSelector); + GameObject GameIcon_ = Instantiate(GridGameSelectorRect.GetChild(0).gameObject, GridGameSelectorRect); GameIcon_.GetComponent().sprite = GameIcon(minigame.name); GameIcon_.GetComponent().MaskTex = GameIconMask(minigame.name); GameIcon_.GetComponent().UnClickIcon(); GameIcon_.gameObject.SetActive(true); GameIcon_.name = minigame.name; + + var ggs = GridGameSelectorRect.GetComponent(); + (minigame.fxOnly ? ggs.fxActive : ggs.mgsActive).Add(GameIcon_.GetComponent()); } public void LateUpdate() diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs index 347663df..67494a26 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs @@ -60,7 +60,7 @@ namespace HeavenStudio.Editor eventSelector.SetActive(true); DestroyParams(); - Editor.instance.SetGameEventTitle($"Select game event for {gridGameSelector.SelectedMinigame.Replace("\n", "")}"); + Editor.instance.SetGameEventTitle($"Select game event for {gridGameSelector.SelectedMinigame.displayName.Replace("\n", "")}"); } public void StartParams(RiqEntity entity) diff --git a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs index 98b08e86..7aea1f31 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; @@ -10,30 +11,30 @@ using Starpelly; using HeavenStudio.Editor.Track; - namespace HeavenStudio.Editor { public class GridGameSelector : MonoBehaviour { - public string SelectedMinigame; + public Minigames.Minigame SelectedMinigame; [Header("Components")] public GameObject SelectedGameIcon; public GameObject GameEventSelector; public GameObject EventRef; public GameObject CurrentSelected; - public GameObject Scrollbar; + public Scrollbar Scrollbar; public RectTransform GameSelectionRect; public RectTransform GameEventSelectorCanScroll; + public TMP_InputField SearchBar; private RectTransform GameEventSelectorRect; private RectTransform eventsParent; [Header("Properties")] [SerializeField] private int currentEventIndex; - private Minigames.Minigame mg; + public List mgsActive = new List(); + public List fxActive = new List(); public float posDif; public int ignoreSelectCount; - private int sortStatus; private int dragTimes; private bool gameOpen; private float selectorHeight; @@ -49,9 +50,7 @@ namespace HeavenStudio.Editor eventSize = EventRef.GetComponent().rect.height; eventsParent = EventRef.transform.parent.GetChild(2).GetComponent(); - SelectGame("gameManager"); - - //SetColors(); + SelectGame(fxActive[0].name); } private void Update() @@ -119,25 +118,25 @@ namespace HeavenStudio.Editor SetColors(); } - // will automatically select game + game icon, and scroll to the game if it's offscreen + // will automatically select game + game icon, and (eventually?) scroll to the game if it's offscreen // index is the event it will highlight (which was basically just added for pick block) - // TODO: automatically scroll if the game is offscreen, because i can't figure it out/can't figure out a good way to do it rn. -AJ + // TODO: automatically scroll if the game is offscreen, because i can't figure out a good way to do it rn. -AJ public void SelectGame(string gameName, int index = 0) { - EventParameterManager.instance.Disable(); if (SelectedGameIcon != null) { SelectedGameIcon.GetComponent().UnClickIcon(); } - mg = EventCaller.instance.GetMinigame(gameName); - if (mg == null) { + SelectedMinigame = EventCaller.instance.GetMinigame(gameName); + if (SelectedMinigame == null) { SelectGame("gameManager"); Debug.LogWarning($"SelectGame() has failed, did you mean to input '{gameName}'?"); return; } - - SelectedMinigame = gameName; + + EventParameterManager.instance.Disable(); + gameOpen = true; DestroyEvents(); @@ -149,21 +148,12 @@ namespace HeavenStudio.Editor currentEventIndex = index; UpdateIndex(index, false); - Editor.instance?.SetGameEventTitle($"Select game event for {mg.displayName.Replace("\n", "")}"); - - // should auto scroll if it's offscreen - // just barely doesn't work, and works even less with zooming. im sure there's a much better way to do it - /* - var pos = 1 - ((mgIndex / 4)-0.02f) / (Mathf.Ceil(mgsActive / 4) - 3); - var posMin = (pos + Viewport.rect.height); //+ (pos * 0.01f); - if (Scrollbar.value < pos) Scrollbar.value = pos; - else if (Scrollbar.value > posMin) Scrollbar.value = posMin; - */ + Editor.instance?.SetGameEventTitle($"Select game event for {SelectedMinigame.displayName.Replace("\n", "")}"); } private void AddEvents(int index = 0) { - if (!EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(mg.name))) + if (!EventCaller.FXOnlyGames().Contains(SelectedMinigame)) { GameObject sg = Instantiate(EventRef, eventsParent); sg.GetComponent().text = "Switch Game"; @@ -171,14 +161,14 @@ namespace HeavenStudio.Editor if (index == 0) sg.GetComponent().color = EditorTheme.theme.properties.EventSelectedCol.Hex2RGB(); } else { index++; - if (mg.name == "gameManager") index++; + if (SelectedMinigame.name == "gameManager") index++; } - for (int i = 0; i < mg.actions.Count; i++) + for (int i = 0; i < SelectedMinigame.actions.Count; i++) { - if (mg.actions[i].actionName == "switchGame" || mg.actions[i].hidden) continue; + if (SelectedMinigame.actions[i].actionName == "switchGame" || SelectedMinigame.actions[i].hidden) continue; GameObject g = Instantiate(EventRef, eventsParent); - g.GetComponent().text = mg.actions[i].displayName; + g.GetComponent().text = SelectedMinigame.actions[i].displayName; g.SetActive(true); if (index - 1 == i) g.GetComponent().color = EditorTheme.theme.properties.EventSelectedCol.Hex2RGB(); } @@ -220,42 +210,113 @@ namespace HeavenStudio.Editor 37.9f, 30.8f, 25.7f, - 24.3f, + //21.9f, }; if (glg.constraintCount + 1 > sizes.Count && Input.GetAxisRaw("Mouse ScrollWheel") < 0) return; glg.constraintCount += (Input.GetAxisRaw("Mouse ScrollWheel") > 0) ? -1 : 1; - glg.cellSize = new Vector2(sizes[glg.constraintCount - 1], sizes[glg.constraintCount - 1]); + glg.cellSize = Vector2.one * sizes[glg.constraintCount - 1]; } - // method called when clicking the sort button in the editor, skips sorting first three "games" - // sorts by favorites if there are any, and sorts alphabetically if there aren't. - public void Sort() + // method called when clicking the sort button in the editor, skips sorting fx only "games" + // sorts depending on which sorting button you click + public void Sort(string type) { - var mgs = EventCaller.instance.minigames; - var mgsActive = new List(); - for (int i = 3; i < mgs.Count; i++) + var mgsSort = mgsActive; + mgsSort.Sort((x, y) => string.Compare(x.name, y.name)); + + switch (type) { - if (!mgs[i].hidden) mgsActive.Add(mgs[i].name); + case "favorites": + SortFavorites(mgsSort); + break; + case "chronologic": + SortChronologic(mgsSort); + break; + default: // "alphabet" + SortAlphabet(mgsSort); + break; } - mgsActive.Sort(); - var favs = new List(); - bool fav = false; - for (int i = 0; i < mgsActive.Count; i++) + } + + void SortAlphabet(List mgs) + { + for (int i = 0; i < mgsActive.Count; i++) { + mgs[i].SetSiblingIndex(i + fxActive.Count + 1); + } + } + + // if there are no favorites, the games will sort alphabetically + void SortFavorites(List allMgs) + { + var favs = allMgs.FindAll(mg => mg.GetComponent().StarActive); + var mgs = allMgs.FindAll(mg => !mg.GetComponent().StarActive); + + if (Input.GetKey(KeyCode.LeftShift)) { + foreach (var fav in favs) + fav.GetComponent().Star(); + return; + } + + for (int i = 0; i < favs.Count; i++) { + favs[i].SetSiblingIndex(i + fxActive.Count + 1); + } + for (int i = 0; i < mgs.Count; i++) { + mgs[i].SetSiblingIndex(i + fxActive.Count + favs.Count + 1); + } + } + + void SortChronologic(List mgs) + { + var systems = new List[] { + new List(), + new List(), + new List(), + new List(), + new List(), + }; + for (int i = 0; i < mgs.Count; i++) { - var mg = transform.Find(mgsActive[i]); - if (mg.GetComponent().StarActive) { - favs.Add(mg); - fav = true; + var mg = EventCaller.instance.GetMinigame(mgs[i].name); + var tags = mg.tags; + if (tags.Count != 0) { + systems[tags[0] switch { + "agb" => 0, + "ntr" => 1, + "rvl" => 2, + "ctr" => 3, + _ => 4, + }].Add(mgs[i]); + } else if (mg.inferred) { + systems[4].Add(mgs[i]); + } else { + Debug.LogWarning($"Chronological sorting has failed, does \"{mg.displayName}\" ({mg.name}) have an asset bundle assigned to it?"); } } - if (!fav) { - for (int i = 0; i < mgsActive.Count; i++) - transform.Find(mgsActive[i]).SetSiblingIndex(i+4); - } else { - for (int i = 0; i < favs.Count; i++) - favs[i].SetSiblingIndex(i+4); + int j = fxActive.Count + 1; + foreach (var system in systems) + { + system.OrderBy(mg => mg.name); + for (int i = 0; i < system.Count; i++) + { + system[i].SetSiblingIndex(j); + j++; + } + } + } + + public void Search() + { + for (int i = 0; i < mgsActive.Count; i++) + { + mgsActive[i].gameObject.SetActive( + System.Text.RegularExpressions.Regex.IsMatch( + EventCaller.instance.GetMinigame(mgsActive[i].name).displayName, + SearchBar.text, + System.Text.RegularExpressions.RegexOptions.IgnoreCase + ) + ); } } @@ -301,39 +362,39 @@ namespace HeavenStudio.Editor if (currentEventIndex == 0) { - if (EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(mg.name))) + if (EventCaller.FXOnlyGames().Contains(SelectedMinigame)) { int index = currentEventIndex + 1; - if (currentEventIndex - 1 > mg.actions.Count) + if (currentEventIndex - 1 > SelectedMinigame.actions.Count) { index = currentEventIndex; } else if (currentEventIndex - 1 < 0) { - if (mg.actions[0].actionName == "switchGame") + if (SelectedMinigame.actions[0].actionName == "switchGame") index = 1; else index = 0; } - eventObj = Timeline.instance.AddEventObject(mg.name + "/" + mg.actions[index].actionName, true, new Vector3(0, 0), null, true); + eventObj = Timeline.instance.AddEventObject(SelectedMinigame.name + "/" + SelectedMinigame.actions[index].actionName, true, new Vector3(0, 0), null, true); } else - eventObj = Timeline.instance.AddEventObject($"gameManager/switchGame/{mg.name}", true, new Vector3(0, 0), null, true); + eventObj = Timeline.instance.AddEventObject($"gameManager/switchGame/{SelectedMinigame.name}", true, new Vector3(0, 0), null, true); } else { int index = currentEventIndex - 1; - if (mg.actions[0].actionName == "switchGame") + if (SelectedMinigame.actions[0].actionName == "switchGame") { index = currentEventIndex + 1; } - else if (EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(mg.name)) && mg.actions[0].actionName != "switchGame") + else if (EventCaller.FXOnlyGames().Contains(SelectedMinigame) && SelectedMinigame.actions[0].actionName != "switchGame") { index = currentEventIndex; } - eventObj = Timeline.instance.AddEventObject(mg.name + "/" + mg.actions[index].actionName, true, new Vector3(0, 0), null, true); + eventObj = Timeline.instance.AddEventObject(SelectedMinigame.name + "/" + SelectedMinigame.actions[index].actionName, true, new Vector3(0, 0), null, true); } eventObj.isCreating = true; diff --git a/Assets/Scripts/Util/AnimationHelpers.cs b/Assets/Scripts/Util/AnimationHelpers.cs index 366fcb31..efffab5d 100644 --- a/Assets/Scripts/Util/AnimationHelpers.cs +++ b/Assets/Scripts/Util/AnimationHelpers.cs @@ -6,8 +6,8 @@ namespace HeavenStudio.Util { public static bool IsAnimationNotPlaying(this Animator anim) { - float compare = anim.GetCurrentAnimatorStateInfo(0).speed; - return anim.GetCurrentAnimatorStateInfo(0).normalizedTime >= compare && !anim.IsInTransition(0); + var stateInfo = anim.GetCurrentAnimatorStateInfo(0); + return (stateInfo.normalizedTime >= stateInfo.speed || stateInfo.loop) && !anim.IsInTransition(0); } /// /// Returns true if animName is currently playing on animator @@ -16,8 +16,8 @@ namespace HeavenStudio.Util /// name of animation to look out for public static bool IsPlayingAnimationName(this Animator anim, string animName) { - float compare = anim.GetCurrentAnimatorStateInfo(0).speed; - return anim.GetCurrentAnimatorStateInfo(0).IsName(animName) && anim.GetCurrentAnimatorStateInfo(0).normalizedTime < compare; + var stateInfo = anim.GetCurrentAnimatorStateInfo(0); + return (stateInfo.normalizedTime < stateInfo.speed || stateInfo.loop) && stateInfo.IsName(animName); } /// diff --git a/Effects.meta b/Effects.meta deleted file mode 100644 index a0b2eb5f..00000000 --- a/Effects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd4cf4b851b908449914b11be594600f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 78a05778..77f40348 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -209,7 +209,7 @@ QualitySettings: vSyncCount: 0 lodBias: 2 maximumLODLevel: 0 - streamingMipmapsActive: 0 + streamingMipmapsActive: 1 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 streamingMipmapsRenderersPerFrame: 512