1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 23:47:24 +08:00
Commit Graph

585 Commits

Author SHA1 Message Date
smoogipoo
02237133cb Implement mania hit target skinning 2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374 Add mania key area skinning 2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8 Implement column background skinning 2020-03-31 10:57:56 +09:00
smoogipoo
2b5e9885f6 Implement mania skin reading functionality 2020-03-31 10:55:58 +09:00
smoogipoo
a8f7d7ea42 Add structure for mania configuration lookups 2020-03-30 23:21:40 +09:00
smoogipoo
881ec146af Ignore duplicate configs 2020-03-30 17:36:57 +09:00
smoogipoo
4719aac235 Add basic mania skin parsing 2020-03-30 17:18:09 +09:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Kelvin
c8ea922577
Update osu.Game/Skinning/LegacySkinExtensions.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-12 04:18:57 -07:00
Kelvin
317bb5d0a4 Fallback on invalid AnimationFramerate for legacy skins 2020-03-12 03:55:45 -07:00
smoogipoo
ee13632375 Fix ogg beatmap/skin samples not loading 2020-02-18 13:21:55 +09:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
Dean Herbert
9181bb41c6 Remove unused using 2020-02-07 15:11:09 +09:00
Dean Herbert
544685be48 Add support for reading skin frame rate from configuration file 2020-02-07 14:58:29 +09:00
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +09:00
smoogipoo
09cd66adb0 Fix storyboard samples not loading from subfolders 2020-01-02 14:07:22 +09:00
Dean Herbert
783159f7a0 Remove redundant logic 2019-12-25 14:55:22 +09:00
Dean Herbert
145ac8e0b5 Remove redundant setter 2019-12-25 14:55:05 +09:00
Salman Ahmed
ff5e6c0dcf Make DefaultComboColours a property 2019-12-21 12:36:34 +03:00
Salman Ahmed
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
Dean Herbert
4443d2196b
Merge branch 'master' into legacy-slider-body 2019-12-17 23:42:31 +09:00
smoogipoo
527ab1a72f Fix traceable mod not working on skin change 2019-12-17 19:49:13 +09:00
Huo Yaoyuan
caf3f774ba CA1309: compare strings correctly. 2019-12-17 13:00:15 +08:00
Dean Herbert
272d7d0ca9
Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-17 12:36:20 +09:00
Dean Herbert
befb78f83b Simplify LegacySkinResourceStore by deriving from ResourceStore 2019-12-16 14:01:08 +09:00
Dean Herbert
9062fe1935 Fix crashes on custom skins due to extension-less file lookups 2019-12-16 13:32:53 +09:00
Salman Ahmed
bf8caee53f Inherit SkinConfiguration directly 2019-12-12 14:05:24 +03:00
Salman Ahmed
a9125f6544 Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-12 12:37:51 +03:00
Huo Yaoyuan
04b3297a05 Constrain configuration lookup as enum. 2019-12-09 17:45:26 +08:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
iiSaLMaN
b58afa3eb6 Remove unnecessary mentioning in xmldoc 2019-11-24 04:36:34 +03:00
iiSaLMaN
20a8a653c2 Change LegacySkin.Configuration accessibility 2019-11-24 04:10:04 +03:00
iiSaLMaN
5bf6e57eb0 Remove unnecessary usage 2019-11-24 02:16:43 +03:00
iiSaLMaN
0f9978b34a Use AddRange instead 2019-11-24 02:08:36 +03:00
iiSaLMaN
1e24ee7956 Remove ClearComboColours() 2019-11-24 02:07:56 +03:00
Dean Herbert
bcb1504110 Fix naming 2019-11-20 15:40:35 +09:00
iiSaLMaN
08b8cedfdf Add setter to legacy skin configuration access 2019-11-20 01:15:40 +03:00
iiSaLMaN
0407d2248c Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version 2019-11-20 01:10:32 +03:00
Huo Yaoyuan
dcfa98414f Use ??=. 2019-11-12 19:56:51 +08:00
Huo Yaoyuan
0d81b96c5f Use deconstruction declaration. 2019-11-12 19:55:22 +08:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
758c304d92
Merge branch 'master' into fallback-to-skin-combo-colours 2019-11-12 19:00:05 +09:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
iiSaLMaN
9874ce49ce Move fallback allowance to the skin configuration only. 2019-11-07 15:55:34 +03:00
iiSaLMaN
808543885f Change ComboColours type to IReadOnlyList<Color4>
Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)
2019-11-07 15:54:30 +03:00
iiSaLMaN
61778232d8 Rewrite inline comment 2019-11-06 23:24:54 +03:00
iiSaLMaN
cef6e2a26b Move colours fallback logic to SkinConfiguration.ComboColours getter 2019-11-06 23:20:36 +03:00
iiSaLMaN
198a1750c3 Use is pattern matching 2019-11-06 20:46:02 +03:00
iiSaLMaN
69d9a0ae1a Use null check and pattern matching 2019-11-06 20:30:26 +03:00
iiSaLMaN
ba14345107 Specify culture and number style 2019-11-06 20:27:55 +03:00
iiSaLMaN
947602f70a Specify why legacy version is nullable 2019-11-06 20:24:19 +03:00
iiSaLMaN
502dcc5669 Fix incorrect skin version case 2019-11-06 20:23:22 +03:00
iiSaLMaN
55230a36dd Set correct legacy version 2019-11-06 19:58:07 +03:00
iiSaLMaN
2cf17e0bf3 Use decimal data type instead 2019-10-09 23:33:25 +03:00
iiSaLMaN
01ac19fdbb Set legacy version of osu!classic skin to 2.0 2019-10-09 23:06:32 +03:00
iiSaLMaN
7f6541672c Parse legacy version of decoded skin to numerical 2019-10-09 23:05:50 +03:00
iiSaLMaN
003af19e3f Introduce legacy skin configuration 2019-10-09 23:04:34 +03:00
iiSaLMaN
5e3f0f6c95 Return default combo colours if none provided 2019-10-09 21:08:07 +03:00
iiSaLMaN
281671a213 Remove default combo colours usage from skins 2019-10-09 21:04:26 +03:00
Dean Herbert
24269c0384 Fix skins not being displayed correctly in the editor 2019-10-08 12:52:34 +09:00
Dan Balasescu
dc984d0d81
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-04 13:51:56 +09:00
Dean Herbert
925615320e Update lazer default combo colours to match stable 2019-10-04 10:46:48 +08:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-03 15:12:21 +08:00
smoogipoo
706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-09-20 15:28:08 +09:00
Dean Herbert
3fa1b53b2a Add back combo colours for osu!classic 2019-09-19 12:39:15 +09:00
Bartłomiej Dach
11eda44d34 Migrate decoding to line-buffered reader
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
2019-09-15 01:28:07 +02:00
Dean Herbert
6760e239a1 Fix osu! hitcircle font textures being incorrectly sized 2019-09-11 13:39:21 +09:00
Dean Herbert
f4f9519761 Add todo comment 2019-09-06 12:16:20 +09:00
Dean Herbert
a0aeccf232 Fix fallback to default combo colours not working 2019-09-05 23:24:13 +09:00
smoogipoo
90985b6af6 Add missing license header 2019-09-05 17:01:14 +09:00
smoogipoo
bda21998c4 Add helper method to make direct casts be used 2019-09-05 16:48:56 +09:00
Dean Herbert
c0bcbfd892 Merge branch 'master'
Conflicts:
	osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
