1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 18:22:54 +08:00
Commit Graph

1651 Commits

Author SHA1 Message Date
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status (#4619)
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
smoogipoo
243cd517ad Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
2019-06-12 17:24:16 +09:00
smoogipoo
28f8b04765 Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 2019-06-12 16:47:56 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
bb8a77d27d Apply all steps to same user panel so interactions can be observed 2019-06-12 15:59:52 +09:00
smoogipoo
5d3fa51360 Merge remote-tracking branch 'origin/master' into selection-update 2019-06-12 15:10:57 +09:00
Lucas A
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
Dean Herbert
a690a67a6c
Merge branch 'master' into fullscreen-overlay-surface 2019-06-12 00:07:30 +09:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert
86b6070ae8
Tween track frequency on pause (#4973)
Tween track frequency on pause
2019-06-11 18:44:56 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
David Zhao
a53ade07a5 remove unused using 2019-06-11 15:51:57 +09:00
David Zhao
975bb3db8a cleanup 2019-06-11 15:51:14 +09:00
Dean Herbert
620c2311ac Add test 2019-06-11 15:39:18 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
David Zhao
d4ba67747b fix test count 2019-06-11 14:24:04 +09:00
Lucas A
141775d98c Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-10 21:41:00 +02:00
Lucas A
2e911d0e96 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-10 19:13:54 +02:00
Dean Herbert
fc0fc8f164
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-10 19:37:35 +09:00
David Zhao
41e3e2222b fix test 2019-06-10 18:40:49 +09:00
Dean Herbert
12aa264657 Consolidate tests and check for file reference counts 2019-06-10 18:35:23 +09:00
David Zhao
1aa865c3fb split out method for reuse 2019-06-10 18:34:24 +09:00
Dean Herbert
28b2a516e3 Ensure exception is only thrown once on rollback 2019-06-10 18:13:33 +09:00
Dean Herbert
d7cb932606
Merge branch 'master' into selection-update 2019-06-10 17:51:40 +09:00
Dean Herbert
dcdb806120 Catch newly thrown exception in test 2019-06-10 17:26:56 +09:00
Dean Herbert
5b75060b94 Add test for rollback logic correctly dereferencing files 2019-06-10 16:45:45 +09:00
Dean Herbert
e12b03e275 Remove unnecessary reference 2019-06-10 13:46:31 +09:00
Dean Herbert
600503ec8e Use Task.Run/Wait to avoid warnings 2019-06-10 13:42:29 +09:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
Dean Herbert
59b624d4ba Fix test regression 2019-06-10 01:08:39 +09:00
iiSaLMaN
fc8644a73e
Use ScoreRank.D instead of F 2019-06-08 19:34:52 +03:00
iiSaLMaN
d3ff2c6dd5
Use ScoreRank.D instead of F 2019-06-08 19:34:03 +03:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation 2019-06-07 20:48:36 +09:00
Dean Herbert
011ccffde7
Add an input source toggle on manual input test scenes (#4945)
Add an input source toggle on manual input test scenes
2019-06-07 20:26:26 +09:00
Dean Herbert
1374da7c41 Remove all calls to return user input 2019-06-07 12:54:57 +09:00
Dean Herbert
6f6b134ec8 Remove return user input calls 2019-06-07 12:52:49 +09:00
Dean Herbert
748c0e5c01 Set default state of test to enabled 2019-06-07 12:42:01 +09:00
Dean Herbert
58174425ed Make visual test more visible 2019-06-07 12:37:10 +09:00
Dean Herbert
694f2e3a4f Tidy up test scene's setup usage 2019-06-07 11:59:07 +09:00
Dean Herbert
64d5aa318f Apply rebased changes 2019-06-07 11:45:58 +09:00
Lucas A
a2bc5b538e Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-05 16:59:38 +02:00
Dean Herbert
2538f32fae Merge branch 'osu-clickable-container' into OsuHoverContainer 2019-06-05 10:34:20 +09:00
Dean Herbert
1d9274427b
Merge branch 'master' into osu-clickable-container 2019-06-04 21:55:14 +09:00
smoogipoo
ff647940ca Fix incorrect assertion 2019-06-04 19:25:34 +09:00
Dean Herbert
4e7f2b8f47
Merge branch 'master' into osu-clickable-container 2019-06-04 17:42:17 +09:00
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +09:00