Bartłomiej Dach
|
8952eb2a01
|
Merge branch 'master' into correct-trail-animation-frame
|
2020-03-15 15:24:26 +01: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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|