smoogipoo
|
e56d0f2eea
|
Add black font weighting
|
2020-03-17 17:16:10 +09:00 |
|
Dean Herbert
|
5e3668b2ea
|
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
Add beatmap loading timeout to prevent runaway loading scenarios
|
2020-03-17 11:17:35 +09:00 |
|
Dean Herbert
|
07fbca8e91
|
Merge pull request #8300 from Joehuu/limit-font-weight-to-bold
Limit Torus font weight to bold
|
2020-03-17 10:32:55 +09:00 |
|
Joehu
|
f7ea20a926
|
Limit font weight to bold
|
2020-03-16 16:32:25 -07:00 |
|
Dean Herbert
|
10eccbcf3b
|
Merge pull request #8291 from ItsMestro/patch-1
Use new logo name for showcase screen
|
2020-03-16 21:51:02 +09:00 |
|
Marcus "Mestro" Nordgren
|
24fe7538fd
|
Use new logo name for showcase screen
|
2020-03-16 13:09:15 +01:00 |
|
Dan Balasescu
|
7be5ef4737
|
Merge pull request #8132 from EVAST9919/user-cards-update
Update user panel design
|
2020-03-16 14:53:57 +09:00 |
|
Dan Balasescu
|
0245bab7c6
|
Merge branch 'master' into user-cards-update
|
2020-03-16 14:27:21 +09:00 |
|
smoogipoo
|
58fc947be3
|
Privatise some setters
|
2020-03-16 14:06:42 +09:00 |
|
Dan Balasescu
|
e835f88c0c
|
Merge pull request #8255 from peppy/fix-carousel-scroll-while-import
Fix carousel scrolling being inoperable during beatmap import
|
2020-03-16 12:50:45 +09:00 |
|
Dan Balasescu
|
94d9a6479a
|
Merge pull request #8248 from peppy/click-group-difficulty-icons
Add the ability to click grouped beatmap difficulty icons
|
2020-03-16 12:36:34 +09:00 |
|
Dan Balasescu
|
3e65f13c67
|
Merge branch 'master' into fix-carousel-scroll-while-import
|
2020-03-16 12:06:50 +09:00 |
|
Dean Herbert
|
9bb3a6c677
|
Merge branch 'master' into click-group-difficulty-icons
|
2020-03-16 12:01:09 +09:00 |
|
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 |
|