2019-09-05 14:40:30 +09:00
Dean Herbert
6197c7fd31 Add automatic resource mapping for rulesets to their own dll 2019-09-04 20:29:28 +09:00
Dean Herbert
8ea82123e4 Fix nullref on test disposal 2019-09-04 15:59:09 +09:00
Dean Herbert
2983918f71 Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor 2019-09-04 13:40:41 +09:00
Dean Herbert
f655cd4516 Fix parsing of null configuration elements 2019-09-04 13:30:46 +09:00
Dean Herbert
04c2c33c64 Allow LegacySkin to be constructed with all nulls 2019-09-04 13:29:55 +09:00
Dean Herbert
f58ca82398 Don't include section for now 2019-09-03 18:56:01 +09:00
Dean Herbert
002de80c30 Add xmldoc to ISkin 2019-09-03 18:30:22 +09:00
Dean Herbert
097012dc95 Move slider ball colouring to DefaultLegacySkin for now 2019-09-03 18:05:16 +09:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dean Herbert
d1cdf49dd5 Revert SkinnableSprite lookups to old behaviour 2019-09-03 14:21:54 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert
b460f76fa6 Adjust file spacing slightly 2019-09-02 19:01:43 +09:00
Dean Herbert
0bfe4650c3 Early return if no change occurred in looping value 2019-09-02 19:01:17 +09:00
Dean Herbert
f08b523abf Name tuple items 2019-09-02 18:20:30 +09:00
Dean Herbert
9c53430a0f Only initialise when required 2019-09-02 18:18:59 +09:00
Dean Herbert
eaeecfb300 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-09-02 18:15:17 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert
d2a3e0581b Fix legacy decoder using wrong configuration 2019-08-31 13:27:03 +09:00
Dean Herbert
12eeec36fc Fix ruleset skins incorrectly providing configuration defaults 2019-08-31 12:33:29 +09:00
Dean Herbert
3aa2ece49b Merge branch 'iskincomponent' into play-to-gameplay 2019-08-30 15:29:55 +09:00
Dean Herbert
fe90e194e3 Remove redundant qualifier 2019-08-30 15:29:44 +09:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
a7c94c3883 Simplify hit result lookups 2019-08-30 15:12:03 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
Dean Herbert
8f9fe99237 Move SliderFollowCircle implementation 2019-08-30 14:40:36 +09:00
Dean Herbert
71192791d5 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 14:12:56 +09:00
Dean Herbert
c389a5c798 Move remaining osu-specific implementations to OsuLegacySkin 2019-08-30 13:42:29 +09:00
Dean Herbert
7bba8ca14b Split out nested classes 2019-08-30 13:04:11 +09:00
Dean Herbert
84e4748268 Remove duplicate getAnimation function and improve namespacing 2019-08-30 12:59:58 +09:00
Dean Herbert
bfbec067b1 Remove remnants of user skin PR 2019-08-30 11:54:36 +09:00
iiSaLMaN
06224a7d4e Fix build issue 2019-08-29 15:38:33 +03:00
iiSaLMaN
ec6a40af33 Add adjustments on channel creation if there is 2019-08-29 15:32:21 +03:00
Dean Herbert
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
iiSaLMaN
3d62003382 Add null check 2019-08-28 15:39:45 +03:00
Dean Herbert
01aede3e29 Add comprehensive skin fallback integration testing 2019-08-28 19:57:17 +09:00
iiSaLMaN
2f3fb8cf88 Add Stop + RemoveAdjustment functions 2019-08-28 13:10:11 +03:00
iiSaLMaN
cb8fe89b8b Allow setting looping to existing channels 2019-08-28 13:09:53 +03:00
iiSaLMaN
d1cbd11d28 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-08-28 13:09:07 +03:00
Dean Herbert
7ea55a5cdd Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 16:36:20 +09:00
Dean Herbert
1aa09ff05c
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
Try retrieving samples without bank names
2019-08-28 13:12:51 +09:00
Dean Herbert
4add1727b7 Fix hitsounds not updating immediately after switching skins 2019-08-28 03:25:57 +09:00
iiSaLMaN
18431a42e6 Resolve merge conflicts 2019-08-27 20:06:17 +03:00
iiSaLMaN
4ef991b973 Loop over lookup names on default-samples retrieval 2019-08-27 19:42:17 +03:00
Dean Herbert
7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7 Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
0ea10a4922 Fix skin sample reading failing 2019-08-27 17:18:32 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank 2019-08-27 14:44:16 +09:00
Dean Herbert
62641c149d Fx component lookups being incorrect for non-databased legacy skins 2019-08-26 18:20:45 +09:00
Dean Herbert
5e362d10b1 Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
de2c6aa23d Rename and expand usability of SkinProvidingContainer 2019-08-26 12:21:11 +09:00
iiSaLMaN
0bcd323d17 Remove unnecessary string literal 2019-08-24 09:30:43 +03:00
iiSaLMaN
da72806693 Remove lookup logic from SkinnableSound 2019-08-23 14:55:38 +03:00
iiSaLMaN
d8535574d1 Pass sample info to Skin.GetSample 2019-08-23 14:32:43 +03:00
iiSaLMaN
66d8440167 Move non-bank samples logic to LegacySkin 2019-08-22 12:50:47 +03:00
iiSaLMaN
87f3184fcc Try retrieving samples without bank names
Fallback for spinner bonus samples
2019-08-21 15:14:33 +03:00
Dean Herbert
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
Dean Herbert
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
Dean Herbert
cca64771dd Add comment about placement of default loading 2019-08-21 13:56:49 +09:00
Dean Herbert
aa8b7b60de Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 13:30:24 +09:00
Dan Balasescu
82fe506f97
Merge branch 'master' into animated-legacy-skins 2019-08-21 13:03:11 +09:00
smoogipoo
0de219dda4 Update with spritetext text builder changes 2019-08-20 19:03:57 +09:00
Dean Herbert
4bffb0df84 Merge branch 'animated-legacy-skins' into animated-slider-ball 2019-08-20 18:14:17 +09:00
Dean Herbert
6dd638b327 Further improve legibility of texture lookup 2019-08-20 17:39:24 +09:00
Dean Herbert
84530b7839 Colour the correct layer 2019-08-20 15:02:07 +09:00
Dean Herbert
f7ce7c7d99 Merge branch 'fix-skin-test-regression' into animated-slider-ball 2019-08-20 14:09:53 +09:00
Dean Herbert
3b7cee2d45 Fix LegacySkin not checking for @2x hitcircle when deciding sizing 2019-08-20 13:50:16 +09:00
Dean Herbert
b5cb59faf2 Add default skin sprites and specular/diffuse layer support 2019-08-20 13:19:32 +09:00
Dean Herbert
d0766fa1cd Add slider ball animation support 2019-08-19 19:55:47 +09:00
Dean Herbert
539a27a557 Refactor texture lookup code 2019-08-19 19:23:54 +09:00
Dean Herbert
d02b8d14f7 Avoid unnecessary texture retrieval for non-animated sprites 2019-08-19 17:47:59 +09:00
Dean Herbert
d224405bc6 Rename const and make more available 2019-08-19 17:46:05 +09:00
Dean Herbert
4356f2ef9f Add sample usage of looping skinnable 2019-08-19 17:45:54 +09:00
iiSaLMaN
cfa569b226 Add looping field and fix build 2019-08-15 05:35:47 +03:00
iiSaLMaN
07e7e1187c Add adjustment function in SkinnableSound 2019-08-15 05:30:35 +03:00
Dean Herbert
bc49164cc1
Merge branch 'master' into animated-legacy-skins 2019-08-13 00:40:20 +09:00
smoogipoo
5486c77362 Remove explicit autosize 2019-08-09 15:25:42 +09:00
Dean Herbert
ec13143ab3 Add further xmldoc 2019-08-07 18:45:56 +09:00
jorolf
7b95741dab fix crash and add some tests
- still missing special skin textures
2019-07-31 21:55:56 +02:00
jorolf
e01d3d85a3 Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins 2019-07-30 20:29:04 +02:00
Dean Herbert
9335ebeb55 Fix missing anchor/origin specification 2019-07-30 23:45:55 +09:00
Dean Herbert
f6b6fa9633 Add disappeared null check 2019-07-30 23:44:47 +09:00
Dean Herbert
f9c95e21be Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle 2019-07-30 23:44:13 +09:00
Dean Herbert
21a8f566c3 Trim whitespace 2019-07-30 23:24:28 +09:00
Dean Herbert
d12de7dbfa Add temporary scale hack to make cursors correct size 2019-07-30 23:20:35 +09:00
Dean Herbert
8e9f8bb565
Merge branch 'master' into slider-ball-scaling 2019-07-30 23:19:28 +09:00
Dean Herbert
fbc5285a1f
Add legacy skin hit animations (#5464)
Add legacy skin hit animations
2019-07-30 23:18:12 +09:00
Dean Herbert
6d279dba5c Fix centering being incorrect for some skins 2019-07-30 23:07:41 +09:00
Dean Herbert
fb1f77bd04 Move implementation and colour logic to legacy implementation 2019-07-30 23:06:18 +09:00
Dean Herbert
e6bd02d276 Simplify namespace definition 2019-07-30 22:41:20 +09:00
Dean Herbert
307a6c1095 Remove DefaultCirclePiece 2019-07-30 22:38:29 +09:00
smoogipoo
1222536f7a Rename resource string 2019-07-30 19:10:21 +09:00
Dan Balasescu
6a66a3b06f
Merge branch 'master' into skinning-test 2019-07-30 18:28:56 +09:00
Dean Herbert
766cf9295d Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations 2019-07-29 19:03:36 +09:00
Dan Balasescu
ef229c0f80
Merge branch 'master' into legacy-cursor-middle 2019-07-29 18:52:11 +09:00
jorolf
0635680db5 fix some code quality 2019-07-29 11:49:59 +02:00
Dean Herbert
a4f30daf13
Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
Dean Herbert
d99408e979
Fix SkinChanged events triggering after disposal (#5461)
Fix SkinChanged events triggering after disposal

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-29 18:48:53 +09:00
Dan Balasescu
98813222af
Adjust comment 2019-07-29 18:35:22 +09:00
Dean Herbert
c514cbe2b7 Add basic skinning test 2019-07-29 17:27:00 +09:00
jorolf
f4effd12c3 make legacy skins animatable 2019-07-28 21:04:55 +02:00
Dean Herbert
df5abd9651
Merge branch 'master' into shuffle-skin 2019-07-29 01:55:57 +09:00
Dean Herbert
bfaf9d5f41 Remove unnecessary special cases 2019-07-25 16:24:10 +09:00
Dean Herbert
c1b0130857 Add legacy cursormiddle support 2019-07-25 16:23:04 +09:00
Dean Herbert
38e21caa5a Add legacy hitcircle 2019-07-25 16:10:01 +09:00
Dean Herbert
900d17a4db Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations 2019-07-25 16:09:15 +09:00
Dean Herbert
58feba72a3 Fix scheduled events not running on previous drawables 2019-07-25 15:59:44 +09:00
Dean Herbert
46e17646ac Align slider path size with legacy skins 2019-07-25 14:22:26 +09:00
Dean Herbert
9473f6d3e3 Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
2019-07-25 14:22:22 +09:00
Dean Herbert
a290437286 Fix skin changed events triggering after disposal 2019-07-25 13:55:01 +09:00
Dean Herbert
7275beaf1a Remove unnecessary type specification from SkinnableDrawable 2019-07-25 11:20:39 +09:00
Dean Herbert
36c557c752 Add null check and simplify scaling conditional logic via switch 2019-07-22 14:43:25 +09:00
Dean Herbert
9d091c96b8 Use cache to ensure correct DrawSize when deciding scaling 2019-07-22 14:43:04 +09:00
Dean Herbert
74c961bcff Add more flexible skin element confine modes 2019-07-22 14:42:56 +09:00
smoogipoo
9f6ff63634 Fix judgement disposals causing huge LOH pressure 2019-07-17 19:25:41 +09:00
Dean Herbert
ba8df3ba92 Clean up stable lookup and mutate logic 2019-07-05 13:59:31 +09:00
Dean Herbert
8346c50ce1 Rename delete method and improve xmldoc 2019-07-05 13:55:25 +09:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
smoogipoo
fc8dee6123 Fix typo 2019-07-01 23:26:53 +09:30
Dean Herbert
0636df5660 Add support for legacy skins which use animation frames to hide elements 2019-07-01 18:13:14 +09:00
HoLLy
79fc143422 Only remove .osk files when importing skin archives 2019-06-30 16:52:39 +02:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
welsar55
d6561531a3
Merge branch 'master' into combobreak 2019-06-29 11:55:10 -05:00
Welsar55
a22c166575 Make ComboEffects its own class 2019-06-29 11:28:40 -05:00
Welsar55
a57218e50e Move to LocalSkinOverride 2019-06-28 20:45:11 -05:00
HoLLy
12350d18b5 Don't remove imported archives by default 2019-06-27 14:41:11 +02:00
HoLLy
55216dffb7 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-27 14:07:17 +02:00
Dean Herbert
06eaba766b Move method below ctor 2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96 Add some more xmldoc 2019-06-24 15:25:01 +09:00
Dean Herbert
3f22c0a311 Add SkinnableSprite implementation 2019-06-24 15:17:35 +09:00
HoLLy
802da225d4 Move responsibility for selecting paths to model managers 2019-06-21 17:32:47 +02:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
Dean Herbert
8607f3b765 Merge remote-tracking branch 'upstream/master' into databased-sin-setting 2019-06-05 19:03:57 +09:00
Dean Herbert
80d65f9a3b Update resource stores with GetAvailableResources 2019-05-31 14:33:18 +09:00
Dean Herbert
1629534a0c More disposal? 2019-05-31 14:28:53 +09:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dean Herbert
31e6a4fa59 Add optional skin foreign key to databased settings 2019-05-27 01:56:19 +09:00
Dean Herbert
487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
Dean Herbert
41e13aef23 Use more standard parsing method 2019-05-12 22:53:03 +09:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev 2019-05-12 21:45:52 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dean Herbert
2060bad3bc Try applying minimal inspection fixes for latest Rider EAP 2019-04-01 13:28:14 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
7d6a08d6da Fix a few new inspections in latest Rider EAP 2019-04-01 11:39:02 +09:00
Santeri Nogelainen
cbb7498a42 Border size to float, add min and max size, other small changes 2019-03-16 12:41:03 +02:00
Santeri Nogelainen
92595e43f6 slider border thickness 2019-03-14 21:57:39 +02:00
Dean Herbert
d4041d5d42 Automate includes of files in ArchiveModelManager use cases 2019-03-01 10:25:21 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dean Herbert
ccb00b932b
Merge branch 'master' into fix-nasty-unbind 2019-02-27 21:44:54 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
smoogipoo
7fa4262207 Clear delegate list rather than relying on unbinds 2019-02-27 21:04:47 +09:00
Dean Herbert
9473b53226 Avoid redundant (synchronous) skin change 2019-02-27 18:53:01 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dean Herbert
90e462309f
Add newline 2019-02-15 21:16:54 +09:00
Jamie Taylor
38cf5a1ea4
Add support for the HitCircleOverlap property in legacy skins 2019-02-15 21:03:06 +09:00
Dean Herbert
2f8f4fac64 Fix combo colour fallbacks when skin is not providing any 2019-02-05 17:54:14 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ekrctb
0573c1c923 Fix taiko namespace ignored 2019-01-21 14:20:37 +09:00
Dean Herbert
0a24d188b4 Remove TryGetValue as it won't work 2019-01-10 19:01:41 +09:00
Dean Herbert
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356 Make skinning better 2019-01-07 20:12:39 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
13f461099f
Merge branch 'master' into moreOptionsFromSkin.ini 2018-12-14 19:51:41 +09:00
Dean Herbert
ac0fc6236c Fix crash when changing beatmap toggles at loading screen 2018-12-13 14:51:18 +09:00
Dragicafit
9afbebf560
Equals to == for string 2018-12-09 13:29:14 +01:00
Dragicafit
506f27a92e cursorExpand is now a bool 2018-12-07 23:52:57 +01:00
Dragicafit
0816eaacb8 Make CursorExpand skinnable 2018-12-07 22:22:40 +01:00
Dragicafit
667eaf95d8 Make comboColours skinnable 2018-12-07 22:16:09 +01:00
Jan Jurzitza
3f6656e2cd
Merge branch 'master' into shuffle-skin 2018-12-04 12:59:31 +01:00
Dean Herbert
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09:00
WebFreak001
c4c2191500 Apply requested changes 2018-11-28 12:36:21 +01:00
Dean Herbert
ab2b2493a1 Move hashing functionality to ArchiveModelManager 2018-11-28 19:21:36 +09:00
Dean Herbert
ce660b6d67 Add skin de-duplication 2018-11-28 19:01:22 +09:00
smoogipoo
14ff4bc26a Move primary key attribute to IHasPrimaryKey 2018-11-28 13:19:23 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
e207dd728b Fix taiko proxies not receiving the correct lifetimes 2018-11-15 20:26:12 +09:00
smoogipoo
3539874262 Add missing scale
Makes about a 1px difference.
2018-09-28 11:40:13 +09:00
smoogipoo
1c242556ca Add comments + cleanup 2018-09-27 17:40:28 +09:00
smoogipoo
8191f03503 Implement HitCircleFont skin configuration 2018-09-27 17:40:28 +09:00
smoogipoo
0d8276c5f8 Implement skinnable sprite text 2018-09-27 17:40:28 +09:00
smoogipoo
b84994e643 Make GetTexture return the post-scaled texture 2018-09-27 17:40:28 +09:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
75d2cb199c Fix formatting 2018-09-07 18:14:27 +09:00
Dean Herbert
43824c2a94 Switch back to default skin when the user selected skin is deleted 2018-09-03 11:50:50 +09:00
Dean Herbert
fb1e8fbdcf Remove migration code 2018-09-03 10:23:56 +09:00
Dean Herbert
144e80dff6 Add "import all skins from stable" option (and mass delete) 2018-09-03 10:10:04 +09:00
Dean Herbert
b1a3dfedd1 Reduce async-await pairs 2018-08-30 14:41:16 +09:00
smoogipoo
21d5322899 Update with async changes 2018-08-27 17:05:58 +09:00
smoogipoo
90ebabd2db Fix nullref 2018-08-23 15:21:36 +09:00
smoogipoo
c7db407832 Fix operation cancelled exception when changing visual settings 2018-08-23 14:53:16 +09:00
morguldir
6c861a1638 Strip comments from everything except metadata 2018-07-16 01:04:41 +02:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
smoogipoo
310c4a7d6c Make SampleInfo choose its own lookup name 2018-07-02 14:18:41 +09:00
Dean Herbert
6e6586909b User pattern matching 2018-04-25 16:32:06 +09:00
Dean Herbert
4f53185d43 Invert logic to match existing toggles 2018-04-25 16:18:55 +09:00
Dean Herbert
45810e6220
Merge branch 'master' into ignore_beatmap_skin 2018-04-24 17:15:39 +09:00
UselessToucan
254e9929be
Merge branch 'master' into ignore_beatmap_skin 2018-04-23 13:06:24 +03:00
Dean Herbert
ff3d3379f0 Merge remote-tracking branch 'upstream/master' into async-screens 2018-04-23 18:29:37 +09:00
Dean Herbert
44a9aa529a Test CI run with new changes 2018-04-22 03:51:17 +09:00
TocoToucan
1ce38c7fc6 Visual settings: Ignore beatmap hitsounds 2018-04-20 18:30:41 +03:00
TocoToucan
606e088713 Visual settings: Ignore beatmap skin 2018-04-20 18:17:57 +03:00
Dean Herbert
b16e25c3e9 Add error handling on a per-line level in LegacyDecoder
Resolves #2306.
2018-04-20 18:32:24 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
c39f056b3b Fix skin path being ignored in extension agnostic lookups
Closes #2295.
2018-03-30 18:06:18 +09:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
Dean Herbert
1996698817 Fix @1x skin elements not being used 2018-03-24 11:40:45 +09:00
Dean Herbert
256baf6d60 Move binding to LoadComplete
Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
2018-03-24 05:40:51 +09:00
Dean Herbert
eb751fa607 Fix event unbind not being unbound correctly 2018-03-23 15:05:28 +09:00
Dean Herbert
ee12d75b30
Merge branch 'master' into skin-scaling 2018-03-22 19:30:17 +09:00
Dean Herbert
366b7fca65 Remove GetColour method 2018-03-22 18:50:19 +09:00
Dean Herbert
425d4aa766 Add ability to lookup arbitrary SkinConfiguration values 2018-03-22 18:10:28 +09:00
Dean Herbert
c4fe6a04c5 Use string lookups for combo colours 2018-03-22 17:32:05 +09:00
Dan Balasescu
ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
Dean Herbert
504c3ff0ba BeatmapSkin -> LegacyBeatmapSkin 2018-03-22 12:50:48 +09:00