1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 04:07:25 +08:00
Commit Graph

27108 Commits

Author SHA1 Message Date
Dean Herbert
14192c069f Don't play samples on catching a tiny droplet 2020-03-10 18:05:44 +09:00
Dan Balasescu
a6cf6207aa
Merge pull request #8192 from peppy/fix-hyperdash
Fix hyperdash not initiating correctly when juice streams are present
2020-03-10 14:00:44 +09:00
Dan Balasescu
61b1eb0569
Merge pull request #8196 from peppy/catcher-fallback-and-animation
Add idle animation and fallback catcher support
2020-03-10 13:45:43 +09:00
Dan Balasescu
2f70fa521e
Merge branch 'master' into fix-hyperdash 2020-03-10 13:34:12 +09:00
Dean Herbert
0d18ea1d29 Add animation and fallback catcher support 2020-03-10 12:36:25 +09:00
Dan Balasescu
61f6fe5f29
Merge pull request #8193 from peppy/update-framework
Update framework
2020-03-10 12:08:48 +09:00
Dan Balasescu
310e947add
Merge pull request #8177 from peppy/tournament-design-schedule
Implement 2020 schedule design
2020-03-10 10:45:48 +09:00
Dean Herbert
059af2a986 Update framework 2020-03-10 10:43:06 +09:00
Dean Herbert
e7f1f0f38b Fix hyperdash not initiating correctly when juice streams are present 2020-03-10 10:21:32 +09:00
smoogipoo
19ce2d643e Remove unused using 2020-03-10 09:51:30 +09:00
Dean Herbert
e158cbfe24
Merge branch 'master' into tournament-design-schedule 2020-03-10 09:40:08 +09:00
Dan Balasescu
e9cacb69fd
Merge pull request #8176 from peppy/tournament-design-gameplay
Implement 2020 gameplay design
2020-03-10 09:37:29 +09:00
Dan Balasescu
f5e134806a
Merge branch 'master' into tournament-design-gameplay 2020-03-09 19:33:53 +09:00
Dan Balasescu
3554cdda36
Merge pull request #8179 from peppy/tournament-design-win
Implement 2020 win screen design
2020-03-09 19:33:42 +09:00
smoogipoo
6421f28ac7 Fix nullref 2020-03-09 19:07:44 +09:00
Dan Balasescu
6d23c3b4ab
Merge pull request #8180 from peppy/tournament-design-intro
Implement 2020 intro screen design
2020-03-09 18:38:07 +09:00
Dan Balasescu
1fec5d17a8
Merge pull request #8174 from peppy/tournament-design-ladder
Implement 2020 ladder design
2020-03-09 18:15:59 +09:00
Dean Herbert
48c46efdd7 Remove rogue newline 2020-03-09 15:09:34 +09:00
Dean Herbert
8b16dadfe5 Merge branch 'master' into tournament-design-gameplay 2020-03-09 15:09:02 +09:00
Dean Herbert
33f457d663 Fix layout issues with TournamentBeatmapPanel 2020-03-09 15:08:24 +09:00
Dean Herbert
832e64cc95 Fix test failures due to null current match 2020-03-09 14:57:19 +09:00
Dean Herbert
b4cb4100dd
Merge pull request #8173 from peppy/tournament-design-mappool
Implement 2020 map pool design
2020-03-09 14:51:00 +09:00
Dean Herbert
e4f07e5284 Merge branch 'master' into tournament-design-gameplay 2020-03-09 14:50:36 +09:00
Dan Balasescu
0ecf6a4ecd
Merge branch 'master' into tournament-design-win 2020-03-09 14:16:34 +09:00
Dan Balasescu
1e9adbba4e
Merge branch 'master' into tournament-design-intro 2020-03-09 14:16:22 +09:00
Dan Balasescu
fac5530cab
Merge branch 'master' into tournament-design-mappool 2020-03-09 14:16:05 +09:00
Dan Balasescu
0f44c0739a
Merge branch 'master' into tournament-design-ladder 2020-03-09 14:16:01 +09:00
Dan Balasescu
79153914fd
Merge pull request #8171 from peppy/tournament-drawable-team-tidy
Add new tournament design base elements
2020-03-09 14:04:27 +09:00
Dean Herbert
c1ac800473
Merge pull request #8186 from Joehuu/fix-textbox-backspace-animation
Fix textbox characters not animating when typing/backspacing
2020-03-09 14:03:33 +09:00
smoogipoo
b61e56cda5 Resolve post-merge issue 2020-03-09 13:29:17 +09:00
Dan Balasescu
ab79f36c41
Merge branch 'master' into tournament-drawable-team-tidy 2020-03-09 13:26:20 +09:00
Joehu
3903423a37 Fix textbox characters not animating when typing/backspacing 2020-03-08 19:43:53 -07:00
Dan Balasescu
a04b651fea
Merge pull request #8170 from peppy/tournament-base-changes
Apply tournament client usability changes
2020-03-09 10:15:10 +09:00
Dan Balasescu
ae42c32c86
Merge pull request #8182 from Game4all/fix-hit-error-ticks-outside-bounds
Fix hit error ticks getting out of the hit error meter
2020-03-09 09:45:48 +09:00
Dan Balasescu
2eb8f245da
Merge branch 'master' into tournament-base-changes 2020-03-09 09:24:46 +09:00
Dan Balasescu
1c580216af
Merge pull request #8175 from peppy/score-counter-flexibility
Increase flexibility of StarCounter component
2020-03-09 09:17:55 +09:00
Dan Balasescu
5b8035052f
Merge branch 'master' into fix-hit-error-ticks-outside-bounds 2020-03-09 09:16:51 +09:00
Dan Balasescu
9dbff39fca
Merge pull request #8178 from peppy/tournamet-fix-video-looping
Fix video looping not propagating when set too early in initialisation
2020-03-09 09:13:21 +09:00
Dan Balasescu
0c868f54bc
Merge branch 'master' into score-counter-flexibility 2020-03-09 08:56:39 +09:00
Dan Balasescu
4b419d1976
Merge branch 'master' into tournamet-fix-video-looping 2020-03-09 08:51:22 +09:00
Dean Herbert
460bd993ca
Merge pull request #8047 from TheWildTree/adjust-most-played
Adjust most played beatmaps section to better match osu-web
2020-03-09 02:20:02 +09:00
Dean Herbert
c2fbc85e77 Split out test scene for StarCounter 2020-03-09 01:26:34 +09:00
Dean Herbert
61297847a7 Fix compilation failure 2020-03-09 01:21:37 +09:00
Dean Herbert
414e704d37
Use existing local function
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-09 00:18:28 +09:00
Lucas A
0953751d24 Clamp relative position of judgement ticks in range [0;1] 2020-03-08 15:51:57 +01:00
Dean Herbert
dc201a68dc Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool 2020-03-08 20:16:48 +09:00
Dean Herbert
5f6ce7fde5 Merge branch 'tournament-drawable-team-tidy' into tournament-design-ladder 2020-03-08 20:16:35 +09:00
Dean Herbert
7f38ff8046 Merge branch 'tournament-drawable-team-tidy' into tournament-design-schedule 2020-03-08 20:16:12 +09:00
Dean Herbert
71824ce7d6 Merge branch 'tournament-drawable-team-tidy' into tournament-design-win 2020-03-08 20:14:59 +09:00
Dean Herbert
ba865aa195 Merge branch 'tournament-drawable-team-tidy' into tournament-design-intro 2020-03-08 20:14:15 +09:00