1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 08:22:56 +08:00
Commit Graph

3643 Commits

Author SHA1 Message Date
Jamie Taylor
4c8aa65200
private + renaming 2019-02-28 17:02:45 +09:00
David Zhao
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Jamie Taylor
6e821a426d
Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00
Jamie Taylor
cf2feec7df
Fix multiplayer enabled mods check 2019-02-28 15:02:22 +09:00
Joehu
2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dan Balasescu
76ec5868da
Merge branch 'master' into fix-square-graph-overhead 2019-02-28 12:23:37 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert
3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
Dean Herbert
43a1df6e5c Inline cancellation token source creation 2019-02-27 18:58:53 +09:00
Dean Herbert
6f5d4ce2e2 Debounce SquareGraph some more 2019-02-27 18:58:45 +09:00
Dean Herbert
8c4a59e57e Fix SquareGraph more 2019-02-27 18:58:34 +09:00
David Zhao
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
Jamie Taylor
c59d84fd21
Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods 2019-02-27 16:21:14 +09:00
Jamie Taylor
a3f71d69a9
Ensure ruleset and mods are set correctly when leaving MatchSongSelect 2019-02-27 16:16:13 +09:00
Jamie Taylor
7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
Joehu
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
jorolf
4c10185f5b Fade out text instead of removing it immediately 2019-02-26 15:26:00 +01:00
jorolf
cacef7421d Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-26 14:09:12 +01:00
Dean Herbert
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline 2019-02-26 15:48:34 +09:00
Dean Herbert
2fc34496fd
Merge branch 'master' into MissingSource 2019-02-26 15:38:51 +09:00
Shane Woolcock
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
jorolf
796044ee7d *I should've rechecked the code after the master merge* 2019-02-25 23:53:44 +01:00
jorolf
501dab7b32 Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-25 23:49:01 +01:00
jorolf
c680d63694 Don't show the supporter text if the user already has supporter status 2019-02-25 23:44:43 +01:00
Dean Herbert
568e90c70b
Merge branch 'master' into UserDimLogic 2019-02-25 22:35:48 +09:00
David Zhao
d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
Shane Woolcock
bebb635ca1 Merge branch 'master' into hide-exit-button
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
Shane Woolcock
2bd5bb3f69 Move all MainMenu button creation into load 2019-02-25 21:41:41 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
Dean Herbert
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
706da017d7 Add target screen support and user bypass 2019-02-25 14:01:51 +09:00
David Zhao
16fa30f71e Fix bindable 2019-02-25 13:27:44 +09:00
David Zhao
ccc86b66fa Use local private bindable in Player.cs 2019-02-25 13:15:37 +09:00
David Zhao
af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
Shane Woolcock
61be4f2695 Conditionally add ExitConfirmOverlay and disable back action 2019-02-25 10:43:47 +09:00
Shane Woolcock
add8b8e9c4 Only add Exit button if the GameHost supports it 2019-02-25 09:56:00 +09:00
David Zhao
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao
3a9835fcdd Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic 2019-02-24 18:11:08 +09:00
David Zhao
f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
Dean Herbert
b140fc973a
Merge branch 'master' into UserDimLogic 2019-02-24 17:48:59 +09:00
Dean Herbert
2281a0235d Fix regression causing playback rate to display incorrectly 2019-02-24 15:27:06 +09:00
David Zhao
f8d18285a8 Fix backgrounds not properly being faded in song select 2019-02-23 14:59:54 +09:00
David Zhao
bb01948283 Use .Value with new bindable changes 2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
David Zhao
a4162a69fb Remove leftover usage of dimlevel in BackgroundScreenBeatmap 2019-02-22 18:01:50 +09:00
Dean Herbert
0431582959 Remove excess new line 2019-02-22 17:57:49 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
David Zhao
263972a048 Remove DimLevel bindable from ScreenWithBeatmapBackground 2019-02-22 17:00:00 +09:00
David Zhao
918a60ebbf Create a new player every time a test is performed. 2019-02-22 16:56:03 +09:00
David Zhao
65cdac60c3 Add tests to make sure the background is always the same through screen transitions 2019-02-22 14:43:05 +09:00
smoogipoo
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao
97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao
0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
smoogipoo
cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
David Zhao
f5d8700920 Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic 2019-02-20 17:40:13 +09:00
David Zhao
25e7dcb375 Remove unused includes 2019-02-20 17:39:35 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic 2019-02-20 17:30:34 +09:00
David Zhao
d703a9511a Fix background dim previews 2019-02-20 17:20:45 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
smoogipoo
703df77000 Update in-line with framework IsActive changes 2019-02-19 19:16:03 +09:00
David Zhao
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
David Zhao
1d80674fbd Fix fadecontainer being added to multiple containers 2019-02-18 17:11:38 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic 2019-02-18 16:56:16 +09:00
David Zhao
80800f2931 Match up fade behavior with current master 2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758 Fix unit tests 2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f Use conditional operator isntead of if 2019-02-18 15:23:03 +09:00
David Zhao
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
Dean Herbert
0a265c6d35
Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-18 11:54:25 +09:00
ThePyrotechnic
7bb56a198a
Merge branch 'master' into MissingSource 2019-02-17 19:54:43 +00:00
smoogipoo
134840f118 Fix nullref 2019-02-16 11:18:17 +09:00