19539 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
  Dean Herbert · 2019-01-08 11:01:04 +09:00
  881b10a18f
• Merge branch 'master' into moreOptionsFromSkin.ini
  Dean Herbert · 2019-01-08 10:02:06 +09:00
  7eed3ffe75
• Make skinning better
  Dean Herbert · 2019-01-07 20:12:39 +09:00
  4cee21f356
• 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
• Fix implementation of conditional cursor expanding
  Dean Herbert · 2019-01-07 18:28:26 +09:00
  8914585021
• 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 remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
  Dean Herbert · 2019-01-07 18:11:17 +09:00
  13b077c83b
• 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 branch 'master' into fix-replay-import-statistics
  Dean Herbert · 2019-01-07 13:44:01 +09:00
  e73845172c
• 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
• Fix naming
  Matthias Coenraerds · 2019-01-06 13:38:43 +01:00
  562c9e56fb
• Verify leaderboard scope to be local
  Matthias Coenraerds · 2019-01-06 13:37:30 +01:00
  472325b885
• 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
• update resources and remove unused usings
  jorolf · 2019-01-04 23:09:21 +01:00
  8bab87c072
• Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update
  jorolf · 2019-01-04 22:52:29 +01:00
  52994c7ee8
• update design and make play styles an enum
  jorolf · 2019-01-04 22:52:00 +01:00
  a33a1458a5
• Merge branch 'master' of https://github.com/m2307/osu
  Matthias Coenraerds · 2019-01-04 20:40:21 +01:00
  715d5c3a3c
• Filename does not match contained type
  Matthias Coenraerds · 2019-01-04 20:40:07 +01:00
  a93c26ccfd
• Filename does not match contained type
  Matthias Coenraerds · 2019-01-04 20:32:52 +01:00
  6d44672bfa
• License header missing
  Matthias Coenraerds · 2019-01-04 20:27:02 +01:00
  cd5b7dfd8d
• Implement clear scores on beatmap
  Matthias Coenraerds · 2019-01-04 20:23:06 +01:00
  3879348ee4
• Implement clear scores on beatmap
  Matthias Coenraerds · 2019-01-04 20:13:32 +01:00
  ab462a232f
• Merge remote-tracking branch 'origin/master' into xexxar-angles
  smoogipoo · 2019-01-04 23:52:23 +09:00
  722210d8bb
• Merge branch 'master' into profile-header-update
  Dean Herbert · 2019-01-04 16:38:42 +09:00
  01f6199c49
• Fix PP not display on profile overlay
  Dean Herbert · 2019-01-04 16:33:35 +09:00
  4a7c6fb19d
• Fix global idle state being entered when overlays are visible
  Dean Herbert · 2019-01-04 16:26:10 +09:00
  4c2c7bd937
• 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
• Add preview for gameplay region
  Dean Herbert · 2019-01-04 15:28:35 +09:00
  3a10dd47d5
• Size -> scale
  Dean Herbert · 2019-01-04 14:58:44 +09:00
  9c7830d83b
• Delay updates when changes would affect mouse position
  Dean Herbert · 2019-01-04 14:55:59 +09:00
  35a6257642
• Add OSD support
  Dean Herbert · 2019-01-04 14:18:29 +09:00
  5a807f2143
• Add letterbox/screen scaling support
  Dean Herbert · 2019-01-04 13:36:02 +09:00
  3953f829c8
• Merge branch 'master' into do_not_use_local_user_for_autoplay_score
  Dean Herbert · 2019-01-04 13:11:17 +09:00
  b6dc6c4a74
• Merge pull request #3994 from smoogipoo/limit-slider-length

  Add a maximum length for slider ticks to be generated

  Dean Herbert · 2019-01-03 19:38:02 +09:00
  2fc10cb2bd