Commit Graph

12293 Commits

Author SHA1 Message Date
2773cfba42 Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00
6f3cb80076 Merge branch 'master' into fix-inactive-audio-race 2019-06-20 01:33:47 +09:00
3e285e5dde Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
15229f3a23 Make header expandable 2019-06-19 17:45:39 +03:00
5fb4f2fadf Add TOP_PADDING 2019-06-19 17:38:43 +03:00
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
3043f42eb5 Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
b51aad7433 Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
fbd9ebf02d Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
aef29e2767 Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
bc8ce5d188 Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
40eb6f4986 Undo ordering change to OsuFont 2019-06-18 14:15:22 +09:00
584113997a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-18 14:15:06 +09:00
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
c32d17d16a Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
04dc1c1744 Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
3a04684efb Add region 2019-06-17 23:25:16 +09:00
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
0c299d651f Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
3087099b32 Use ModelBackedDrawable in DrawableRank 2019-06-17 07:34:35 +03:00
4cb9563af2 Use ModelBackedDrawable in UpdateableAvatar 2019-06-17 07:16:38 +03:00
98f8b1d59a Use ModelBackedDrawable in DrawableFlag 2019-06-17 06:44:24 +03:00
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
4e85481fd4 Merge branch 'master' of https://github.com/ppy/osu into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-16 13:27:15 +09:00
84b4e877f8 using FadeTo instead of show/hide
headerLabel.FadeTo() is still remain because effect can be visible when expand== true
2019-06-16 13:27:01 +09:00
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
38616a2bb5 Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00
7d49028a60 Merge branch 'master' into change-download-extension 2019-06-15 15:37:19 +09:00
2b48f5d3e0 Tidy up updateMetrics flow 2019-06-15 14:45:51 +09:00