1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 10:27:35 +08:00
Commit Graph

28012 Commits

Author SHA1 Message Date
Dean Herbert
0044d00d07 Update framework 2020-03-30 16:53:23 +09:00
Dean Herbert
812583a4cd Remove stray newline 2020-03-30 16:17:42 +09:00
Dean Herbert
e183b2b14d
Merge pull request #8477 from peppy/slider-start-circle
Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay
2020-03-30 15:24:46 +09:00
Dean Herbert
f71c8cb30f Only drop online set ID if beatmap IDs were stripped in online retrieval 2020-03-30 15:07:56 +09:00
Dean Herbert
7ecce713bb Keep provided IDs where possible if not online 2020-03-30 15:07:39 +09:00
Dan Balasescu
a0b8243f4c
Merge branch 'master' into slider-start-circle 2020-03-30 14:49:17 +09:00
Dan Balasescu
c29bf6cec1
Merge pull request #7764 from mcendu/spun-out
Implement Spun Out mod
2020-03-30 12:53:54 +09:00
Dan Balasescu
03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Dean Herbert
7db9bd798c Remove handle overrides 2020-03-30 11:59:51 +09:00
Dean Herbert
09d860d5f5 Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID 2020-03-30 11:52:25 +09:00
Dan Balasescu
ea1a2e1955
Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 11:01:25 +09:00
Dan Balasescu
113bbe8c4d
Merge pull request #8488 from peppy/fix-autoplay-results-display
Fix auto mod results screen not displaying correctly
2020-03-30 11:01:16 +09:00
Dan Balasescu
fc1141cd09
Merge pull request #8493 from peppy/fix-test-location
Move non-headless tests to correct namespace
2020-03-30 10:45:55 +09:00
Dean Herbert
d99b445720 Move non-headless tests to correct namespace 2020-03-30 10:00:28 +09:00
Dean Herbert
3486527429 Merge branch 'fix-autoplay-results-display' into dont-retry-on-replay-results 2020-03-30 01:42:24 +09:00
Dean Herbert
12d44b6335
Merge pull request #8481 from LittleEndu/rewrite-select-next
Rewrite beatmap carousel's select next logic to not use drawables
2020-03-30 01:21:31 +09:00
Dean Herbert
98a700ef3a Attempt to fix tests by skipping one break at a time 2020-03-30 00:58:06 +09:00
Endrik
f4c8b6d219
Fix copy paste oversight 2020-03-29 18:55:47 +03:00
Dean Herbert
bac5f79731
Merge branch 'master' into rewrite-select-next 2020-03-30 00:08:06 +09:00
Dean Herbert
b47a532df3 Adjust code formatting slightly 2020-03-30 00:07:48 +09:00
Dean Herbert
a72f0f57f6 Refactor tests for readability 2020-03-30 00:05:07 +09:00
Dean Herbert
6e68b968f8 Hide "retry" button on results screen after watching a replay 2020-03-29 23:52:50 +09:00
Dean Herbert
66a990cd5e Remove redundant this 2020-03-29 23:50:16 +09:00
Dean Herbert
07c7233b3d Change int div comments 2020-03-29 23:46:28 +09:00
Endrik Tombak
ce2fa23baf Include a test for miss 2020-03-29 17:43:18 +03:00
Dean Herbert
653480b2f8 Add regression test 2020-03-29 23:29:46 +09:00
Endrik Tombak
11826800fb Test slider snaking 2020-03-29 17:00:26 +03:00
Dean Herbert
4f5557096c Fix auto mod results not displaying correctly 2020-03-29 22:51:28 +09:00
Dean Herbert
de969c07ea
Merge pull request #8351 from tybug/show-mod-settings-tooltip
Show customised mod setting values in tooltip
2020-03-29 19:48:17 +09:00
Endrik Tombak
2ab8267f84 Add a comment 2020-03-29 10:50:43 +03:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
d1b01095ee Rewrite to reduce code changes and complexities in hit object implementation 2020-03-29 14:31:03 +09:00
Dean Herbert
a2b3fe180e Add the ability to disable user input on specific DrawableHitObjects 2020-03-29 14:30:45 +09:00
Dean Herbert
b259708915
Merge branch 'master' into spun-out 2020-03-29 13:24:48 +09:00
Endrik Tombak
d3114ca858 Don't snake when hit 2020-03-28 23:12:13 +02:00
Endrik Tombak
8cab303611 Cover skipDifficulties = false in tests 2020-03-28 21:02:55 +02:00
Endrik Tombak
b4f0500706 Invert logic 2020-03-28 20:21:21 +02:00
Endrik
2c27894527
Use All instead of ToList Any
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-28 19:58:33 +02:00
Endrik Tombak
87854fc4fa Rename variable 2020-03-28 13:23:31 +02:00
Endrik Tombak
63f6269eb0 Test both ways 2020-03-28 13:10:20 +02:00
Endrik Tombak
659865b457 Use understandable set id 2020-03-28 13:08:06 +02:00
Endrik Tombak
0a69647efe Merge remote-tracking branch 'origin/traversal-is-broken' into rewrite-select-next 2020-03-28 13:06:37 +02:00
Endrik Tombak
6a0c5c87aa Use already existing variable 2020-03-28 13:06:03 +02:00
Endrik Tombak
fc3f9ff6fa Don't use drawables for select next 2020-03-28 12:54:48 +02:00
Dean Herbert
fb4b334ce2 Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay 2020-03-28 14:10:26 +09:00
Dean Herbert
96e1ab775e
Merge pull request #8475 from bdach/fix-break-overlay-z-order
Fix break overlay displaying in front of all other player overlays
2020-03-28 13:39:36 +09:00
Dean Herbert
944926e950
Merge branch 'master' into fix-break-overlay-z-order 2020-03-28 13:04:19 +09:00
Dean Herbert
94aa6ab5c9
Merge pull request #8474 from bdach/fix-no-break-info
Fix break overlay not displaying progress information
2020-03-28 12:49:39 +09:00
Dean Herbert
e9dc545429
Merge branch 'master' into fix-no-break-info 2020-03-28 12:39:37 +09:00
Dean Herbert
a317ef65b8 Remove default for argument 2020-03-28 12:18:28 +09:00