1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 05:27:51 +08:00
Commit Graph

79 Commits

Author SHA1 Message Date
Dean Herbert
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09: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
Dean Herbert
c5eecae32f Improve shared code paths in legacy skins 2018-03-22 12:50:23 +09:00
Dan Balasescu
77ebd94804
Merge branch 'master' into beatmap-as-a-skin 2018-03-22 11:33:27 +09:00
Dean Herbert
4a93abcc36 Add scale adjusts to bring legacy skins in-line with lazer sizing 2018-03-21 20:07:58 +09:00
Dean Herbert
5a10270a2a
return -> break
no real reason but whatever works
2018-03-20 20:32:32 +09:00
Dean Herbert
fb3d319d0e Make fallback bool into a function
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
Dean Herbert
f03abb3145 Add GetTexture method to ISkinSource
Used to shortcut lookup checks without potentially expensive drawable creation overhead.
2018-03-20 16:40:11 +09:00