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

37823 Commits

Author SHA1 Message Date
Dean Herbert
710599c521 Merge branch 'master' into realm-key-binding-store 2021-03-31 15:00:47 +09:00
Dean Herbert
ffc28256d0
Merge pull request #12237 from peppy/fix-retry-count
Fix retry count not updating correctly
2021-03-31 14:59:12 +09:00
Dean Herbert
0c53b4eb93 Fix wrong counting and add test 2021-03-31 14:09:39 +09:00
Dean Herbert
e0c61f4dc5 Fix retry count not updating correctly
Regressed with changes to player reference retention logic. Could add a
test but the logic is so local now it seems quite redundant.
2021-03-31 13:57:58 +09:00
Dean Herbert
e848444d74
Merge pull request #12227 from peppy/fix-accuracy-display
Fix accuracy displaying incorrectly in online contexts
2021-03-30 23:35:23 +09:00
Dean Herbert
1281273dd3 Add back automapper dependency 2021-03-30 22:46:20 +09:00
Dean Herbert
fb0079fb9f Fix accuracy displaying incorrectly in online contexts
Closes #12221.
2021-03-30 22:42:32 +09:00
Dean Herbert
321ad737b6 Merge branch 'master' into realm-migration-operation-blocking 2021-03-30 22:40:08 +09:00
Dean Herbert
8bd03c2e2a
Merge pull request #12218 from peppy/tablet-rotation-configuration
Add tablet rotation configuration
2021-03-30 21:04:12 +09:00
Dean Herbert
633e6130bf Update framework 2021-03-30 19:46:22 +09:00
Dean Herbert
de394f3d14 Merge branch 'master' into tablet-rotation-configuration 2021-03-30 19:46:19 +09:00
Dan Balasescu
1c22c6d5de
Merge pull request #12222 from peppy/add-mania-key-count-filter
Add osu!mania key count filtering using "keys=4" at song select
2021-03-30 18:15:49 +09:00
Dean Herbert
56428a027e Change static method to public 2021-03-30 16:56:20 +09:00
Dean Herbert
e769ef45be Fix misplaced parenthesis 2021-03-30 16:55:39 +09:00
Dan Balasescu
11958553b7
Merge pull request #12180 from peppy/hide-caught-fruit-in-hidden
Fix osu!catch fruit showing on plate when hidden mod is enabled
2021-03-30 16:37:02 +09:00
Dean Herbert
1d968009c2 Add osu!mania key filtering using "keys=4" at song select 2021-03-30 16:09:35 +09:00
Dan Balasescu
b24c695146
Merge branch 'master' into hide-caught-fruit-in-hidden 2021-03-30 15:42:00 +09:00
Dan Balasescu
f40cf499bc
Merge pull request #12182 from peppy/add-editor-nudging-support
Add support for nudging objects in the editor using ctrl+arrow keys
2021-03-30 15:16:16 +09:00
Dan Balasescu
54656e1b8c
Merge pull request #12219 from peppy/fix-new-test-failures
Fix incorrect wait logic in IPC location test
2021-03-30 15:03:35 +09:00
Dean Herbert
f12353a99e Update forgotten test scene usage 2021-03-30 14:57:06 +09:00
Dean Herbert
0f7be8f632
Merge pull request #11853 from FamousPig/scale-breaking-bounds 2021-03-30 14:56:03 +09:00
Dan Balasescu
d2ef0ba644
Merge branch 'master' into add-editor-nudging-support 2021-03-30 14:34:43 +09:00
Dean Herbert
89bea2868a Move bool one level down 2021-03-30 14:33:55 +09:00
Dean Herbert
88035f73e0 Fix incorrect wait logic in IPC location test
Not really willing to put more effort into fixing this one. Should do the job.
2021-03-30 14:23:49 +09:00
Dean Herbert
b82247aabe Add inline comments and use Vector2.Zero 2021-03-30 14:13:16 +09:00
Dean Herbert
eda45e0e28 Merge branch 'master' into scale-breaking-bounds 2021-03-30 14:05:19 +09:00
Dean Herbert
491e583819 Merge branch 'master' into realm-migration-operation-blocking 2021-03-30 13:25:40 +09:00
Dean Herbert
015cf5f7eb Fix tests using wrong ID lookup type 2021-03-30 13:22:48 +09:00
Dean Herbert
d51f4e108e
Merge pull request #12213 from MiraiSubject/ipc-directory-regression 2021-03-30 13:15:18 +09:00
Dean Herbert
1dfd08eded Add tablet rotation configuration 2021-03-30 13:01:48 +09:00
Dean Herbert
8dfff999f9 Add rotation slider 2021-03-30 12:40:50 +09:00
Dean Herbert
8a0fcf20ed Move offset settings up for more logical ordering 2021-03-30 12:32:42 +09:00
Dan Balasescu
ff43983c0a
Merge pull request #12214 from peppy/update-framework
Update framework and dependencies
2021-03-30 09:48:26 +09:00
smoogipoo
69db0a5593 Countries should not be null (internal game resource) 2021-03-30 09:03:34 +09:00
smoogipoo
804ffe9f48 Fix inspections 2021-03-30 09:00:09 +09:00
Shivam
2d344ae6ff wait for IPC to be populated in the test
Did not see this when locally running test until after a couple of subsequent runs.
2021-03-29 16:16:50 +02:00
Dean Herbert
6f01070408 Add weird android package requirements 2021-03-29 23:11:24 +09:00
Shivam
6c5a10a744 Add missing license header 2021-03-29 15:27:25 +02:00
Dean Herbert
d84c9251e6 Update nuget packages 2021-03-29 22:17:24 +09:00
Dean Herbert
36364a4492 Update framework 2021-03-29 22:17:17 +09:00
Shivam
c110c24924 Merge branch 'master' of https://github.com/ppy/osu into ipc-directory-regression 2021-03-29 15:03:24 +02:00
Shivam
badf5ee4a2 Fix stable.json file directory location due to the change of how TournamentStorage works 2021-03-29 15:03:10 +02:00
Dan Balasescu
e6e29259c7
Merge pull request #12194 from peppy/fix-timeline-depth-ordering
Fix timeline not visually ordering hitobjects in a stable way
2021-03-29 21:31:56 +09:00
Leon Gebler
17b16d4f89 Clarify purpose of getClampedScale() 2021-03-29 14:17:30 +02:00
Leon Gebler
1d99a63f17 Limit minimum size for single slider scaling 2021-03-29 14:16:27 +02:00
Dan Balasescu
1bb9f018a0
Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
Dan Balasescu
3cf6a3f56d
Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
Dan Balasescu
633a0f4a40
Merge pull request #12208 from peppy/fix-chat-scroll-stickiness
Fix chat scroll sticking visually when scrolling beyond bottom extent
2021-03-29 20:44:44 +09:00
Dean Herbert
690debe507
Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
Dean Herbert
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00