27251 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into video-offset
  Bartłomiej Dach · 2020-03-12 19:58:45 +01:00
  d24fa18bc2
• Merge pull request #8245 from 2yangk23/master

  Fallback on invalid AnimationFramerate for legacy skins

  Dean Herbert · 2020-03-12 20:34:33 +09:00
  2020.312.0 8d0bcf4bbb
• Update osu.Game/Skinning/LegacySkinExtensions.cs

  Co-Authored-By: Dean Herbert <pe@ppy.sh>

  Kelvin · 2020-03-12 04:18:57 -07:00
  c8ea922577
• Merge pull request #8230 from EVAST9919/catcher-fix

  Fix catcher showing miss sprite upon missing bananas

  Dean Herbert · 2020-03-12 20:10:36 +09:00
  cc8a413f6b
• Fallback on invalid AnimationFramerate for legacy skins
  Kelvin · 2020-03-12 03:55:45 -07:00
  317bb5d0a4
• Merge pull request #8226 from omkelderman/stable-install-path-from-env-var

  Add ability to set stable path for tourney client via environment variable

  Dean Herbert · 2020-03-12 19:48:48 +09:00
  9e52fbdd3e
• Merge pull request #8220 from smoogipoo/fix-catch-beatmap-processor

  Fix catch beatmap processing not matching stable

  Dean Herbert · 2020-03-12 19:47:15 +09:00
  9d9ee76888
• Merge pull request #8216 from smoogipoo/video-start-from-zero

  Apply osu!-side video sprite changes

  Dean Herbert · 2020-03-12 19:46:46 +09:00
  08dc4a0e8b
• Update framework
  Dean Herbert · 2020-03-12 18:58:07 +09:00
  a69fabbd1f
• Merge pull request #8241 from peppy/fix-carousel-test-loading-beatmaps

  Fix beatmap carousel tests loading beatmap manager beatmaps in test browser

  Dan Balasescu · 2020-03-12 18:58:04 +09:00
  d4627921d5
• Merge pull request #8237 from peppy/tournament-header-logo

  Add back dynamic components of tournament header

  Dan Balasescu · 2020-03-12 18:57:55 +09:00
  031505082b
• Merge remote-tracking branch 'upstream/master' into video-start-from-zero
  Dean Herbert · 2020-03-12 18:57:53 +09:00
  604ce37064
• Merge branch 'master' into fix-carousel-test-loading-beatmaps
  Dan Balasescu · 2020-03-12 18:14:27 +09:00
  1b5cb3893a
• Merge branch 'master' into tournament-header-logo
  Dan Balasescu · 2020-03-12 18:12:08 +09:00
  f37444ad18
• Apply suggestions
  Andrei Zavatski · 2020-03-12 12:04:36 +03:00
  bc2a1cdb62
• Merge pull request #8236 from peppy/tournament-all-video-extensions

  Allow videos to be loaded with any extension

  Dan Balasescu · 2020-03-12 18:03:45 +09:00
  4cdb94f3a5
• Merge pull request #8235 from peppy/disable-global-volume-via-select-bindings

  Disable adjusting volume via "select next" and "select previous" as fallbacks

  Dan Balasescu · 2020-03-12 18:02:28 +09:00
  869ea724f0
• Merge remote-tracking branch 'refs/remotes/ppy/master' into catcher-fix
  Andrei Zavatski · 2020-03-12 12:01:11 +03:00
  90259e1f69
• Merge pull request #8229 from peppy/tournament-fixed-width-score

  Use fixed width text for tournament score displays

  Dan Balasescu · 2020-03-12 17:58:19 +09:00
  88b1d5486d
• Fix beatmap carousel tests loading beatmap manager beatmaps in test browser
  Dean Herbert · 2020-03-12 16:53:23 +09:00
  28ac5af91c
• Adjust metrics to align logo pieces correctly on gameplay / map pool
  Dean Herbert · 2020-03-12 14:27:56 +09:00
  ec1c6f88ee
• Hide logo on gameplay screen
  Dean Herbert · 2020-03-12 14:27:56 +09:00
  7b1ac03b18
• Add back customisable header logo/text

  Also adds test scene for MatchHeader component.

  Dean Herbert · 2020-03-12 14:27:56 +09:00
  b6b802e821
