1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Commit Graph

6164 Commits

Author SHA1 Message Date
Dan Balasescu
288c0402ee
Merge branch 'master' into editor-show-selected-count 2020-07-17 18:00:35 +09:00
Dan Balasescu
96c12bdf61
Merge pull request #9591 from peppy/editor-fix-double-click
Fix editor double-click incorrectly firing when clicks target different hitobjects
2020-07-17 17:58:15 +09:00
Dean Herbert
b4b230288b Shift hue of selection handler box to not collide with blueprints 2020-07-17 17:51:39 +09:00
Dean Herbert
ea6f257dc2 Add a display of count of selected objects in editor 2020-07-17 17:48:27 +09:00
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
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