Commit Graph

38418 Commits

Author SHA1 Message Date
a9e4a0ed50 Fix potentially starting play when finished
The UserFinishedPlaying event may trigger before the event is subscribed
to by SpectatorScreen. For such cases, an extra check is done to make
sure the user is _actually_ playing.
2021-04-20 21:19:08 +09:00
156a518068 Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-20 21:16:05 +09:00
e227c076e5 Merge pull request #12478 from bdach/combo-colours-display
Add read-only combo colour display to setup screen
2021-04-20 11:55:35 +09:00
0825fc57a9 Move foreground colour helper into OsuColour 2021-04-19 18:24:48 +02:00
97573fb11d Merge branch 'master' into combo-colours-display 2021-04-19 18:21:57 +02:00
1a77161f05 Merge pull request #12487 from peppy/update-framework
Update framework
2021-04-19 17:55:00 +02:00
510e54ff54 Update framework 2021-04-19 23:41:21 +09:00
fc41ad65f8 Merge pull request #12447 from smoogipoo/fix-non-60fps-recording
Record every 60fps interval
2021-04-19 23:26:58 +09:00
abf10923cf Merge pull request #12485 from peppy/timing-screen-more-updates
Timing screen more updates
2021-04-19 21:54:23 +09:00
a40dcd4b8d Add a touch more space in the timing column 2021-04-19 18:53:06 +09:00
097a347533 Adjust Add different background colour for timing area 2021-04-19 18:25:30 +09:00
5bce5d2057 Update design logic 2021-04-19 18:25:20 +09:00
1e6a9cec61 Merge pull request #12484 from peppy/timing-screen-ux
Update the design of the editor timing screen
2021-04-19 17:20:48 +09:00
c12848ce4d Apply fixes to tests 2021-04-19 17:02:59 +09:00
5397f4faba Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-19 16:49:06 +09:00
c50b526ba0 Remove local state dictionary from SpectatorScreen 2021-04-19 16:48:55 +09:00
8fcfac7ddc Merge branch 'master' into timing-screen-ux 2021-04-19 16:44:32 +09:00
1ebc5ac5cc Remove unused legacy class 2021-04-19 16:36:00 +09:00
8da561a2a6 Soften colours and adjust padding slightly 2021-04-19 16:35:36 +09:00
f8b20ca8aa Add new display for effect row attribute 2021-04-19 16:35:36 +09:00
ec249a0edb Add new display for sample row attribute 2021-04-19 16:23:28 +09:00
6465a72060 Add bubbled word class for use in attribute rows 2021-04-19 16:23:28 +09:00
3aad0a8b9c Add new display for difficulty row attribute 2021-04-19 16:23:06 +09:00
d3cebfb6fb Use explicit label 2021-04-19 16:23:06 +09:00
a10a8680d0 Add new display for timing row attributes 2021-04-19 16:23:06 +09:00
83716ddb08 Rename currentUserStates -> playingUserStates 2021-04-19 16:07:00 +09:00
de9e37857e Lock around playingUsers 2021-04-19 16:06:40 +09:00
5885c24e00 Clear current user states on disconnect 2021-04-19 16:00:56 +09:00
be5abea7ca Merge pull request #12446 from jvyden/master
Reset SessionStatics on inactivity
2021-04-19 14:44:39 +09:00
f4baff9e04 Make TimingScreen use rounded screen and adjust spacing/padding 2021-04-19 14:35:35 +09:00
e143afb598 Split out rounded content screen from SetupScreen for use in other places 2021-04-19 14:28:32 +09:00
ffc1e841e0 Fix sessionIdleTracker not being properly added to OsuGame 2021-04-19 01:06:26 -04:00
513e470b52 Adjust grid spacing to allow attributes to use more width 2021-04-19 13:24:53 +09:00
0c918410d0 Make "add" button more visible 2021-04-19 13:15:24 +09:00
658c23c925 Give more space to the parameter adjustment area 2021-04-19 13:15:17 +09:00
a854ce429a add blank line between method 2021-04-18 23:49:13 -04:00
f9f514ffec Add basic xmldoc to show how the two colour classes interact 2021-04-19 12:37:56 +09:00
999f2d810c Fix accidentally removed code 2021-04-18 23:30:07 -04:00
e44d11667c Merge remote-tracking branch 'upstream' 2021-04-18 23:04:35 -04:00
c39ab2c692 Add SessionStaticsTest 2021-04-18 23:04:28 -04:00
b727faace3 Revert changes to IdleTracker 2021-04-18 23:03:43 -04:00
f74904f0aa Merge pull request #12481 from Joehuu/fix-download-button-check-scaling
Fix download button check icon not scaling on mouse down
2021-04-19 11:49:39 +09:00
dbb8f7f4a9 Tidy up initialisation code and avoid using DI on inherited class 2021-04-19 11:30:55 +09:00
2b6caf9b65 Fix duplicate code in setting default logic 2021-04-19 11:25:43 +09:00
89940e7bb9 Fix download button check icon not scaling on mouse down 2021-04-18 19:05:33 -07:00
6f2ebb20a7 Fix test failing due to null beatmap skin
Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
2021-04-18 20:46:42 +02:00
07a00cd681 Add colours section with combo colour display 2021-04-18 20:46:42 +02:00
577755ee19 Add placeholder when no colours are visible
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
0cd1aa8c1c Add support for custom colour prefixes 2021-04-18 20:44:55 +02:00
a8027d87b6 Fix unreadable colour hex code text due to low contrast
Logic is shared with the timeline blueprints which also have the same
problem of displaying text on top of a combo colour.

Slightly modified the formula. Seems to yield better results on a
subjective check.
2021-04-18 20:44:55 +02:00