Commit Graph

10764 Commits

Author SHA1 Message Date
a08086cc8a Fix volume not being considered for file samples 2019-03-05 18:21:29 +09:00
8e99f54fed Merge branch 'master' into update-beatmap-sections 2019-03-05 17:39:47 +09:00
fd147dae21 Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
b5fb6e2a59 Merge branch 'master' into limit-blank-lines 2019-03-05 15:40:11 +09:00
07c7d03a04 Merge branch 'master' into move-osu-settings 2019-03-05 15:32:54 +09:00
34f0967873 Merge branch 'master' into limit-blank-lines 2019-03-05 14:51:56 +09:00
5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
0ff17103e8 Merge branch 'master' into update-difficulty-brackets 2019-03-05 10:16:18 +09:00
3f197935d7 Fix remaining case 2019-03-04 14:03:59 +09:00
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
46b618d80c Merge remote-tracking branch 'Joehuu/master' into supporter-disclaimer 2019-03-03 19:18:16 +09:00
456c5be50c Merge branch 'master' into taskbar-tooltip-fade-out 2019-03-03 12:47:37 +09:00
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
687d5d5ff1 Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
f13901cc19 Merge branch 'master' into fix-mod-overlay-dim 2019-03-02 16:04:44 +09:00
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
268ea6a836 Wrong line 2019-03-02 13:28:16 +09:00
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
7f1f812f29 Update framework 2019-03-01 22:06:42 +09:00
1871e8bb2c Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
431d439500 Make attribute public 2019-03-01 20:15:09 +09:00
9885913fff Fix iOS builds not being able to read their deploy version 2019-03-01 20:01:16 +09:00
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
952c435f3c Merge branch 'master' into ensure-focused-overlay-dim 2019-03-01 13:31:56 +09:00
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
b97b12debf Merge branch 'master' into UserDimLogic 2019-03-01 12:11:53 +09:00
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
6bccdd50ef Merge branch 'master' into UserIDDBStore 2019-03-01 11:07:30 +09:00
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
0300f0d665 Ensure deletions are correct without relying on FK cascade rule 2019-03-01 10:47:45 +09:00
d4041d5d42 Automate includes of files in ArchiveModelManager use cases 2019-03-01 10:25:21 +09:00
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
aad53fa861 Merge branch 'master' into show-supported-window-modes 2019-02-28 22:47:33 +09:00
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
09e1e3bab6 Merge branch 'master' into UserDimLogic 2019-02-28 20:38:09 +09:00
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
86913e720f Remove extra space 2019-02-28 20:24:09 +09:00