1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 08:07:40 +08:00
Commit Graph

27583 Commits

Author SHA1 Message Date
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
Dean Herbert
db5c8043db Add test covering ruleset change on difficulty icon selection 2020-03-12 18:42:08 +09:00
Dean Herbert
ca9cfbe51d Move selection fallback logic out of BeatmapCarousel to SongSelect 2020-03-12 18:42:08 +09:00
Dean Herbert
6e11c3014c Allow grouped difficulty icons to be clicked 2020-03-12 18:42:08 +09:00
Dean Herbert
2bcf079386 Update carousel test logic to match new carousel selection behaviour 2020-03-12 18:42:08 +09:00
Dean Herbert
ce5d01ed19 Allow filtered difficulty icons to be clicked 2020-03-12 18:42:08 +09:00
Dean Herbert
5537b279de Fix failing test occasionally getting wrong ruleset beatmap 2020-03-12 18:39:43 +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
Andrei Zavatski
bc2a1cdb62 Apply suggestions 2020-03-12 12:04:36 +03: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
Dean Herbert
fc058f8896 Remove unnecessary this. prefix 2020-03-12 18:03:18 +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
933a8ffc8a Add test coverage 2020-03-12 17:10:51 +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
63edcddaf1 Apply ruleset filter in all cases (even when bypassing filter for selection purposes) 2020-03-12 15:06:26 +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
smoogipoo
424f9afbf4 Fix incorrect offset with custom clock 2020-03-11 17:55:20 +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
6546fd3f81 Fix potential null due to async load 2020-03-11 16:07:44 +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
1d556bfc5f
Merge branch 'master' into video-offset 2020-03-11 15:13:18 +09:00
smoogipoo
ae7245a51b Refactor + fix fade in too late 2020-03-11 15:11:54 +09:00
Dan Balasescu
03c8140d3c
Merge branch 'master' into add-catcher-animation-states 2020-03-11 14:53:14 +09:00
voidedWarranties
6de244389b Use OffsetClock instead of ManualClock 2020-03-10 22:50:20 -07:00