Commit Graph

19676 Commits

Author SHA1 Message Date
9ab6d584d3 Merge branch 'master' into editor-new-beatmap 2020-09-07 14:30:41 +09:00
e17ccdfe9f Merge branch 'master' into combo-colors 2020-09-07 13:55:41 +09:00
8f8f907fc7 Fix missed string 2020-09-07 13:27:28 +09:00
b4b9c71f00 Make all toolbar tooltips lowercase 2020-09-06 10:13:06 -07:00
f138b92078 Merge branch 'master' into editor-new-beatmap 2020-09-06 18:24:02 +02:00
a0bc376446 Merge pull request #10062 from frenzibyte/fix-music-controller-propagating-event-twice
Fix MusicController raising track changed event twice
2020-09-04 20:09:49 +09:00
3239576a23 Minor rewording of new comment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:50:49 +03:00
4236e5fe71 Replace useless "matching-code" comment with explanation of how it could happen
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:31:54 +03:00
65d541456a Slight rewording 2020-09-04 11:11:07 +03:00
296294d024 Merge pull request #10061 from peppy/fix-ruleset-settings-crash
Fix potential hard crash if ruleset settings fail to construct
2020-09-04 17:07:55 +09:00
ab057e6c65 Remove unnecessary string interpolation 2020-09-04 16:28:35 +09:00
644f3375ac Also catch exceptions in the construction call 2020-09-04 16:28:19 +09:00
54013790fc Fix MusicController raising TrackChanged event twice 2020-09-04 10:24:31 +03:00
743c888986 Merge branch 'master' into expose-wedge-icons 2020-09-04 16:22:14 +09:00
b631430a5b Merge pull request #10045 from peppy/add-info-wedge-icons
Update and add missing beatmap statistic icons to info wedge
2020-09-04 16:22:01 +09:00
a15653c77c Fix potential hard crash if ruleset settings fail to construct 2020-09-04 16:15:57 +09:00
974bef5586 Merge pull request #10060 from smoogipoo/fix-room-mod-retention
Fix global mods being retained by rooms
2020-09-04 15:58:07 +09:00
1a4e058acc Merge branch 'master' into add-info-wedge-icons 2020-09-04 15:52:11 +09:00
0b3f2fe7df Update framework 2020-09-04 15:21:48 +09:00
4399f5976c Fix global mods being retained by rooms 2020-09-04 15:20:55 +09:00
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
7c99f66cf5 Update resources 2020-09-04 14:13:42 +09:00
fba253f131 Take user argument in CreateNew method parameters 2020-09-04 13:17:43 +09:00
f14a82e3a9 Remove unnecessary conversion 2020-09-04 13:13:53 +09:00
1f2f21e07a Merge branch 'master' into editor-new-beatmap 2020-09-04 13:11:59 +09:00
cd253ab055 Further tweaks to get closer to design originals 2020-09-04 13:05:39 +09:00
9d2dff2cb8 Add scale to allow legacy icons to display correctly sized 2020-09-04 12:55:39 +09:00
d6b46936a0 Adjust sizing to match updated textures with less padding 2020-09-04 12:55:28 +09:00
a99e7a1dc2 Merge branch 'master' into add-info-wedge-icons 2020-09-03 21:57:58 +09:00
ebed7d09e3 Update resources 2020-09-03 21:56:36 +09:00
d32b77f045 Add missing extension to filename
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-09-03 21:33:25 +09:00
4d9a5f7ba8 Merge branch 'master' into update-icons 2020-09-03 20:19:51 +09:00
1c1c583d3b Fix regression in file update logic (filename set too early) 2020-09-03 19:31:40 +09:00
a555407f37 Fix various test failures due to missing beatmap info in empty beatmap 2020-09-03 19:25:18 +09:00
58e84760b9 Fix path empty string check causing regression in behaviour 2020-09-03 19:17:07 +09:00
7a0c1411b6 Merge branch 'master' into timeshift-leaderboard-topscore 2020-09-03 18:11:04 +09:00
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
d55c9c3cc2 Fix UserProfile weirdness 2020-09-03 17:11:34 +09:00
99e34d8562 Update with missing icons 2020-09-03 17:05:45 +09:00
f5a73130e1 Fix regression in sidebar button sizing 2020-09-03 16:34:58 +09:00
0d1674ca5e Combine settings strings to read from same location 2020-09-03 16:34:58 +09:00
2fac0a180e Adjust toolbar button sizing 2020-09-03 16:34:58 +09:00
98c5a04a09 Update home button 2020-09-03 16:34:58 +09:00
942276d88f Remove outdated SearchableList classes 2020-09-03 16:34:58 +09:00
7bcbac6f45 Move header setting to FullscreenOverlay 2020-09-03 16:34:58 +09:00
dbf44fbaf2 Update names and icons to match new designs 2020-09-03 16:34:58 +09:00
dceae21bbf Centralise fetching of overlay component titles and textures 2020-09-03 16:34:58 +09:00
4c011a88ce Merge branch 'master' into update-framework 2020-09-03 15:08:18 +09:00
fe524ec491 Merge branch 'master' into update-framework 2020-09-03 14:58:32 +09:00
0530c4b8a7 Update framework 2020-09-03 14:58:22 +09:00