1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 03:52:55 +08:00
Commit Graph

27558 Commits

Author SHA1 Message Date
Dan Balasescu
7e5f6c4e7f
Merge pull request #8247 from peppy/click-disabled-difficulty-icons
Add the ability to click filtered difficulty icons
2020-03-16 11:56:37 +09:00
Dan Balasescu
26c034e364
Merge pull request #8213 from peppy/correct-trail-animation-frame
Fix osu!catch trail animating (and displaying incorrect frame)
2020-03-16 11:45:05 +09:00
smoogipoo
9c5423734a Throw timeout exceptions instead 2020-03-16 11:33:26 +09:00
Dean Herbert
d6be8eec0c Merge branch 'master' into click-disabled-difficulty-icons 2020-03-16 11:30:57 +09:00
Dan Balasescu
f390c1995d
Apply comment suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-16 11:29:28 +09:00
Dan Balasescu
e03b29947a
Merge branch 'master' into correct-trail-animation-frame 2020-03-16 11:16:56 +09:00
Dan Balasescu
1916eac43e
Merge pull request #8246 from peppy/carousel-selection-fallback-improvement
Improve beatmap carousel / song select fallback logic pathing
2020-03-16 11:15:06 +09:00
Dan Balasescu
bd05462a7f
Merge branch 'master' into carousel-selection-fallback-improvement 2020-03-16 10:53:10 +09:00
Dan Balasescu
8b8d0b962d
Merge pull request #8242 from peppy/always-apply-ruleset-filter
Apply ruleset filter in all cases (even when bypassing filter for selection purposes)
2020-03-16 10:52:56 +09:00
Dan Balasescu
25a35a1370
Merge branch 'master' into always-apply-ruleset-filter 2020-03-16 10:32:36 +09:00
Dan Balasescu
31577de781
Merge pull request #8270 from TheWildTree/fix-chat-tabs
Switch to the next chat tab upon closing an active one
2020-03-16 10:26:27 +09:00
Dan Balasescu
12293bea1d
Merge branch 'master' into fix-chat-tabs 2020-03-16 09:57:01 +09:00
TheWildTree
acd280c855 Add System channel type and use it for the ChannelSelectorTab 2020-03-15 22:13:26 +01:00
Dean Herbert
e68d4f92f5 Fix framework version mismatch 2020-03-16 01:19:10 +09:00
Bartłomiej Dach
f904859943 Remove leftover unused private methods 2020-03-15 15:45:13 +01:00
Bartłomiej Dach
8952eb2a01 Merge branch 'master' into correct-trail-animation-frame 2020-03-15 15:24:26 +01:00
Dean Herbert
340d362d69 Appease inspectcode 2020-03-15 03:51:30 +09:00
Dean Herbert
12b7727af6 Update framework 2020-03-15 03:25:01 +09:00
Dean Herbert
4e8e222996 Merge branch 'master' into fix-carousel-scroll-while-import 2020-03-15 03:24:19 +09:00
Dean Herbert
b9cdb317c5
Merge pull request #8259 from peppy/torus
Switch game to use new font (Torus)
2020-03-15 03:21:22 +09:00
Dan Balasescu
d4f5d67efc
Merge branch 'master' into torus 2020-03-15 02:34:22 +09:00
Dean Herbert
1a6056637b Turn off italics test for now (may come back if we switch chat to content font) 2020-03-15 01:43:48 +09:00
Dean Herbert
0b788065b4 Update resources package 2020-03-15 01:00:25 +09:00
Dean Herbert
cd604785a8 Ignore italics specification for now 2020-03-15 00:38:27 +09:00
Dan Balasescu
ec9b499354
Merge pull request #8262 from peppy/tournament-resolution-selector
Add resolution selector in tournament setup screen
2020-03-15 00:38:00 +09:00
Dean Herbert
62ce503126 Fix changelog alignment and italics usage 2020-03-15 00:36:21 +09:00
Dan Balasescu
70a17ae6cc
Merge branch 'master' into tournament-resolution-selector 2020-03-15 00:15:31 +09:00
Dean Herbert
735396c6d6 Merge branch 'master' into torus 2020-03-14 23:40:55 +09:00
Dean Herbert
08d72d1a5c
Merge pull request #8267 from EVAST9919/follow-circle-fix
Fix osu! slider ball tint colour being applied to follow circle
2020-03-14 23:22:29 +09:00
Andrei Zavatski
c271d17557 Remove useless field 2020-03-14 14:07:52 +03:00
Andrei Zavatski
74c9d5fc93 Use AccentColour 2020-03-14 13:45:55 +03:00
Dean Herbert
d3f23b766e Move across to new file in line with master 2020-03-14 17:06:23 +09:00
Dean Herbert
9ea0e83f3d Merge branch 'master' into correct-trail-animation-frame 2020-03-14 16:57:35 +09:00
Dean Herbert
45dfb22bd5 Centralise additive texture creation 2020-03-14 16:39:44 +09:00
Dean Herbert
cd0f1c98ba Update framework 2020-03-14 16:17:14 +09:00
Dean Herbert
63b4fa0d56 Merge branch 'master' into correct-trail-animation-frame 2020-03-14 16:12:52 +09:00
Dean Herbert
d5f15e62fa
Merge pull request #8257 from peppy/catcher-area-file-cleanup
Split out CatcherArea nested classes and reorder methods
2020-03-14 16:06:28 +09:00
Dean Herbert
1523c4c63f Merge branch 'master' into catcher-area-file-cleanup 2020-03-14 15:41:26 +09:00
Dean Herbert
202c8cdad8 Add braces to satisfy codefactor 2020-03-14 15:35:59 +09:00
Dean Herbert
fcbf83cd74
Merge pull request #8217 from smoogipoo/limit-max-slider-length
Add more sane limit for maximum slider length
2020-03-14 15:08:39 +09:00
Dean Herbert
17b0b3df35
Merge pull request #8256 from smoogipoo/expose-catcher-width
Expose half catcher width to movement skill
2020-03-14 15:07:49 +09:00
TheWildTree
38d00c7f0a Revert unnecessary changes and actually trim the whitespace 2020-03-13 21:29:10 +01:00
TheWildTree
8d3cab0e16 Trim whitespace 2020-03-13 18:58:32 +01:00
TheWildTree
0bbae094dd Add active tab closing behaviour tests 2020-03-13 18:34:51 +01:00
TheWildTree
694e56b0d1 Add non-PM chat tabs to tests 2020-03-13 18:34:51 +01:00
TheWildTree
8991e88039 Fix active tab closing behaviour 2020-03-13 18:34:51 +01:00
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