smoogipoo
156a518068
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-20 21:16:05 +09:00
Dan Balasescu
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
Bartłomiej Dach
0825fc57a9
Move foreground colour helper into OsuColour
2021-04-19 18:24:48 +02:00
Bartłomiej Dach
97573fb11d
Merge branch 'master' into combo-colours-display
2021-04-19 18:21:57 +02:00
Bartłomiej Dach
1a77161f05
Merge pull request #12487 from peppy/update-framework
...
Update framework
2021-04-19 17:55:00 +02:00
Dean Herbert
510e54ff54
Update framework
2021-04-19 23:41:21 +09:00
Dean Herbert
fc41ad65f8
Merge pull request #12447 from smoogipoo/fix-non-60fps-recording
...
Record every 60fps interval
2021-04-19 23:26:58 +09:00
Dan Balasescu
abf10923cf
Merge pull request #12485 from peppy/timing-screen-more-updates
...
Timing screen more updates
2021-04-19 21:54:23 +09:00
Dean Herbert
a40dcd4b8d
Add a touch more space in the timing column
2021-04-19 18:53:06 +09:00
Dean Herbert
097a347533
Adjust Add different background colour for timing area
2021-04-19 18:25:30 +09:00
Dean Herbert
5bce5d2057
Update design logic
2021-04-19 18:25:20 +09:00
Dan Balasescu
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
smoogipoo
c12848ce4d
Apply fixes to tests
2021-04-19 17:02:59 +09:00
smoogipoo
5397f4faba
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-19 16:49:06 +09:00
smoogipoo
c50b526ba0
Remove local state dictionary from SpectatorScreen
2021-04-19 16:48:55 +09:00
Dean Herbert
8fcfac7ddc
Merge branch 'master' into timing-screen-ux
2021-04-19 16:44:32 +09:00
Dean Herbert
1ebc5ac5cc
Remove unused legacy class
2021-04-19 16:36:00 +09:00
Dean Herbert
8da561a2a6
Soften colours and adjust padding slightly
2021-04-19 16:35:36 +09:00
Dean Herbert
f8b20ca8aa
Add new display for effect row attribute
2021-04-19 16:35:36 +09:00
Dean Herbert
ec249a0edb
Add new display for sample row attribute
2021-04-19 16:23:28 +09:00
Dean Herbert
6465a72060
Add bubbled word class for use in attribute rows
2021-04-19 16:23:28 +09:00
Dean Herbert
3aad0a8b9c
Add new display for difficulty row attribute
2021-04-19 16:23:06 +09:00
Dean Herbert
d3cebfb6fb
Use explicit label
2021-04-19 16:23:06 +09:00
Dean Herbert
a10a8680d0
Add new display for timing row attributes
2021-04-19 16:23:06 +09:00
smoogipoo
83716ddb08
Rename currentUserStates -> playingUserStates
2021-04-19 16:07:00 +09:00
smoogipoo
de9e37857e
Lock around playingUsers
2021-04-19 16:06:40 +09:00
smoogipoo
5885c24e00
Clear current user states on disconnect
2021-04-19 16:00:56 +09:00
Dan Balasescu
be5abea7ca
Merge pull request #12446 from jvyden/master
...
Reset SessionStatics on inactivity
2021-04-19 14:44:39 +09:00
Dean Herbert
f4baff9e04
Make TimingScreen use rounded screen and adjust spacing/padding
2021-04-19 14:35:35 +09:00
Dean Herbert
e143afb598
Split out rounded content screen from SetupScreen for use in other places
2021-04-19 14:28:32 +09:00
jvyden
ffc1e841e0
Fix sessionIdleTracker not being properly added to OsuGame
2021-04-19 01:06:26 -04:00
Dean Herbert
513e470b52
Adjust grid spacing to allow attributes to use more width
2021-04-19 13:24:53 +09:00
Dean Herbert
0c918410d0
Make "add" button more visible
2021-04-19 13:15:24 +09:00
Dean Herbert
658c23c925
Give more space to the parameter adjustment area
2021-04-19 13:15:17 +09:00
jvyden
a854ce429a
add blank line between method
2021-04-18 23:49:13 -04:00
Dean Herbert
f9f514ffec
Add basic xmldoc to show how the two colour classes interact
2021-04-19 12:37:56 +09:00
jvyden
999f2d810c
Fix accidentally removed code
2021-04-18 23:30:07 -04:00
jvyden
e44d11667c
Merge remote-tracking branch 'upstream'
2021-04-18 23:04:35 -04:00
jvyden
c39ab2c692
Add SessionStaticsTest
2021-04-18 23:04:28 -04:00
jvyden
b727faace3
Revert changes to IdleTracker
2021-04-18 23:03:43 -04:00
Dean Herbert
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
Dean Herbert
dbb8f7f4a9
Tidy up initialisation code and avoid using DI on inherited class
2021-04-19 11:30:55 +09:00
Dean Herbert
2b6caf9b65
Fix duplicate code in setting default logic
2021-04-19 11:25:43 +09:00
Joseph Madamba
89940e7bb9
Fix download button check icon not scaling on mouse down
2021-04-18 19:05:33 -07:00
Bartłomiej Dach
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
Bartłomiej Dach
07a00cd681
Add colours section with combo colour display
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
577755ee19
Add placeholder when no colours are visible
...
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
0cd1aa8c1c
Add support for custom colour prefixes
2021-04-18 20:44:55 +02:00
Bartłomiej Dach
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
Bartłomiej Dach
67c19df000
Add test coverage for adding/removing colours
2021-04-18 19:35:42 +02:00
