Dean Herbert
5b009c21bb
Merge branch 'master' into abstract-blueprint-handling
2021-04-29 16:10:22 +09:00
Dean Herbert
ac1534cda2
Add test covering existing button actually changing to LocallyAvailable state
2021-04-28 15:54:40 +09:00
Dean Herbert
f2e56bd306
Refactor editor selection/blueprint components to be generic
2021-04-27 19:01:29 +09:00
Dan Balasescu
be8fe47f2c
Merge branch 'master' into editor-add-nudge-shortcuts
2021-04-22 20:38:34 +09:00
Dan Balasescu
b774f5b72b
Merge pull request #12526 from peppy/fix-system-message-ordering
...
Fix system messages always being displayed above standard messages
2021-04-22 18:51:25 +09:00
Dan Balasescu
0e24f2eb59
Merge pull request #12529 from peppy/editor-placement-right-click-delete
...
Allow shift+right-click deletion when in placement mode
2021-04-22 18:50:20 +09:00
Dean Herbert
a5364b224f
Add simple key based time nudging support to editor
2021-04-22 18:47:04 +09:00
Dean Herbert
daafa41dc1
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-22 16:22:04 +09:00
Dean Herbert
cf1e3ea988
Add failing test covering quick shift-rightclick deletion in placement mode
2021-04-22 15:44:12 +09:00
Dean Herbert
ea3bb07924
Add test that fails on incorrect system/info message ordering
2021-04-22 14:51:14 +09:00
smoogipoo
31c5fb350f
Merge branch 'master' into gcc-abstraction
2021-04-21 16:33:36 +09:00
Bartłomiej Dach
881043bc5d
Fix failing test after mod settings layout changes
...
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.
Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
2021-04-20 19:38:25 +02:00
smoogipoo
156a518068
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-20 21:16:05 +09:00
smoogipoo
c5d6b6ea8d
Fix tests failing intermittently
...
This was due to this code happening in UpdateAfterChildren(), after the
GCC has processed one frame. During this time, the clock could have
advanced an arbitrary amount.
The cause of this is the removal of the Task.Run() to set the clock in
Restart() (now called Reset()) which changed the timing, so it only worked before due to pure
luck.
2021-04-20 18:41:09 +09:00
smoogipoo
80473a356e
Merge branch 'fix-pre-seek-sample-lifetime' into gcc-abstraction
2021-04-20 17:27:01 +09:00
Bartłomiej Dach
97573fb11d
Merge branch 'master' into combo-colours-display
2021-04-19 18:21:57 +02: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
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
jvyden
a854ce429a
add blank line between method
2021-04-18 23:49:13 -04: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
b727faace3
Revert changes to IdleTracker
2021-04-18 23:03:43 -04: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
67c19df000
Add test coverage for adding/removing colours
2021-04-18 19:35:42 +02:00
Bartłomiej Dach
1b2c43b92c
Add basic structure of colour palette
2021-04-18 19:29:04 +02:00
Dean Herbert
2678089e0b
Add test case failing on selection after paste
2021-04-18 20:28:39 +09:00
jvyden
1e56f14f5b
Merge remote-tracking branch 'upstream'
2021-04-17 09:35:24 -04:00
Bartłomiej Dach
f3ea51eeed
Adjust tests to not rely on invalid assumption
2021-04-17 14:23:32 +02:00
smoogipoo
5e82f40d67
Merge branch 'master' into gcc-abstraction
2021-04-16 20:14:53 +09:00
jvyden
8d6c30c73b
Fix lint
2021-04-16 05:57:36 -04:00
jvyden
ec0211809f
Apply peppy's suggestions
2021-04-16 05:53:27 -04:00
jvyden
d760e81a91
Fix lint
2021-04-16 05:22:41 -04:00
smoogipoo
46d2181d42
Remove now unnecessary (duplicating) test
2021-04-16 18:21:56 +09:00
smoogipoo
377e5ce6b3
Fix test incorrect sending state too often
2021-04-16 18:21:35 +09:00
jvyden
471b8e3c74
Merge branch 'master' of https://github.com/ppy/osu
2021-04-16 05:02:40 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity
...
Closes #12424
2021-04-16 05:01:58 -04:00
smoogipoo
ca74f413cd
Change to explicit method instead
2021-04-16 17:31:02 +09:00
smoogipoo
25f0f17766
Attempt to fix match subscreen test failure
2021-04-16 16:16:28 +09:00
smoogipoo
5652490d61
Fix OnUserBeganPlaying not being invoked if already watching
2021-04-16 14:11:55 +09:00
Dean Herbert
7cf15fe729
Merge pull request #12412 from peppy/timeline-adjustments
...
Update timeline control point display
2021-04-15 22:43:26 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander
2021-04-15 21:48:58 +09:00
Dean Herbert
ad671ee07a
Merge branch 'master' into timeline-adjustments
2021-04-15 20:42:38 +09:00
Dan Balasescu
6f17c19a48
Merge branch 'master' into summary-timeline-design-refactors
2021-04-15 20:11:39 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master
...
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
Dean Herbert
18e8682f39
Remove unused using statements
2021-04-15 17:01:25 +09:00
Dean Herbert
dd9a142e89
Fix TestSceneEditorSummaryTimeline not displaying actual beatmap content
2021-04-15 16:39:20 +09:00
Dean Herbert
66bb5766b9
Make Mod.Description abstract and add missing descriptions
2021-04-15 16:39:20 +09:00
Dan Balasescu
a56391c6ca
Merge pull request #12418 from peppy/abstract-mod-description
...
Make `Mod.Description` abstract and add missing descriptions
2021-04-15 15:42:36 +09:00
