1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 07:53:38 +08:00
Commit Graph

27279 Commits

Author SHA1 Message Date
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
Andrei Zavatski
90259e1f69 Merge remote-tracking branch 'refs/remotes/ppy/master' into catcher-fix 2020-03-12 12:01:11 +03: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
28ac5af91c Fix beatmap carousel tests loading beatmap manager beatmaps in test browser 2020-03-12 16:53:23 +09:00
Dean Herbert
ec1c6f88ee Adjust metrics to align logo pieces correctly on gameplay / map pool 2020-03-12 14:27:56 +09:00
Dean Herbert
7b1ac03b18 Hide logo on gameplay screen 2020-03-12 14:27:56 +09:00
Dean Herbert
b6b802e821 Add back customisable header logo/text
Also adds test scene for MatchHeader component.
2020-03-12 14:27:56 +09:00
Dean Herbert
190ff97486 Rename classes to better suit purpose 2020-03-12 14:27:56 +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
Andrei Zavatski
e46c070d95 Add test scene 2020-03-11 23:09:29 +03:00
Andrei Zavatski
09b9983286 Fix CatcherAnimationState is Fail if missing banana shower 2020-03-11 21:14:07 +03:00
Dean Herbert
efceeba076 Use fixed width for tournament score displays 2020-03-12 02:22:02 +09:00
Olle Kelderman
2866d62653 Use environment variable for initializing osuInstallPath 2020-03-11 16:26:53 +01: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
smoogipoo
5c051027e7 Fix different offset being applied from stable 2020-03-11 18:43:08 +09:00
smoogipoo
919410c627 Remove always-false condition 2020-03-11 18:39:50 +09:00
smoogipoo
f8e7579f45 Fix juice stream position reset not ever being applied 2020-03-11 18:38:05 +09:00
smoogipoo
5b03b3e363 Fix hyperdashes not recalculated with HR application 2020-03-11 18:36:37 +09:00
smoogipoo
40ab860ab5 Remove unused using 2020-03-11 18:23:30 +09:00
smoogipoo
9667934ed9 Remove unlimited timing points in difficulty calculation 2020-03-11 18:17:32 +09:00
smoogipoo
758bb3711f Add more sane limit for maximum slider length 2020-03-11 18:07:11 +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