Bartłomiej Dach
|
d24fa18bc2
|
Merge branch 'master' into video-offset
|
2020-03-12 19:58:45 +01: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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|