1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00
Commit Graph

12342 Commits

Author SHA1 Message Date
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
Andrei Zavatski
29305ca0eb fix broken layout 2019-06-21 13:24:12 +03:00
Andrei Zavatski
7680f6cbf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-21 13:06:44 +03:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
Dan Balasescu
681a123560
Merge branch 'master' into add-spacing-user-profile-ranks 2019-06-21 16:06:49 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain (#3491)
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Dean Herbert
540b61da0a Add some spacing between user profile ranks 2019-06-21 15:27:19 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
Dean Herbert
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dean Herbert
74fabf8db4 Improve ChatOverlay load behaviour 2019-06-20 23:02:02 +09:00
Dean Herbert
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
Dean Herbert
4ef165fdac Fix ChatLine not being correctly loaded asynchronously 2019-06-20 23:01:02 +09:00
Dean Herbert
21a1fd738b Remove the necessity for NotificationOverlay to always be present
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
Dean Herbert
9a663715cd Make get methods of ProgressNotification return correct values immediately
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
Dean Herbert
6bc2cf85d1 Move NotificationSection strings to constructor 2019-06-20 17:41:12 +09:00
David Zhao
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
KingLuigi4932
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
Dean Herbert
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
Dean Herbert
2773cfba42
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00
Dean Herbert
6f3cb80076
Merge branch 'master' into fix-inactive-audio-race 2019-06-20 01:33:47 +09:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING 2019-06-19 17:38:43 +03:00
Andrei Zavatski
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
Andrei Zavatski
1c44fa84fb Fix colour issues 2019-06-19 12:15:32 +03:00
Andrei Zavatski
c8604b2c17 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-19 12:08:34 +03:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
Dean Herbert
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
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
Andrei Zavatski
3c3757f12e Make ProfileTabControl based on OverlayTabControl 2019-06-18 16:23:57 +03:00
Andrei Zavatski
a7306248d1 Implement OverlayTabControl class
An abstraction for OverlayHeaderTabControl
2019-06-18 16:20:35 +03:00
Dean Herbert
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
40eb6f4986 Undo ordering change to OsuFont 2019-06-18 14:15:22 +09:00
Dean Herbert
584113997a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-18 14:15:06 +09:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
Dean Herbert
c32d17d16a Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
Dean Herbert
26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
Lucas A
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
Dean Herbert
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
Dean Herbert
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
iiSaLMaN
3087099b32
Use ModelBackedDrawable in DrawableRank 2019-06-17 07:34:35 +03:00
iiSaLMaN
4cb9563af2
Use ModelBackedDrawable in UpdateableAvatar 2019-06-17 07:16:38 +03:00
iiSaLMaN
98f8b1d59a
Use ModelBackedDrawable in DrawableFlag 2019-06-17 06:44:24 +03:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
andy840119
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
andy840119
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
Joehu
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
smoogipoo
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
Dean Herbert
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00
Dean Herbert
7d49028a60
Merge branch 'master' into change-download-extension 2019-06-15 15:37:19 +09:00
Dean Herbert
2b48f5d3e0 Tidy up updateMetrics flow 2019-06-15 14:45:51 +09:00
andy840119
1a73178260 using FadeTo() instead of FadeIn()/FadeOut() 2019-06-15 13:28:03 +08:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
Dean Herbert
0ca33e16dd Update framework 2019-06-14 23:25:29 +09:00
Dean Herbert
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00