1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 13:37:25 +08:00
Commit Graph

27214 Commits

Author SHA1 Message Date
Dean Herbert
604ce37064 Merge remote-tracking branch 'upstream/master' into video-start-from-zero 2020-03-12 18:57:53 +09: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
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
Dan Balasescu
88b1d5486d
Merge pull request #8229 from peppy/tournament-fixed-width-score
Use fixed width text for tournament score displays
2020-03-12 17:58:19 +09:00
Dean Herbert
39bb98bfb2 Allow videos to be loaded with any extension
Also moves all tournament user resources to a "tournament" subfolder.
2020-03-12 13:27:00 +09:00
Dean Herbert
fd21e87670 Disable adjusting volume via "select next" and "select previous" as fallbacks 2020-03-12 11:28:45 +09:00
Dean Herbert
efceeba076 Use fixed width for tournament score displays 2020-03-12 02:22:02 +09:00
Dan Balasescu
cb0e698e04
Merge pull request #8215 from peppy/tournament-design-seeding
Implement 2020 seeding screen design
2020-03-11 19:06:00 +09:00
Dan Balasescu
f49f9f40ae
Merge branch 'master' into tournament-design-seeding 2020-03-11 18:03:27 +09:00
smoogipoo
8eb8572c73 Apply osu!-side video sprite changes 2020-03-11 18:00:39 +09:00
Dan Balasescu
42bc8bc50d
Merge pull request #8199 from peppy/add-banana-scale-rotate
Add random rotation and scale factors to osu!catch bananas
2020-03-11 16:31:18 +09:00
Dan Balasescu
6e43f617e0
Merge pull request #8198 from peppy/add-catcher-animation-states
Add catcher kiai/fail animation states
2020-03-11 16:29:29 +09:00
Dean Herbert
966e5bbc8a User helper function to reduce copy paste 2020-03-11 15:54:21 +09:00
Dean Herbert
401429feec Revert changes to ScrenTestScene 2020-03-11 15:52:18 +09:00
Dan Balasescu
35ae8aa29f
Merge pull request #8108 from EVAST9919/friends-update-streams
Implement FriendsOnlineStatusControl component
2020-03-11 15:35:23 +09:00
Dan Balasescu
03c8140d3c
Merge branch 'master' into add-catcher-animation-states 2020-03-11 14:53:14 +09:00
Dan Balasescu
e6685c88fc
Merge pull request #8205 from peppy/always-scroll-to-selection
Fix changing ruleset at song select not scrolling the current selection back into view
2020-03-11 14:38:57 +09:00
Dean Herbert
6f7a6a5a59
Merge pull request #8133 from peppy/better-filter-bypass
Reapply filters on next change after a forced beatmap display
2020-03-11 14:36:28 +09:00
Dan Balasescu
c3fd8e294a
Merge pull request #8211 from peppy/new-disclaimer
Update text on disclaimer screen (and add tips)
2020-03-11 14:24:58 +09:00
Dan Balasescu
d3c0deb381
Merge branch 'master' into friends-update-streams 2020-03-11 14:09:27 +09:00
Dan Balasescu
affb227b38
Merge pull request #8200 from peppy/add-hyperdash-afterimage
Add afterimage glow when entering hyperdash
2020-03-11 13:56:19 +09:00
Dan Balasescu
cd5f0d6e96
Merge pull request #8201 from peppy/fix-hyperdash-test
Fix hyperdash test having a zero-length juice stream
2020-03-11 13:46:59 +09:00
Dean Herbert
1bad2ff879 Load all catcher states ahead-of-time to avoid blocking loads 2020-03-11 13:45:55 +09:00
Dan Balasescu
f8f8e3628f
Merge branch 'master' into always-scroll-to-selection 2020-03-11 13:38:28 +09:00
Dan Balasescu
9119e32f63
Merge branch 'master' into better-filter-bypass 2020-03-11 13:37:55 +09:00
Dan Balasescu
ef2b625d9a
Merge pull request #8202 from peppy/remove-tiny-droplet-samples
Don't play samples on catching a tiny droplet
2020-03-11 13:26:15 +09:00
Dean Herbert
93aec4e692
Improve english
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-11 13:23:26 +09:00
Dan Balasescu
34629fe974
Merge pull request #8206 from peppy/fix-cross-thread-operation
Fix download failures potentially crashing game
2020-03-11 13:19:36 +09:00
Dean Herbert
638a9a24aa Initial disclaimer updates 2020-03-11 13:03:27 +09:00
Dan Balasescu
460f564b2b
Merge branch 'master' into add-hyperdash-afterimage 2020-03-11 12:58:24 +09:00
Dan Balasescu
ba98155832
Merge branch 'master' into fix-hyperdash-test 2020-03-11 12:56:40 +09:00
smoogipoo
9683c0756d Start path at (0,0) 2020-03-11 12:56:12 +09:00
Dan Balasescu
df52b58543
Merge branch 'master' into remove-tiny-droplet-samples 2020-03-11 12:46:16 +09:00
Dan Balasescu
afcbc5b789
Merge branch 'master' into fix-cross-thread-operation 2020-03-11 12:45:18 +09:00
Dan Balasescu
24d16e66cd
Merge pull request #8204 from peppy/fix-catch-hitobject-fadein
Fix osu!catch hitobjects appearing / fading too late
2020-03-11 12:40:49 +09:00
Dan Balasescu
27c31969fd
Merge branch 'master' into fix-catch-hitobject-fadein 2020-03-11 11:49:11 +09:00
Dan Balasescu
e43c7cb9d9
Merge pull request #8208 from peppy/remove-fromhex-helper
Use framework extension method for FromHex
2020-03-11 11:44:13 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dean Herbert
7b368dca35 Add test coverage 2020-03-11 02:59:24 +09:00
Dean Herbert
a2d3f20409
Merge branch 'master' into better-filter-bypass 2020-03-11 02:55:14 +09:00
Dean Herbert
1648a0d2d3
Merge pull request #7971 from TheWildTree/show-loved-pp
Hide pp display on leaderboards if map is qualified or loved
2020-03-11 02:54:16 +09:00
Dean Herbert
998ca05a0c Fix disclaimer test scene supporter toggle 2020-03-11 02:35:36 +09:00
Dean Herbert
53e083f329
Merge branch 'master' into show-loved-pp 2020-03-11 01:08:13 +09:00
Dean Herbert
8c9bfbce7e
Merge pull request #8084 from smoogipoo/fix-perfect-judgements
Fix perfect mod incorrectly failing in some scenarios
2020-03-11 01:01:33 +09:00
Dean Herbert
0be423183d Rename data class 2020-03-11 00:36:56 +09:00
Dean Herbert
66a0f3334d
Merge branch 'master' into fix-perfect-judgements 2020-03-10 23:50:57 +09:00
Dean Herbert
dbfbcca29c
Merge pull request #8195 from smoogipoo/fix-storyboard-crashes
Fix crashes on some storyboards
2020-03-10 22:28:35 +09:00
Dean Herbert
ad7cda8735 Fix download failures causing a non-safe drawable change 2020-03-10 20:11:06 +09:00
Dean Herbert
8294dd0b71 Fix changing ruleset at song selectnot scrolling the current selection back into view 2020-03-10 19:59:49 +09:00
Dean Herbert
8ec2c35c4f Change origin of nested objects inside JuiceStream to fix visibility issues 2020-03-10 19:35:10 +09:00