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

6289 Commits

Author SHA1 Message Date
Dean Herbert
222a22182e Fix double-click incorrectly firing across disparate targets 2020-07-17 17:03:57 +09:00
Dean Herbert
039790ce4f Perform next timing point check before ensuring movement 2020-07-17 16:40:02 +09:00
Dean Herbert
e96e558728 Fix reversing scroll direction not always behaving as expected 2020-07-17 16:03:23 +09:00
smoogipoo
9a52058a7a Update carousel beatmap SR on mod/ruleset changes 2020-07-16 21:08:24 +09:00
smoogipoo
24f14751ce Update beatmap details SR on ruleset/mod changes 2020-07-16 21:08:08 +09:00
jorolf
87f7d8744d simplify transform 2020-07-15 12:40:46 +02:00
Dean Herbert
fe68e8276d Merge branch 'master' into logo-shader 2020-07-15 19:06:35 +09:00
Dean Herbert
675544ec2f Tidy up colour and variable usage 2020-07-15 19:03:59 +09:00
Dean Herbert
afae79662c
Merge pull request #9566 from Joehuu/seek-replay/auto-with-arrow-keys 2020-07-15 18:46:44 +09:00
Dean Herbert
0125a7ef3b Fix single-frame glitch in SS grade display animation 2020-07-15 15:36:17 +09:00
Dan Balasescu
b1c06c1e90
Merge branch 'master' into fix-screens-blocking-home/altf4 2020-07-15 13:17:53 +09:00
smoogipoo
e2c043737d Reword xmldoc to specify intended usage 2020-07-15 13:08:57 +09:00
smoogipoo
350a4a153b Fix possible nullref 2020-07-15 12:59:31 +09:00
Joehu
ecbd8067e9 Add ability to seek replays/auto with arrow keys 2020-07-14 20:18:47 -07:00
Joehu
73e1bf0d89 Check sub screen's OnBackButton instead 2020-07-14 13:19:48 -07:00
Joehu
21ed9df1ea Add xmldoc for OnBackButton 2020-07-14 13:14:59 -07:00
Dan Balasescu
c49ce65326
Merge pull request #9540 from peppy/gameplay-pause-via-middle-mouse
Allow pausing gameplay via middle mouse button
2020-07-14 21:13:31 +09:00
Dan Balasescu
3bae34653e
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 20:31:35 +09:00
Dean Herbert
2626ab41c3 Add implicit braces for clarity 2020-07-14 20:15:31 +09:00
Dean Herbert
c7d3b025ad Rename variable and change default to true 2020-07-14 20:11:54 +09:00
Dean Herbert
690f2fd482 Merge branch 'master' into always-combo-break 2020-07-14 20:11:02 +09:00
Dan Balasescu
0e31982b4e
Merge pull request #9557 from peppy/fix-user-request-population
Fix some web requests retrieving the user too early
2020-07-14 17:56:31 +09:00
Joehu
36041fc245 Fix back button not working correctly with multi song select's mod select 2020-07-14 00:29:57 -07:00
Joehu
3573460d9c Fix multiplayer screens blocking home and alt f4 2020-07-14 00:02:01 -07:00
Joehu
daa7430fd8 Fix statistics screen blocking retry, home, and alt f4 2020-07-14 00:00:43 -07:00
Joehu
4caf4d31d4 Fix mod select blocking home and alt f4 in song select 2020-07-14 00:00:10 -07:00
Joehu
1a2f5cb477 Add OnBackButton bool to OsuScreen 2020-07-13 23:59:20 -07:00
Dean Herbert
7fe69bb199 Fix some web requests retrieving the user too early 2020-07-14 13:07:17 +09:00
Dean Herbert
42dfc47fe3 Merge branch 'master' into legacy-background 2020-07-14 11:03:47 +09:00
Dean Herbert
f36c23928b Merge branch 'master' into legacy-background 2020-07-14 11:02:24 +09:00
Dean Herbert
064814f70a
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 07:39:02 +09:00
Dean Herbert
ef3ab7a858 Merge branch 'master' into fix-carousel-filter-application 2020-07-13 17:05:45 +09:00
Joehu
79ea6dbd5c Only allow link clicking and tooltips of multi room drawables when selected 2020-07-12 22:24:11 -07:00
Dean Herbert
0718e9e4b6 Update outdated comment 2020-07-13 13:08:41 +09:00
Dean Herbert
f442df75a9 Add missing released conditional 2020-07-13 09:00:10 +09:00
Dean Herbert
c1aafe83fa Add note about future behaviour 2020-07-12 23:05:47 +09:00
Dean Herbert
08696b9bca Allow pausing gameplay via middle mouse button 2020-07-12 23:03:03 +09:00
Dean Herbert
ab11a112b7 Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load 2020-07-12 22:33:41 +09:00
Joehu
fa0c2d7f84 Fix room name overflowing on multiplayer lounge 2020-07-10 10:42:41 -07:00
Dan Balasescu
895c129151
Merge pull request #9492 from peppy/ensure-music-playing-mainmenu-lounge
Ensure music playing when returning to lounge or main menu
2020-07-10 21:23:24 +09:00
Dan Balasescu
6345af6f3b
Merge pull request #9494 from peppy/playlist-results-button
Replace large "show results" button with embedded button each playlist item
2020-07-10 20:58:12 +09:00
Dan Balasescu
be2c892c30
Merge branch 'master' into ensure-music-playing-mainmenu-lounge 2020-07-10 20:48:16 +09:00
Dean Herbert
d3367bb0f1 Remove unused public property 2020-07-10 20:32:47 +09:00
Dean Herbert
9556166c1b Replace large "show results" button with embedded button each playlist item 2020-07-10 20:19:17 +09:00
smoogipoo
fe585611e7 Fix + simplify web request 2020-07-10 19:54:09 +09:00
Dean Herbert
64e8dce1ad Highlight spotlight rooms with a different colour 2020-07-10 19:38:33 +09:00
Dean Herbert
cf3251a950 Default to showing all rooms 2020-07-10 19:38:13 +09:00
Dean Herbert
24132c7cf9 Merge branch 'master' into multiplayer-categories 2020-07-10 19:00:57 +09:00
Dean Herbert
1760cc2427 Fix behavioural regression by splitting methods out 2020-07-10 18:03:56 +09:00
smoogipoo
926279e39b Implement category dropdown for multiplayer 2020-07-10 17:26:42 +09:00
Dean Herbert
44fdb5b82e Ensure music starts when returning to lounge or main menu 2020-07-10 17:20:27 +09:00
smoogipoo
1f2689f7cb Merge branch 'master' into un-nest-overlined-display 2020-07-10 15:37:43 +09:00
smoogipoo
2ed8d42d22 Remove whitespace 2020-07-10 15:37:13 +09:00
smoogipoo
a9faa11dcb Add back playlist header 2020-07-10 15:37:08 +09:00
Dan Balasescu
14eaf75009
Merge branch 'master' into un-nest-overlined-display 2020-07-10 14:41:31 +09:00
Dean Herbert
973b6c680a
Merge branch 'master' into un-nest-overlined-display 2020-07-09 18:26:23 +09:00
Dean Herbert
115bb40816 Select via select action 2020-07-09 18:25:14 +09:00
Dean Herbert
601101147e Allow keyboard selection of rooms at the multiplayer lounge 2020-07-09 18:25:14 +09:00
Dean Herbert
80f6f87e01 Scroll selected room into view on selection 2020-07-09 17:45:29 +09:00
Dean Herbert
69062a3ed1 Remove unused search container in lounge 2020-07-09 17:43:26 +09:00
Dean Herbert
f231b5925f Add "show converted" checkbox to song select for convenience 2020-07-09 13:47:23 +09:00
Dean Herbert
bbbe8d6f68 Remove group selector for now, tidy up code somewhat 2020-07-09 13:47:11 +09:00
Dean Herbert
fd56db2156
Merge pull request #9467 from peppy/less-poo 2020-07-09 12:41:37 +09:00
Dean Herbert
efdf179906 Replace poo icon at disclaimer screen 2020-07-09 12:31:20 +09:00
Joehu
c10cf2ef49 Fix multi header title not aligning correctly when changing screens 2020-07-08 19:01:12 -07:00
BananeVolante
f03303573e formating 2020-07-08 13:54:22 +02:00
Dean Herbert
35d3292200 Remove nesting of components inside overlined component
I think this makes things a bit more readable. The only weird case is
the transfer of details from the component to the `OverlinedHeader`, but
bindables make it not too bad.
2020-07-08 14:45:51 +09:00
Dean Herbert
4b4fcd39e3 Further layout adjustments based on fedback 2020-07-07 18:40:21 +09:00
Dean Herbert
4a1bea4874 Adjust layout to be two columns (and more friendly to vertical screens) 2020-07-07 18:28:43 +09:00
Dean Herbert
88b2a12c09 Reduce footer height to match back button 2020-07-07 17:38:42 +09:00
Dean Herbert
56a8b0d3f5 Merge branch 'master' into match-subscreen-redesign 2020-07-07 17:16:05 +09:00
Dean Herbert
3f3bfb1ffb Minor reshuffling / recolouring 2020-07-06 23:51:16 +09:00
Dean Herbert
a650a5ec83 Move dialog classes to own file 2020-07-06 23:44:26 +09:00
Dean Herbert
f566787988
Merge branch 'master' into custom-storage-startup-exception 2020-07-06 23:32:39 +09:00
smoogipoo
ddac511c8c Move start fresh button above 2020-07-06 22:41:51 +09:00
Dan Balasescu
8f792603ee
Apply suggestions from code review
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-07-06 22:40:45 +09:00
smoogipoo
1effe71ec2 Add dialog for storage options 2020-07-06 22:03:09 +09:00
jorolf
52b313f290 change textures 2020-07-04 19:06:26 +02:00
BananeVolante
e8f23e35a5 WIP : replaced TransformBindableTo by VolumeTo
Currently, the VolumeTO calls taht use a fading does not do anything.
calling VolumeTo calls pauseLoop.samplesContainer.TransformBindableTo(....), while i used to call pauseLoop.TransformBindableTo(....)
2020-07-03 14:33:42 +02:00
BananeVolante
3c2870ea4b Merge branch 'master' of https://github.com/ppy/osu into Issue#9170 2020-07-03 14:00:32 +02:00
Shivam
4ded6d1913 Change background path with resource change 2020-07-03 11:36:03 +02:00
Joehu
718f06c690 Use Mod.AdjustRank() instead 2020-07-02 12:35:32 -07:00
Shivam
e80a5a085a Make backgroundName local 2020-07-02 19:45:18 +02:00
Shivam
18e30a7fc4 Implement background switching based on the intro
Only the Welcome intro has its own unique background right now
2020-07-02 19:23:13 +02:00
BananeVolante
53947faec5 Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local code
2020-07-02 16:26:26 +02:00
Joehu
fa252d5e95 Fix score panel not showing silver s/ss badges on hd/fl plays 2020-07-01 17:37:38 -07:00
Joehu
5c1f1ab622 Fix avatar in score panel being unclickable when statistics panel is visible 2020-07-01 14:31:06 -07:00
BananeVolante
ab1eb469af removed unneeded null checks 2020-07-01 13:30:23 +02:00
BananeVolante
ab134c0ed7 removed unneeded information in a comment 2020-07-01 13:27:33 +02:00
BananeVolante
946fcf75ac Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
update local code
2020-07-01 13:06:44 +02:00
Dean Herbert
ed20bdf2e9
Merge pull request #9403 from smoogipoo/fix-results-ui-scale
Fix scroll container height on smaller ui scales
2020-07-01 18:45:49 +09:00
Dean Herbert
4ae70f2679
Merge pull request #9393 from smoogipoo/improve-wedge-quality
Improve quality of song select beatmap wedge
2020-07-01 18:25:14 +09:00
smoogipoo
1701c844a6 Fix scroll container height on smaller ui scales 2020-06-30 16:36:53 +09:00
Dan Balasescu
0e80d6629b
Merge branch 'master' into red-tint 2020-06-30 15:44:22 +09:00
Derrick Timmermans
bb81f908fb
Exclude EmptyHitWindow from being considered in TimingDistributionGraph 2020-06-29 15:53:56 +08:00
smoogipoo
af7494b232 Improve quality of song select beatmap wedge 2020-06-29 13:58:35 +09:00
Shivam
444504f2b9 Expose MainMenu Track as internal get private set 2020-06-29 02:10:40 +02:00
Shivam
24dceb9f84 Make only "Welcome" loop 2020-06-29 01:41:47 +02:00
Shivam
270384e71e Remove redundant get set 2020-06-29 00:59:44 +02:00
Shivam
5689f27987 Make sure it only loops for themed intros if true 2020-06-29 00:54:06 +02:00
Shivam
ffbce61ca8 Add the option to loop the intro in the main menu 2020-06-29 00:42:47 +02:00
Bartłomiej Dach
678767918e Centralise logic further 2020-06-28 23:32:04 +02:00
jorolf
820056cc4e update colours/transformations 2020-06-28 17:53:53 +02:00
Dean Herbert
6547e07e56
Merge pull request #9377 from smoogipoo/fix-unsafe-mod-deserialisation
Fix crash due to unsafe mod deserialisation
2020-06-29 00:02:29 +09:00
Dean Herbert
006adf0fb5 Change logic to ignore rooms completely after first error 2020-06-28 22:45:13 +09:00
Dean Herbert
e5a901cec7
Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-28 22:14:22 +09:00
Bartłomiej Dach
3637bf2f9b Clean up member order & access modifiers 2020-06-26 19:39:55 +02:00
Bartłomiej Dach
02f590309d Add xmldoc for public property 2020-06-26 19:39:55 +02:00
Bartłomiej Dach
a63b6a3ddf Simplify binding 2020-06-26 19:39:55 +02:00
Bartłomiej Dach
415e1c05ff Simplify implementation 2020-06-26 19:39:55 +02:00
Bartłomiej Dach
3783fe8d6a Rename fields for clarity 2020-06-26 19:39:53 +02:00
smoogipoo
e8d36bc3cb Don't trigger the same exception multiple times 2020-06-27 00:23:23 +09:00
smoogipoo
c233dc4768 Add some global error handling 2020-06-27 00:16:16 +09:00
Power Maker
798e8e7a8d Fix CI fail 2020-06-26 15:12:01 +02:00
Power Maker
efeaa1cc10 Make some changes, fix and add tests 2020-06-26 14:58:42 +02:00
Power Maker
97a212a7f6 Hide red tint based on "Show health display even when you can't fail" setting 2020-06-26 14:32:01 +02:00
BananeVolante
fdc9756b3f Merge branch 'master' of https://github.com/ppy/osu into Issue#9170 2020-06-26 14:23:37 +02:00
BananeVolante
a4bb238c45 fixed bug preventing the pause loop from playing during the first pause after changing a skin 2020-06-26 14:07:27 +02:00
smoogipoo
099416b4c3 Move check inside next difficulty selection 2020-06-26 21:03:34 +09:00
smoogipoo
8f6d52550f Fix potential exception if button is pressed before selection 2020-06-26 20:32:13 +09:00
smoogipoo
1b4c31a84f Remove double schedule 2020-06-26 20:14:08 +09:00
smoogipoo
e3d654d33f Cleanup 2020-06-26 20:14:02 +09:00
BananeVolante
7d2d6a52c9 now uses SkinnableSample instead of Drawable sample
Still does not support switching skins after Pause overlay loading,
there will be no sound for the first pause (works fine the the nexts)

