19824 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
  naoey · 2019-06-25 18:27:16 +05:30
  9d88295ece
• Re-use the back button game-wide (#5149)

  Re-use the back button game-wide
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-25 20:50:28 +09:00
  7d5554c2ac
• Make testcase even more useful
  Andrei Zavatski · 2019-06-25 14:27:29 +03:00
  08e31159fc
• Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
  Dean Herbert · 2019-06-25 20:23:49 +09:00
  f9dad0f640
• Add testability of dismissal
  Dean Herbert · 2019-06-25 20:23:43 +09:00
  e87e4077e8
• Adjust transitions a tad
  Dean Herbert · 2019-06-25 20:23:34 +09:00
  f51be4c4fe
• Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
  Andrei Zavatski · 2019-06-25 14:16:05 +03:00
  bae0258d8d
• Reduce size of dropdown chevron (#5150)

  Reduce size of dropdown chevron
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-06-25 20:05:52 +09:00
  75b78d5e27
• Use OsuScrollContainer for osu menus (#5094)

  Use OsuScrollContainer for osu menus
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-25 20:05:09 +09:00
  28cfccbd64
• Merge branch 'master' into reduce-dropdown-chevron-size
  Dan Balasescu · 2019-06-25 19:58:37 +09:00
  7794fab7c9
• Merge pull request #5147 from peppy/reduce-background-brightness

  Reduce background brightness at PlayerLoader

  Dan Balasescu · 2019-06-25 19:58:25 +09:00
  89777c1743
• Merge branch 'master' into reduce-background-brightness
  Dan Balasescu · 2019-06-25 19:45:15 +09:00
  0f31d17129
• Reduce size of dropdown chevron
  Dean Herbert · 2019-06-25 19:32:00 +09:00
  a3de369c20
• Merge branch 'master' into fix-dropdown-styling
  Dean Herbert · 2019-06-25 19:28:37 +09:00
  8c02709d74
• Merge pull request #5148 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-06-25 19:28:17 +09:00
  445660d066
• Merge branch 'master' into reduce-background-brightness
  Dan Balasescu · 2019-06-25 19:18:28 +09:00
  c6965a40dc
• Merge pull request #5144 from peppy/beatmap-overlay-load

  Improve loading state of BeatmapSet header

  Dan Balasescu · 2019-06-25 19:18:23 +09:00
  055b302da1
• Merge branch 'master' into beatmap-overlay-load
  Dan Balasescu · 2019-06-25 19:05:17 +09:00
  47974ca854
• Merge pull request #5143 from peppy/cancel-api-callback

  Avoid calling api request callback after user cancel

  Dan Balasescu · 2019-06-25 19:04:57 +09:00
  2d07514a56
• Merge branch 'master' into cancel-api-callback
  Dan Balasescu · 2019-06-25 18:43:33 +09:00
  ffcd3529a6
• Remove unnecessary extra property
  smoogipoo · 2019-06-25 18:38:14 +09:00
  aa81c95f30
• Update framework
  Dean Herbert · 2019-06-25 18:38:11 +09:00
  fe290ead63
• Adjust backbutton animation
  smoogipoo · 2019-06-25 18:33:35 +09:00
  5b294ba419
• Make TLB test scene test TLB and not back button
  smoogipoo · 2019-06-25 18:33:30 +09:00
  4ed14a295d
• Exit match before exiting multiplayer
  smoogipoo · 2019-06-25 18:33:26 +09:00
  531b107a98
• Close mod select before exiting song selection
  smoogipoo · 2019-06-25 18:33:21 +09:00
  1a26608ba9
• Relieve OsuScreen of back button input duties
  smoogipoo · 2019-06-25 18:33:18 +09:00
  d9927204f8
• Scale backbutton along with screens
  smoogipoo · 2019-06-25 18:33:13 +09:00
  f53d2fbe76
• Move back button to OsuGame
  smoogipoo · 2019-06-25 18:33:08 +09:00
  8c96e4c1fa
• Fix keybindings being offset incorrectly (#5146)

  Fix keybindings being offset incorrectly

  Dean Herbert · 2019-06-25 17:27:31 +09:00
  1ea24756bd
• Reduce background brightness at PlayerLoader
  Dean Herbert · 2019-06-25 17:22:10 +09:00
  7bc7df2249
• Fix keybindings being offset
  Dean Herbert · 2019-06-25 17:16:19 +09:00
  93b6d5b7e3
• Fix cursor expansion state potentially being incorrect (#5145)

  Fix cursor expansion state potentially being incorrect

  Dean Herbert · 2019-06-25 16:16:27 +09:00
  7281b64eb6
• Fix cursor expansion state potentially being incorrect
  smoogipoo · 2019-06-25 15:47:54 +09:00
  0d98d637b6
• Remove unnecessary local item storage in SettingsDropdown (#5142)

  Remove unnecessary local item storage in SettingsDropdown

  Dean Herbert · 2019-06-25 15:22:20 +09:00
  f2207aae4e
• Improve loading state of BeatmapSet header
  Dean Herbert · 2019-06-25 14:47:29 +09:00
  ba2f22be47
• Avoid calling api request callback after user cancel
  Dean Herbert · 2019-06-25 13:52:43 +09:00
  90acc9b6ca
• Remove unnecessary local item storage in SettingsDropdown
  smoogipoo · 2019-06-25 12:00:05 +09:00
  fb94cd43a4
• Avoid displaying previous user avatar when showing new beatmap… (#5112)

  Avoid displaying previous user avatar when showing new beatmap overlay
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-25 10:31:36 +09:00
  109ca1fd6f
• Merge branch 'master' into fix-avatar-display-update-2
  Dean Herbert · 2019-06-25 10:18:46 +09:00
  cc1e67dc6c
• Use test beatmap sets instead of real info
  iiSaLMaN · 2019-06-25 03:21:55 +03:00
  c76505c9c3
• Merge pull request #5141 from Morilli/fix-readme

  Fix bad wording in the readme

  Dean Herbert · 2019-06-25 06:49:29 +09:00
  c4791f19b5
• fix bad wording
  Morilli · 2019-06-24 23:25:33 +02:00
  7fa94e6e35
• update code to work with https://github.com/ppy/osu-framework/pull/2568
  jorolf · 2019-06-24 23:17:07 +02:00
  4d8f49b9bc
• Remove useless parentheses
  Andrei Zavatski · 2019-06-24 23:30:35 +03:00
  b7d15982d7
• Remove unwanted class and move the bind logic outside the RulesetSelector
  Andrei Zavatski · 2019-06-24 23:13:28 +03:00
  4a05c560cf
• Revert a hotfix in multi screen

  since it's been fixed in a framework

  Andrei Zavatski · 2019-06-24 22:57:18 +03:00
  9dedd62d9a
• Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
  Andrei Zavatski · 2019-06-24 22:52:24 +03:00
  35516e7304
• Remove leftover TransformDuration overrides
  HoLLy · 2019-06-24 18:26:25 +02:00
  236d5a9abc
• Only hide UpdateableAvatar/Flag immediately
  HoLLy · 2019-06-24 18:24:31 +02:00
  739077ef4f