• Rename classes to better suit purpose
  Dean Herbert · 2020-03-12 14:27:56 +09:00
  190ff97486
• Allow videos to be loaded with any extension

  Also moves all tournament user resources to a "tournament" subfolder.

  Dean Herbert · 2020-03-12 13:27:00 +09:00
  39bb98bfb2
• Disable adjusting volume via "select next" and "select previous" as fallbacks
  Dean Herbert · 2020-03-12 11:28:45 +09:00
  fd21e87670
• Add test scene
  Andrei Zavatski · 2020-03-11 23:09:29 +03:00
  e46c070d95
• Fix CatcherAnimationState is Fail if missing banana shower
  Andrei Zavatski · 2020-03-11 21:14:07 +03:00
  09b9983286
• Use fixed width for tournament score displays
  Dean Herbert · 2020-03-12 02:22:02 +09:00
  efceeba076
• Use environment variable for initializing osuInstallPath
  Olle Kelderman · 2020-03-11 16:26:53 +01:00
  2866d62653
• Merge pull request #8215 from peppy/tournament-design-seeding

  Implement 2020 seeding screen design

  Dan Balasescu · 2020-03-11 19:06:00 +09:00
  cb0e698e04
• Fix different offset being applied from stable
  smoogipoo · 2020-03-11 18:43:08 +09:00
  5c051027e7
• Remove always-false condition
  smoogipoo · 2020-03-11 18:39:50 +09:00
  919410c627
• Fix juice stream position reset not ever being applied
  smoogipoo · 2020-03-11 18:38:05 +09:00
  f8e7579f45
• Fix hyperdashes not recalculated with HR application
  smoogipoo · 2020-03-11 18:36:37 +09:00
  5b03b3e363
• Merge branch 'master' into tournament-design-seeding
  Dan Balasescu · 2020-03-11 18:03:27 +09:00
  f49f9f40ae
• Apply osu!-side video sprite changes
  smoogipoo · 2020-03-11 18:00:39 +09:00
  8eb8572c73
• Fix incorrect offset with custom clock
  smoogipoo · 2020-03-11 17:55:20 +09:00
  424f9afbf4
• Merge pull request #8199 from peppy/add-banana-scale-rotate

  Add random rotation and scale factors to osu!catch bananas

  Dan Balasescu · 2020-03-11 16:31:18 +09:00
  2020.311.0 42bc8bc50d
• Merge pull request #8198 from peppy/add-catcher-animation-states

  Add catcher kiai/fail animation states

  Dan Balasescu · 2020-03-11 16:29:29 +09:00
  6e43f617e0
• User helper function to reduce copy paste
  Dean Herbert · 2020-03-11 15:54:21 +09:00
  966e5bbc8a
• Revert changes to ScrenTestScene
  Dean Herbert · 2020-03-11 15:52:18 +09:00
  401429feec
• Merge pull request #8108 from EVAST9919/friends-update-streams

  Implement FriendsOnlineStatusControl component

  Dan Balasescu · 2020-03-11 15:35:23 +09:00
  35ae8aa29f
• Merge branch 'master' into video-offset
  Dan Balasescu · 2020-03-11 15:13:18 +09:00
  1d556bfc5f
• Refactor + fix fade in too late
  smoogipoo · 2020-03-11 15:11:54 +09:00
  ae7245a51b
• Merge branch 'master' into add-catcher-animation-states
  Dan Balasescu · 2020-03-11 14:53:14 +09:00
  03c8140d3c
• Use OffsetClock instead of ManualClock
  voidedWarranties · 2020-03-10 22:50:20 -07:00
  6de244389b
• Merge pull request #8205 from peppy/always-scroll-to-selection

  Fix changing ruleset at song select not scrolling the current selection back into view

  Dan Balasescu · 2020-03-11 14:38:57 +09:00
  e6685c88fc
• Merge pull request #8133 from peppy/better-filter-bypass

  Reapply filters on next change after a forced beatmap display

  Dean Herbert · 2020-03-11 14:36:28 +09:00
  6f7a6a5a59
• Merge pull request #8211 from peppy/new-disclaimer

  Update text on disclaimer screen (and add tips)

  Dan Balasescu · 2020-03-11 14:24:58 +09:00
  c3fd8e294a