15980 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into add-ui-scale
  Dan Balasescu · 2019-01-10 14:25:38 +09:00
  bb36f457fe
• Merge pull request #4023 from peppy/fix-eternal-failing

  Fix API getting stuck in eternal failing state if login request fails

  Dan Balasescu · 2019-01-10 14:01:40 +09:00
  e98ef4e164
• Fix extra newline
  Dean Herbert · 2019-01-10 12:11:14 +09:00
  5e4bea9d99
• Add UI scale

  Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.

  Dean Herbert · 2019-01-09 19:01:33 +09:00
  4f5c208672
• Fix API getting stuck in eternal failing state if login request fails
  Dean Herbert · 2019-01-09 15:29:27 +09:00
  045ed741b0
• Merge pull request #4013 from smoogipoo/beatmap-scores-foreignkey

  Add explicit beatmap -> scores deletions rather than relying on FK cascades

  Dean Herbert · 2019-01-08 21:39:15 +09:00
  e4ff36a5bc
• Merge pull request #4012 from smoogipoo/fix-sliderbar

  Fix sliderbar not working correctly with TransferValueOnCommit = true

  Dean Herbert · 2019-01-08 21:37:47 +09:00
  2c94b54c03
• Update framework
  Dean Herbert · 2019-01-08 21:26:24 +09:00
  415df52c69
• Merge branch 'master' into fix-sliderbar
  Dean Herbert · 2019-01-08 21:23:34 +09:00
  958840fe17
• Merge pull request #3990 from peppy/fix-over-inclusive-channel-search

  Fix searching for "channel" matching all channels

  Dean Herbert · 2019-01-08 20:28:50 +09:00
  253b10dc1f
• Merge branch 'master' into fix-over-inclusive-channel-search
  Dan Balasescu · 2019-01-08 19:54:31 +09:00
  8214faeacc
• Add explicit beatmap -> scores relationship rather than relying on cascades
  smoogipoo · 2019-01-08 17:53:43 +09:00
  cf8bcb7ba2
• Merge pull request #3997 from peppy/letterboxing

  Add scaling support (aka letterboxing)

  Dan Balasescu · 2019-01-08 16:52:58 +09:00
  2ecbb23b63
• Remove unused references
  smoogipoo · 2019-01-08 16:38:34 +09:00
  2c44b928d3
• Remove more unused code
  smoogipoo · 2019-01-08 16:37:18 +09:00
  daeba63242
• Use value where applicable
  smoogipoo · 2019-01-08 16:31:44 +09:00
  38a3ccc817
• Fix sliderbar not working correctly with TransferValueOnCommit = true
  smoogipoo · 2019-01-08 16:07:54 +09:00
  8692be9de3
• Use better logic for setting slider bar settings
  Dean Herbert · 2019-01-08 14:56:42 +09:00
  a2a7aa708f
• Use TransferOnCommit
  Dean Herbert · 2019-01-08 13:48:38 +09:00
  01aa4c2a72
• Fix masking being unapplied incorrectly
  Dean Herbert · 2019-01-08 13:36:07 +09:00
  199b614eba
• Fix toolbar offset not being applied
  Dean Herbert · 2019-01-08 12:57:31 +09:00
  440f4703cb
• Remove unused variable
  Dean Herbert · 2019-01-08 12:50:42 +09:00
  dd960e6a89
• Merge branch 'master' into letterboxing
  Dean Herbert · 2019-01-08 11:41:44 +09:00
  4276805b5a
• Merge pull request #4006 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-01-08 11:40:36 +09:00
  7bb4a06122
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-01-08 11:26:10 +09:00
  276014f591
• Merge branch 'master' into letterboxing
  Dean Herbert · 2019-01-08 11:26:09 +09:00
  2fc3e77be7
• Merge pull request #4007 from peppy/fix-leaderboard-nullrefs

  Fix leaderboard not correctly handling cancellation

  Dan Balasescu · 2019-01-08 11:25:42 +09:00
  74ada4f3a3
• Move cancellation to safer place
  Dean Herbert · 2019-01-07 19:31:05 +09:00
  8eedef3e86
• Fix leaderboard not correctly handling cancellation
  Dean Herbert · 2019-01-07 19:28:46 +09:00
  d72412d24d
• Merge remote-tracking branch 'origin/update-framework' into letterboxing

  # Conflicts:
  #	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs

  Dean Herbert · 2019-01-07 18:53:53 +09:00
  70d644406f
• Merge remote-tracking branch 'upstream/master' into letterboxing
  Dean Herbert · 2019-01-07 18:52:48 +09:00
  74539b5e5c
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-01-07 18:51:54 +09:00
  49ba4e5a14
• Merge pull request #4001 from UselessToucan/linq_temp

  Use Find instead of FirstOrDefault

  Dean Herbert · 2019-01-07 18:50:59 +09:00
  ca98caf84b
• Update framework
  Dean Herbert · 2019-01-07 18:50:27 +09:00
  f6018294b5
• Merge pull request #4005 from smoogipoo/stacking-indices

  Implement stacking by indices

  Dean Herbert · 2019-01-07 18:43:08 +09:00
  115caa928c
• Only update stacking if there are hitobjects
  smoogipoo · 2019-01-07 18:15:44 +09:00
  b57c1af084
• More verbose exceptions
  smoogipoo · 2019-01-07 18:13:40 +09:00
  c6c22b352f
• Merge pull request #4004 from peppy/remove-settings-label

  Remove broken SettingsLabel class

  Dean Herbert · 2019-01-07 18:07:52 +09:00
  a5f9ae86a8
• Shortcut O(n^2) calculation
  smoogipoo · 2019-01-07 18:01:44 +09:00
  351ab6e9bd
• Implement stacking by index
  smoogipoo · 2019-01-07 18:00:59 +09:00
  1c5ab6a906
• Remove broken SettingsLabel class
  Dean Herbert · 2019-01-07 17:03:59 +09:00
  73c2fcac08
• Merge pull request #3998 from peppy/fix-pp-display

  Fix PP not display on profile overlay

  Dean Herbert · 2019-01-06 22:18:08 +09:00
  5e87a3a7e2
• The code must not contain multiple blank lines in a row
  Roman Kapustin · 2019-01-05 21:03:03 +03:00
  469a64a7cd
• Use Find instead of FirstOrDefault
  Roman Kapustin · 2019-01-05 19:35:33 +03:00
  4b5fc85875
• Fix PP not display on profile overlay
  Dean Herbert · 2019-01-04 16:33:35 +09:00
  4a7c6fb19d
• Merge pull request #3813 from UselessToucan/do_not_use_local_user_for_autoplay_score

  Handle ModAutoplay during score construction in the Player

  Dean Herbert · 2019-01-04 15:56:20 +09:00
  e596d4fc10
• Remove unnecessary null check
  Dean Herbert · 2019-01-04 15:49:23 +09:00
  7d1163a7d2
• Backdate license header for now
  Dean Herbert · 2019-01-04 15:37:27 +09:00
  f2ccf70d1b
• Formatting and naming
  Dean Herbert · 2019-01-04 15:34:32 +09:00
  c528a3896d
• Remove unnecessary tracked settings (for now)
  Dean Herbert · 2019-01-04 15:28:48 +09:00
  4c3310ca80