11066 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-mania-conversion
  Dan Balasescu · 2018-03-09 16:09:14 +09:00
  ac9de336db
• Merge pull request #2045 from UselessToucan/PlayerBase

  Allow previewing background adjustments at player loading screen

  Dean Herbert · 2018-03-08 22:26:39 +09:00
  c11f6efab5
• Move player-specific configuration bindables back to player
  Dean Herbert · 2018-03-08 22:16:47 +09:00
  6d91889ca6
• Replace ConfigureBackgroundUpdate with OnEntering
  TocoToucan · 2018-03-08 11:35:00 +03:00
  2cb197d0c4
• Merge branch 'master' into PlayerBase
  Dean Herbert · 2018-03-08 16:12:12 +09:00
  8f3f886805
• Merge pull request #2186 from peppy/fix-difficulty-calculator

  Fix difficulty calculator regression when applying mods

  Dean Herbert · 2018-03-08 15:14:13 +09:00
  80bd2a95f6
• Merge branch 'master' into fix-difficulty-calculator
  Dean Herbert · 2018-03-08 15:03:33 +09:00
  2c0928896b
• Merge pull request #2183 from peppy/less-hp-drain

  Match HP drain harshness closer to stable

  Dean Herbert · 2018-03-08 14:53:15 +09:00
  213d749dab
• Merge branch 'master' into less-hp-drain
  Dan Balasescu · 2018-03-08 14:44:40 +09:00
  ffc9a7644e
• Fix difficulty calculator regression when applying mods
  Dean Herbert · 2018-03-08 12:57:36 +09:00
  70a16667b6
• Merge pull request #2120 from naoey/user-profile-recent

  Add recent section to user profile

  Dean Herbert · 2018-03-08 01:14:30 +09:00
  ca249ab866
• Tidy up test case
  Dean Herbert · 2018-03-08 00:58:16 +09:00
  e55a503f79
• Merge branch 'master' into user-profile-recent
  Dean Herbert · 2018-03-08 00:42:02 +09:00
  453fd83e01
• Merge pull request #2184 from delftswa2018/master

  Removing "mouse wheel disabled" checkbox from visual settings in gameplay

  Dean Herbert · 2018-03-08 00:03:31 +09:00
  b4d20c81e0
• Add VisualTest.
  naoey · 2018-03-07 19:08:26 +05:30
  983cefbe40
• Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
  pdrapoport · 2018-03-07 14:20:59 +01:00
  3731cbe5eb
• Merge branch 'master' into user-profile-recent
  Dean Herbert · 2018-03-07 19:41:52 +09:00
  f78538fea8
• Match HP drain harshness closer to stable

  Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.

  Dean Herbert · 2018-03-07 19:37:26 +09:00
  04f5563238
• Merge pull request #2178 from peppy/slider-tick-transform-cleanup

  SliderTick transform improvements

  Dean Herbert · 2018-03-07 17:19:16 +09:00
  fbe8641ec4
• Merge branch 'master' into slider-tick-transform-cleanup
  Dan Balasescu · 2018-03-07 16:59:04 +09:00
  1375ee8408
• Merge pull request #2177 from peppy/api-error-shouldnt-retry

  Fix arbitrary API request errors getting identified as timeouts

  Dean Herbert · 2018-03-07 16:58:54 +09:00
  9aa52db2c0
• Merge branch 'master' into api-error-shouldnt-retry
  Dan Balasescu · 2018-03-07 16:50:14 +09:00
  fb349e68a3
• Merge pull request #2176 from peppy/nullable-legacy-id

  Make LegacyID nullable

  Dean Herbert · 2018-03-07 16:50:03 +09:00
  7a005bdb6a
• Merge branch 'master' into nullable-legacy-id
  Dan Balasescu · 2018-03-07 16:12:08 +09:00
  0c154e07ed
• Merge pull request #2174 from peppy/fix-textbox-arrows

  Fix left and right arrows keys in chat overlay not working

  Dan Balasescu · 2018-03-07 16:12:02 +09:00
  d486a55487
• Merge branch 'master' into fix-textbox-arrows
  Dan Balasescu · 2018-03-07 16:01:44 +09:00
  5fda7881c3
• Merge pull request #2165 from jorolf/volume-control

  Implement updated volume control overlay design

  Dean Herbert · 2018-03-07 15:03:04 +09:00
  43f7139dc7
• Tidy up
  Dean Herbert · 2018-03-07 14:54:54 +09:00
  a71e5ce19c
• Remove unnecessary comment
  Dean Herbert · 2018-03-07 14:54:15 +09:00
  4094ffbddd
• Ensure initial value is set even if that value is zero
  Dean Herbert · 2018-03-07 14:51:34 +09:00
  96ea42d3ba
• Improve the way bindings are done
  Dean Herbert · 2018-03-07 14:50:50 +09:00
  05a13d4d39
• Add default bindable values
  Dean Herbert · 2018-03-07 14:38:41 +09:00
  51a9dd038e
• Move to overlayContent
  Dean Herbert · 2018-03-07 14:20:47 +09:00
  fac4cd6a32
• Use GradientHorizontal helper function
  Dean Herbert · 2018-03-07 14:07:04 +09:00
  e2f9e237e8
• Merge branch 'master' into volume-control
  Dean Herbert · 2018-03-07 14:03:09 +09:00
  c176e309e1
• Merge pull request #2175 from smoogipoo/flowcontainer-changes

  Update framework with FlowContainer changes

  Dean Herbert · 2018-03-07 14:01:14 +09:00
  b84367c52a
• Update framework
  Dean Herbert · 2018-03-07 13:22:08 +09:00
  08c469a8b3
• Remove alpha setting
  Dean Herbert · 2018-03-06 18:40:39 +09:00
  4dfd3a61cc
• SliderTick transform improvements
  Dean Herbert · 2018-03-06 18:28:36 +09:00
  7cf1d4450a
• Make LegacyID nullable

  The -1 default was getting stored to the database.

  Dean Herbert · 2018-03-06 17:40:14 +09:00
  e82cadc811
• Fix arbitrary API request errors getting identified as timeouts
  Dean Herbert · 2018-03-06 17:39:34 +09:00
  07bf8549eb
• Additional fixes for flow ordering after framework changes
  smoogipoo · 2018-03-06 17:20:58 +09:00
  78d73d4c11
• Update framework
  smoogipoo · 2018-03-06 14:16:17 +09:00
  27e0ed4ea8
• osu!-side changes in-line with framework layout changes
  smoogipoo · 2018-03-06 14:12:37 +09:00
  148551afa2
• Make locally used things local and rename method.
  naoey · 2018-03-06 09:33:15 +05:30
  9669c5aee3
• Fix left and right arrows keys in chat overlay not working

  Misplaced override. Resolves ppy/osu-framework#1444

  Dean Herbert · 2018-03-06 08:59:40 +09:00
  90828cca8f
• Resolve merge conflicts
  TocoToucan · 2018-03-05 22:24:25 +03:00
  697ad63d72
• Merge pull request #2167 from smoogipoo/fix-taiko-conversion

  Fix incorrect slider-to-drumroll conversions in taiko

  Dean Herbert · 2018-03-06 01:52:22 +09:00
  v2018.306.0 a6460832f4
• Fix merge regression
  Dean Herbert · 2018-03-06 01:39:01 +09:00
  c4c1b0b6ff
• Merge branch 'master' into fix-taiko-conversion
  Dean Herbert · 2018-03-06 01:16:47 +09:00
  7b18e8a5ca