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

3985 Commits

Author SHA1 Message Date
David Zhao
0b64af5e02 Put multiplayer background inside a parallax container 2019-03-11 16:51:43 +09:00
David Zhao
0d95511222
Merge branch 'master' into multi-background-stack 2019-03-11 11:19:08 +09:00
David Zhao
2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +09:00
Joehu
0fc6fa7245 Fix file naming on ParticipantCountDisplay 2019-03-09 20:29:56 -08:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
jorolf
af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01:00
Jamie Taylor
8e5816805c
Fix showing outdated data for non-online beatmaps 2019-03-08 18:44:35 +09:00
smoogipoo
d055b248ac Remove blank line 2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691 Merge remote-tracking branch 'origin/master' into gameplay-clock-container
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dean Herbert
ed8c9bc88a Merge remote-tracking branch 'upstream/master' into gameplay-clock-container 2019-03-08 15:07:55 +09:00
Dean Herbert
42efea1e06 Apply review 2019-03-08 15:05:45 +09:00
Dean Herbert
3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
Dan Balasescu
969d5bcbd0
Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 14:10:24 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
Jamie Taylor
08fc42f8e9
Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 12:39:29 +09:00
Dean Herbert
75e94eba35
Merge branch 'master' into gameplay-clock-container 2019-03-08 12:32:48 +09:00
smoogipoo
04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640 Merge remote-tracking branch 'nekodex/master' into drawnode-changes 2019-03-07 18:15:12 +09:00
Jamie Taylor
c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
Jamie Taylor
054db48089
Move online id null check to only bypass metrics lookup 2019-03-07 16:59:43 +09:00
Jamie Taylor
50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen 2019-03-07 16:49:48 +09:00
Jamie Taylor
e5e454ddcd
Don't perform lookup of beatmap stats unless an online id is present 2019-03-07 16:17:12 +09:00
Dean Herbert
64b6eaa844 Simplify inward bindings 2019-03-07 16:04:11 +09:00
Dean Herbert
58ef397f4f Move all clock related gameplay logic inside GameplayClockContainer 2019-03-07 16:02:24 +09:00
Dan Balasescu
7783c33398
Merge branch 'master' into fix-mp-chat-in-own-room 2019-03-07 15:59:53 +09:00
Jamie Taylor
ee076bbbe3
Fix chat channel ids not being updated on room creation 2019-03-07 15:35:57 +09:00
Jamie Taylor
e13516c2ba
Only attempt to restore CurrentItem state if present 2019-03-07 14:09:28 +09:00
Jamie Taylor
6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00
Jamie Taylor
5de6e29294
Reset currentRoom state when cancelling room creation 2019-03-06 20:03:37 +09:00
Dean Herbert
ffe53411f6 Add back cursor proxying 2019-03-06 17:44:58 +09:00
Dean Herbert
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert
b94d080b1c
Merge branch 'master' into LobbyList 2019-03-06 12:34:36 +09:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
David Zhao
89987210c3 Merge remote-tracking branch 'upstream/master' into LobbyList 2019-03-05 18:59:38 +09:00
David Zhao
34b2553b95 Remove redundant boolean 2019-03-05 18:59:25 +09:00
Dan Balasescu
fafc80818c
Fix typo
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-05 18:50:46 +09:00
Dean Herbert
fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
smoogipoo
c06dac5b1a Remove null check (beatmap cannot be null) 2019-03-05 17:58:30 +09:00
smoogipoo
2fee7276ae Combine creation + assignment 2019-03-05 17:58:05 +09:00
Dan Balasescu
bb6c83ab25
Merge branch 'master' into show-mods-on-loader 2019-03-05 17:46:35 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
David Zhao
166a8c8bbb Add back fallback behavior for match creation 2019-03-05 16:41:59 +09:00
Dean Herbert
93c79023dc Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock 2019-03-05 16:41:01 +09:00
David Zhao
11e353c152 Use local class instead of having a separate file 2019-03-05 15:55:37 +09:00
Dean Herbert
4e33a98dbc Move gameplay clock to own class 2019-03-05 13:53:47 +09:00
Dean Herbert
c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert
5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
David Zhao
aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +09:00
Dean Herbert
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
Dean Herbert
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
jorolf
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
jorolf
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dean Herbert
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
Nitrous
0be9f81310
Merge branch 'master' into show-mods-on-loader 2019-03-02 06:40:45 +08:00
Dean Herbert
1871e8bb2c
Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
Dean Herbert
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
LeNitrous
cf51c8aa31 attempt to comply with appveyor 2019-03-01 19:10:32 +08:00
LeNitrous
4e081fe1fc Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader 2019-03-01 18:41:41 +08:00
smoogipoo
bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
Dean Herbert
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
David Zhao
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
Dean Herbert
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
Dean Herbert
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
Dean Herbert
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
Dean Herbert
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
Dean Herbert
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
Dean Herbert
09e1e3bab6
Merge branch 'master' into UserDimLogic 2019-02-28 20:38:09 +09:00
Dean Herbert
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
Dean Herbert
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert
6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
Dean Herbert
c5270dd577 Remove unnecessary using 2019-02-28 20:17:00 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
smoogipoo
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
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
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
David Zhao
53b7fdd834 Clean up test code and unused includes 2019-02-15 16:57:53 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup 2019-02-15 16:55:39 +09:00
David Zhao
0a60f6dacd Documentation for tests and changes 2019-02-15 16:50:37 +09:00
David Zhao
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
David Zhao
3a74ad678a clean up unused includes 2019-02-14 18:41:10 +09:00
David Zhao
a09e0790e1 Fix storyboards not dimming 2019-02-14 18:07:28 +09:00
David Zhao
e2a312a663 Move user dimming logic into its own container 2019-02-14 17:47:53 +09:00
Dean Herbert
777a606b2d Don't revert beatmap on exiting leased state 2019-02-14 17:14:58 +09:00
Dean Herbert
94ceb1e32b Move screen change allowance to local usage 2019-02-14 13:28:21 +09:00
Dean Herbert
e604806398 Fix regression in screen change allowance logic 2019-02-13 19:43:01 +09:00
Dean Herbert
1373e0fad0 Fix BeatmapTitle not always displaying 2019-02-13 14:57:40 +09:00
Dean Herbert
166cdab2e8 Remove unnecessary null check 2019-02-13 14:14:57 +09:00
Dean Herbert
ab3adafafd Fix crashes after entering player 2019-02-13 14:13:54 +09:00
Dan Balasescu
c3ae4d7b14
Improve comment
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-13 11:34:48 +09:00
Michael Manis
5fbdbcf209 removed 'unknown source' line 2019-02-12 15:30:42 -05:00
Dean Herbert
2ea839c475 Fix crashes on beatmap not being set correctly in player 2019-02-12 19:18:22 +09:00
Dean Herbert
d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
Dean Herbert
272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
Dean Herbert
78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
Dean Herbert
e4422167b6 Fix starting gameplay 2019-02-11 19:13:57 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
ThePyrotechnic
450fa0075f
Merge branch 'master' into MissingSource 2019-02-10 23:44:47 +00:00
Michael Manis
cfe14dcdb1 Options for handing unknown beatmap source 2019-02-10 18:31:39 -05:00
Dean Herbert
a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
Dean Herbert
f52cac966b Fix multiple blank lines 2019-02-08 18:45:32 +09:00
Dean Herbert
6c4d289901 Pass item rather than ID 2019-02-08 18:33:49 +09:00
Dan Balasescu
7ec0b4ba77 Fix nullref during room creation (#4228) 2019-02-08 17:53:01 +09:00
Dan Balasescu
959b1ac845 Fix potential nullref when exiting multiplayer (#4227)
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
smoogipoo
febcd7d7c0 Remove currentRoom from RoomManager 2019-02-08 15:46:16 +09:00
smoogipoo
fdd37dbc4b Merge remote-tracking branch 'origin/master' into cmc-rooms 2019-02-08 15:44:33 +09:00
smoogipoo
5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
smoogipoo
6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
smoogipoo
43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
smoogipoo
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00
smoogipoo
990bd44ca2 Combine roommanager and roompollingcomponent 2019-02-08 13:01:10 +09:00
smoogipoo
17fdfc15d9 Fix room title in the breadcrumbs 2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a Fix up room inspector status 2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f Move StatusColouredContainer into a more public location 2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251 Fix room name being coloured 2019-02-07 16:45:36 +09:00
smoogipoo
4f86fe92ea Fix match settings not showing 2019-02-06 18:50:43 +09:00
ProgrammaticNajel
9f8e724a76 Fix background being cut off at the top of the screen (#4207)
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
smoogipoo
3207983a1c Fix current room being set to null when parted 2019-02-06 15:12:40 +09:00
smoogipoo
a9aa22c97b Remove ShadowModel requirement 2019-02-06 13:52:48 +09:00
smoogipoo
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
smoogipoo
be51ee4ed5 Implement MultiplayerComposite, replaces RoomBindings 2019-02-05 16:14:37 +09:00
smoogipoo
d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
smoogipoo
37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
smoogipoo
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
Dean Herbert
e01f342ab0 wip 2019-02-02 17:11:25 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text 2019-01-31 21:17:40 +09:00
Unknown
8c1f8ee596 restart correctly when leaving player (without noises) 2019-01-31 12:33:08 +01:00
Unknown
e2347ae7bf Merge branch 'master' into correct-preview-loop 2019-01-31 10:53:09 +01:00
Dean Herbert
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
smoogipoo
bdaff27575 Fix nullref due to screens now being removed from parent 2019-01-31 15:02:07 +09:00
smoogipoo
255b4a30e0 Allow logo to be null 2019-01-31 13:50:37 +09:00
smoogipoo
58d744e5dc Remove manual overlay/toolbar logic from multiplayer 2019-01-31 13:38:21 +09:00
Dean Herbert
beab367e6d Add null checks/allowances 2019-01-31 11:00:33 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen 2019-01-31 01:08:06 +09:00
smoogipoo
ac0bc53c4b Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
2019-01-31 00:02:05 +09:00
smoogipoo
5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
smoogipoo
82dc7f39a3 Update licenses 2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
8118b649d8
Merge branch 'master' into show-mods-on-loader 2019-01-28 14:11:54 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level 2019-01-28 13:49:12 +09:00
Jack Scotson
6a2100ddba
Merge branch 'master' into menu-globalaction-select 2019-01-27 19:13:34 +00:00
Scotsoo
c00636d328 Removing whitespace 2019-01-27 19:09:30 +00:00
Scotsoo
29c02fbaa7 Remove redundant space 2019-01-27 18:27:11 +00:00
Scotsoo
07bb278ec0 Considering GlobalActions in GameplatMenuOverlay 2019-01-27 18:19:20 +00:00
LeNitrous
a1ce7e9a95 add ModDisplay on PlayerLoader 2019-01-26 17:14:45 +08:00
Unknown
1fa87521f6 fix restarting with a different track in the same BeatmapSet 2019-01-26 07:29:30 +01:00
Unknown
3d5520d277 correctly loop from preview point in SongSelect 2019-01-26 07:09:01 +01:00
smoogipoo
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
smoogipoo
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00
smoogipoo
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +09:00
Dean Herbert
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
ProgrammaticNajel
593e0b36f5 Add overflow padding in other multiplayer screen components
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
smoogipoo
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec Fix player never completing load 2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08:00
ProgrammaticNajel
e4084b7d5d Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00
chrisny286
76700ad20f Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf replace FadeTo in PlayerLoader
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
4180ca75bc
Fix typo in comment 2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
chrisny286
5d2b2ecf06 Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a Fix backgrounds being transparent in some scaling modes
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a Formatting fixes 2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
chrisny286
13ba9d64d0 revert empty line 2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07 revert and make VisibilityContainer not AlwaysPresent 2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f add check if replay is loaded before allowseeking can be overwitten 2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb Fix autoplay rewind/skip usable when UI hidden 2019-01-23 01:16:37 +01:00
Dean Herbert
5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Dean Herbert
c58fe4f4ff Fix nullref 2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219 Fix replay playback speed not being displayed initially 2019-01-22 11:40:57 +09:00
Dean Herbert
21317806c9 Merge remote-tracking branch 'upstream/master' into nwabear-master 2019-01-22 10:07:35 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Dean Herbert
b373d78143 Add slight easing 2019-01-22 09:47:51 +09:00
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
chrisny286
d7d2e2fe44 trimmed whitespace 2019-01-21 19:22:19 +01:00
chrisny286
65fd69c817 Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
chrisny286
fb51578df3 Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
ekrctb
e74f0057bd Automatically layout based on score display width 2019-01-21 17:07:56 +09:00
Shane Woolcock
fa6dd8c99e Code sanity 2019-01-20 19:03:06 +10:30
Shane Woolcock
521b11dfcb Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
2019-01-20 18:51:17 +10:30
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
Dean Herbert
1d40d88f82
Merge branch 'master' into add-room-null-check 2019-01-17 21:34:25 +09:00
Dean Herbert
59f7c5a26e Fix room inspector cover not resetting when no room selected 2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2 Add null check to fix crash on deselecting multiplayer room 2019-01-17 18:17:47 +09:00
Dean Herbert
491537b8ba Add fade duration
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
2019-01-17 18:13:05 +09:00
Dean Herbert
c1f5c0edc9
Merge branch 'master' into hide-multiplayer-match-room-tab 2019-01-17 18:02:17 +09:00
ekrctb
2bc3464802 Hide Room tab when Settings tab is active 2019-01-17 17:27:34 +09:00
ekrctb
f982b6da55 Don't hide 'hold for menu' even hud is hidden 2019-01-17 16:49:04 +09:00
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal 2019-01-17 15:29:49 +09:00
ekrctb
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
Dean Herbert
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +09:00
Microgolf
097062caf7 Addresses requested changes 2019-01-08 17:57:03 +01:00
m2307
42ba690809
Merge branch 'master' into master 2019-01-08 17:53:58 +01:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
Dean Herbert
6ce08312b2
Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +09:00
smoogipoo
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
smoogipoo
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
smoogipoo
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Dean Herbert
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Matthias Coenraerds
562c9e56fb Fix naming 2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885 Verify leaderboard scope to be local 2019-01-06 13:37:30 +01:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Matthias Coenraerds
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4 Implement clear scores on beatmap 2019-01-04 20:23:06 +01:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00