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

2838 Commits

Author SHA1 Message Date
Dan Balasescu
9954b67bda
Merge branch 'master' into reset-test-storage 2020-01-29 15:52:52 +09:00
Dean Herbert
849e453c35 Merge remote-tracking branch 'upstream/master' into reset-test-storage 2020-01-29 15:49:05 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap 2020-01-29 15:32:27 +09:00
Dan Balasescu
ea2ee53ee3
Merge branch 'master' into timline-beat-lines 2020-01-29 14:44:07 +09:00
Dan Balasescu
4d43833db4
Merge branch 'master' into timline-beat-lines 2020-01-29 14:12:00 +09:00
Dan Balasescu
c35c84882f
Merge branch 'master' into fix-navigation-test-crash 2020-01-29 14:11:41 +09:00
smoogipoo
f457ecaf83 Fix random test failures 2020-01-29 13:54:12 +09:00
Dean Herbert
2498709d06 Fix navigation test crashing when raw input is disabled 2020-01-28 19:47:40 +09:00
Dean Herbert
0e0c730095 Add a method to recycle test storage between runs 2020-01-28 19:44:32 +09:00
Andrei Zavatski
4e884fc6f4 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 10:15:10 +03:00
Dean Herbert
dbb89cfde7 Merge remote-tracking branch 'upstream/master' into timline-beat-lines 2020-01-28 16:03:50 +09:00
Dean Herbert
596a01661c Remove 1ms offset and update tests 2020-01-28 13:42:22 +09:00
Andrei Zavatski
97fb7a5593 Add test scene 2020-01-27 15:42:46 +03:00
Andrei Zavatski
e6fa793d56 Refactor background creation in OverlayHeader 2020-01-27 15:36:19 +03:00
Andrei Zavatski
100532845b Recolour CommentsContainer 2020-01-27 15:07:24 +03:00
Andrei Zavatski
12ca28ea6d Recolour CommentsHeader 2020-01-27 14:58:27 +03:00
Andrei Zavatski
ed2737e027 Recolour TotalCommentCounter 2020-01-27 14:47:47 +03:00
Dean Herbert
a5a0eaba0d
Merge branch 'master' into fix-ss-click-crash 2020-01-27 19:35:31 +09:00
Dean Herbert
e37ae589ad
Merge branch 'master' into no-control-overlay-headers 2020-01-27 18:35:33 +09:00
Dean Herbert
fd7f07433d Ensure selection has occurred before storing value 2020-01-27 18:26:44 +09:00
Dean Herbert
9a2867d3d9 Rename test class 2020-01-27 18:10:42 +09:00
Dean Herbert
493390b750 Rename class to TimelineTickDisplay 2020-01-27 18:08:01 +09:00
Dean Herbert
084fa2f04a Add timeline beat display 2020-01-27 17:38:50 +09:00
Dean Herbert
03b7c6cfa7 Add base test scene for timeline 2020-01-27 17:34:40 +09:00
Dan Balasescu
d7b32940bd
Merge branch 'master' into fix-ss-click-crash 2020-01-27 15:40:45 +09:00
Dean Herbert
834e82d543 Add comprehensive tests for changelog overlay
Includes failing case
2020-01-27 14:50:41 +09:00
Dan Balasescu
d0ef5a8a8c
Merge branch 'master' into breadcrumb-fix 2020-01-27 13:18:23 +09:00
smoogipoo
431b1489b9 Add test 2020-01-27 13:16:36 +09:00
Dean Herbert
1f0aaabf7b Add tests 2020-01-27 12:21:17 +09:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Andrei Zavatski
6c1fa05804 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-26 12:48:01 +03:00
Andrei Zavatski
448663ae9a Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-25 06:41:49 +03:00
Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering 2020-01-24 23:28:36 +09:00
smoogipoo
bb390b4470 Add test 2020-01-24 19:40:20 +09:00
Andrei Zavatski
619c2d6d9c Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-24 12:44:13 +03:00
Andrei Zavatski
59ff3aa800 Fix tests 2020-01-24 12:42:48 +03:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe 2020-01-24 18:08:29 +09:00
smoogipoo
811ddb02a4 General refactoring 2020-01-24 17:50:36 +09:00
Dean Herbert
7495cfa0a9 Add a test scene
You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene
2020-01-24 16:32:31 +09:00
Andrei Zavatski
2b941a0d52 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-24 10:18:45 +03:00
Dean Herbert
2187dbd0c2 Rename steps in test for clarity 2020-01-24 14:37:37 +09:00
Dean Herbert
997b49f6dc Change display to always show progress bar, only hiding seeking handle instead 2020-01-24 14:21:22 +09:00
Dean Herbert
da65fff48e Merge remote-tracking branch 'upstream/master' into collapse-graph-option 2020-01-24 13:55:42 +09:00
Dean Herbert
ea2271c905 Merge branch 'master' into timeline-maybe 2020-01-24 13:39:51 +09:00
Dean Herbert
0e9ab8c76b Rename test scene to match 2020-01-24 13:39:47 +09:00
Dean Herbert
c390348eab Merge remote-tracking branch 'upstream/master' into colour-score-meter 2020-01-24 11:45:33 +09:00
Dean Herbert
ca94850ce4
Merge branch 'master' into view-comments-via-propery 2020-01-23 17:47:40 +09:00
Dean Herbert
a6d97f8ee6
Merge pull request #7577 from ProTheory8/mod-autoopen
Make Difficulty Adjust mod customisation menu open automatically
2020-01-23 17:03:04 +09:00
Dean Herbert
143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container
Decouple blueprint container to allow usage in timeline
2020-01-23 16:13:51 +09:00
Dan Balasescu
0df9703c46
Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +09:00