Also, the pause loop seems to play for approximately 1 second when exiting the
screens via restart or quit

finally, since SkinnableSound does not play a sound if its aggregate
volume is at 0, i had turn up the volume a bit before playing the loop
2020-06-25 18:58:04 +02:00
smoogipoo
8d47c908ad Remove breadcrumb fade 2020-06-25 22:28:45 +09:00
smoogipoo
44a8039e92 Reduce header further 2020-06-25 22:22:24 +09:00
smoogipoo
23f569351a Add back missing beatmap results button 2020-06-25 22:22:19 +09:00
smoogipoo
b7f5a89f82 Reduce background fade opacity 2020-06-25 22:13:39 +09:00
smoogipoo
668105dd6e Adjust boldening 2020-06-25 22:06:30 +09:00
smoogipoo
20092c58ff Reduce spacing between recent participants tiles 2020-06-25 21:59:53 +09:00
smoogipoo
7c1dd43899 Re-style multiplayer header 2020-06-25 21:58:40 +09:00
Dean Herbert
d704a4597d Use existing helper function for key repeat 2020-06-25 21:33:02 +09:00
smoogipoo
01fa664b7d Add recent participants 2020-06-25 20:53:48 +09:00
smoogipoo
54f087b933 Re-layout match subscreen columns 2020-06-25 20:40:15 +09:00
BananeVolante
9e5cc1b7a2 added skin support for the pause loop 2020-06-25 13:26:42 +02:00
Dean Herbert
d7742766d0 Add key/press repeat support to carousel 2020-06-25 19:47:23 +09:00
Dean Herbert
b077a2856d Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-25 18:44:08 +09:00
jorolf
1409ace282 apply suggestions 2020-06-25 00:59:12 +02:00
jorolf
6f0ec36407 remove size from hue animation 2020-06-24 16:27:00 +02:00
BananeVolante
2e8f30461f play/stops music when entering the pause overlay, instead of letting it play silently in the background 2020-06-24 14:22:12 +02:00
BananeVolante
9514a02eeb Merge branch 'master' of https://github.com/ppy/osu into Issue#9170 2020-06-24 14:12:07 +02:00
jorolf
768e28faba generalize and simplify animation 2020-06-24 14:11:38 +02:00
BananeVolante
53107973a3
merged 2 lines
Co-authored-by: Salman Ahmed <email@iisalman.me>
2020-06-24 14:01:13 +02:00
Viktor Rosvall
9e1bf71233 Added text explaining a second copy will be made 2020-06-24 11:29:38 +02:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Sebastian Krajewski
68f078c9e6 Replace logo-triangles.mp4 with shadered logo-triangles.png 2020-06-24 10:30:33 +02:00
Dean Herbert
ccb27082d5 Fix background appearing too late 2020-06-24 11:08:32 +09:00
Dean Herbert
4244024fc3 Merge branch 'master' into fallback-intro 2020-06-24 10:49:45 +09:00
Bartłomiej Dach
43be75d481
Merge branch 'master' into Issue#9170 2020-06-23 20:49:13 +02:00
Dan Balasescu
11446a7864
Merge pull request #9355 from peppy/update-framework
Update framework
2020-06-23 22:27:55 +09:00
Dan Balasescu
fd9ac3503f
Merge branch 'master' into fix-editor-drag-selection-while-playing 2020-06-23 21:56:31 +09:00