1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 13:22:55 +08:00
Commit Graph

27456 Commits

Author SHA1 Message Date
TheWildTree
097bd37e37 Fix SelectorTab crashing tests after a reload
For some reason, the default channel type (Public) caused the channel manager to attempt to connect to an API, which was null at that time, after hot reloading the test environment (via dynamic compilation). Changing the channel type seems to fix that.
2020-03-13 18:34:51 +01:00
Andrei Zavatski
7e9d28b1b1 Fix slider ball colour affects follow circle 2020-03-13 13:42:33 +03:00
Dan Balasescu
481e4ed66f
Merge branch 'master' into catcher-area-file-cleanup 2020-03-13 18:55:34 +09:00
Dean Herbert
70427a19c1
Merge pull request #8261 from peppy/fix-mod-sprite-bleed
Fix mod sprite bleeding border colour
2020-03-13 16:58:20 +09:00
Dean Herbert
bee855bd1d Remove using 2020-03-13 15:54:46 +09:00
Dean Herbert
b902e50396 Add resolution selector in tournament setup screen 2020-03-13 15:44:23 +09:00
Dean Herbert
edd444ea73 Fix mod sprite bleeding border colour 2020-03-13 14:36:46 +09:00
smoogipoo
c33ca6e99c Decorate usages with exception management 2020-03-13 14:28:11 +09:00
smoogipoo
f7c036726a Add beatmap loading timeout 2020-03-13 13:52:40 +09:00
Dean Herbert
c45f9cafd4 Add medium -> regular fallback for torus 2020-03-13 13:43:48 +09:00
Dean Herbert
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
Dean Herbert
ae112cf14f Reorder torus loading to provide regular as default 2020-03-13 13:43:48 +09:00
Dean Herbert
4a774d02e0 Remove exo font loading 2020-03-13 13:43:37 +09:00
Dean Herbert
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +09:00
smoogipoo
c8cdc5fda5 Expose half catcher width to movement skill 2020-03-13 12:43:01 +09:00
Dean Herbert
8fb41e4c67
Merge pull request #8219 from smoogipoo/remove-unlimited-timingpoints
Remove unlimited timing points in difficulty calculation
2020-03-13 12:34:02 +09:00
Dean Herbert
ac70fcc544 Change logic to be more resilient by identifying user scroll events 2020-03-13 12:30:27 +09:00
Dean Herbert
5f8d180b5e Fix carousel scrolling being inoperable during beatmap import 2020-03-13 11:51:26 +09:00
Dean Herbert
de9857ccdc Fix incorrect id reference in test 2020-03-13 11:02:53 +09:00
Dean Herbert
ba0dec891d Update test temporarily 2020-03-13 10:58:36 +09:00
Dean Herbert
04f1da04db Remove incorrect xmldoc from SelectBeatmap function 2020-03-13 10:52:08 +09:00
Dean Herbert
3f8b454ff4
Reword comment to match new filtering behaviour
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-13 10:01:28 +09:00
Dean Herbert
c30bfa79e7
Merge branch 'master' into correct-trail-animation-frame 2020-03-13 09:55:41 +09:00
Dean Herbert
8d0bcf4bbb
Merge pull request #8245 from 2yangk23/master
Fallback on invalid AnimationFramerate for legacy skins
2020-03-12 20:34:33 +09:00
Kelvin
c8ea922577
Update osu.Game/Skinning/LegacySkinExtensions.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-12 04:18:57 -07:00
Dean Herbert
cc8a413f6b
Merge pull request #8230 from EVAST9919/catcher-fix
Fix catcher showing miss sprite upon missing bananas
2020-03-12 20:10:36 +09:00
Kelvin
317bb5d0a4 Fallback on invalid AnimationFramerate for legacy skins 2020-03-12 03:55:45 -07:00
Dean Herbert
bab197553e Update carousel test logic to match new carousel selection behaviour 2020-03-12 19:55:25 +09:00
Dean Herbert
9e52fbdd3e
Merge pull request #8226 from omkelderman/stable-install-path-from-env-var
Add ability to set stable path for tourney client via environment variable
2020-03-12 19:48:48 +09:00
Dean Herbert
9d9ee76888
Merge pull request #8220 from smoogipoo/fix-catch-beatmap-processor
Fix catch beatmap processing not matching stable
2020-03-12 19:47:15 +09:00
Dean Herbert
08dc4a0e8b
Merge pull request #8216 from smoogipoo/video-start-from-zero
Apply osu!-side video sprite changes
2020-03-12 19:46:46 +09:00
Dean Herbert
250061ddf5 Fix test failure due to off-screen panel 2020-03-12 19:46:21 +09:00
Dean Herbert
1819a15509 Make test ID assigning simpler 2020-03-12 19:27:54 +09:00
Dean Herbert
a69fabbd1f Update framework 2020-03-12 18:58:07 +09:00
Dan Balasescu
d4627921d5
Merge pull request #8241 from peppy/fix-carousel-test-loading-beatmaps
Fix beatmap carousel tests loading beatmap manager beatmaps in test browser
2020-03-12 18:58:04 +09:00
Dan Balasescu
031505082b
Merge pull request #8237 from peppy/tournament-header-logo
Add back dynamic components of tournament header
2020-03-12 18:57:55 +09:00
Dean Herbert
604ce37064 Merge remote-tracking branch 'upstream/master' into video-start-from-zero 2020-03-12 18:57:53 +09:00
Dean Herbert
db5c8043db Add test covering ruleset change on difficulty icon selection 2020-03-12 18:42:08 +09:00
Dean Herbert
ca9cfbe51d Move selection fallback logic out of BeatmapCarousel to SongSelect 2020-03-12 18:42:08 +09:00
Dean Herbert
6e11c3014c Allow grouped difficulty icons to be clicked 2020-03-12 18:42:08 +09:00
Dean Herbert
2bcf079386 Update carousel test logic to match new carousel selection behaviour 2020-03-12 18:42:08 +09:00
Dean Herbert
ce5d01ed19 Allow filtered difficulty icons to be clicked 2020-03-12 18:42:08 +09:00
Dean Herbert
5537b279de Fix failing test occasionally getting wrong ruleset beatmap 2020-03-12 18:39:43 +09:00
Dan Balasescu
1b5cb3893a
Merge branch 'master' into fix-carousel-test-loading-beatmaps 2020-03-12 18:14:27 +09:00
Dan Balasescu
f37444ad18
Merge branch 'master' into tournament-header-logo 2020-03-12 18:12:08 +09:00
Andrei Zavatski
bc2a1cdb62 Apply suggestions 2020-03-12 12:04:36 +03:00
Dan Balasescu
4cdb94f3a5
Merge pull request #8236 from peppy/tournament-all-video-extensions
Allow videos to be loaded with any extension
2020-03-12 18:03:45 +09:00
Dean Herbert
fc058f8896 Remove unnecessary this. prefix 2020-03-12 18:03:18 +09:00
Dan Balasescu
869ea724f0
Merge pull request #8235 from peppy/disable-global-volume-via-select-bindings
Disable adjusting volume via "select next" and "select previous" as fallbacks
2020-03-12 18:02:28 +09:00
Andrei Zavatski
90259e1f69 Merge remote-tracking branch 'refs/remotes/ppy/master' into catcher-fix 2020-03-12 12:01:11 +03:00