10259 Commits

This Branch

This Branch

All Branches

• Remove empty line
  Dean Herbert · 2018-01-31 18:33:18 +09:00
  cdf4d9b033
• Add the ability to duck volume when the game is inactive
  Dean Herbert · 2018-01-31 18:16:55 +09:00
  335f0d577c
• Merge pull request #1944 from ThePyrotechnic/restart-crashfix

  Fixed holding retry hotkey at end of map causing hard crash

  Dean Herbert · 2018-01-30 18:40:09 +09:00
  340412e470
• Merge branch 'master'

  Conflicts:
  	osu-framework
  	osu.Game/Screens/Play/Player.cs

  Dean Herbert · 2018-01-30 18:31:03 +09:00
  df65443f07
• Merge pull request #1992 from smoogipoo/rename-inputmanager

  Rename "InputManager" to "Container" where keybindings are involved

  Dean Herbert · 2018-01-30 15:02:17 +09:00
  749fb29445
• GlobalKeyBindingContainer -> GlobalActionContainer

  Consitent with "FrameworkActionContainer".

  smoogipoo · 2018-01-30 14:54:30 +09:00
  b4cd8ea716
• InputManager -> Container where KeyBindings are involved
  smoogipoo · 2018-01-30 14:49:12 +09:00
  ef3fb8c05a
• Merge pull request #1983 from peppy/global-mod-binding

  Remember mod selection when re-entering song select

  Dean Herbert · 2018-01-29 15:26:48 +09:00
  445af2ba7a
• Merge branch 'master' into global-mod-binding
  Dan Balasescu · 2018-01-29 15:18:11 +09:00
  2bae22999d
• Merge pull request #1991 from peppy/update-framework

  Update framework

  Dan Balasescu · 2018-01-29 15:18:01 +09:00
  188fc1e6c2
• Remove redundant arguments
  Dean Herbert · 2018-01-29 15:05:07 +09:00
  6e0cb1adb3
• Merge branch 'master' into global-mod-binding
  Dan Balasescu · 2018-01-29 15:04:20 +09:00
  ea0ef96557
• Update framework
  Dean Herbert · 2018-01-29 15:03:19 +09:00
  fc11cac5a0
• Merge pull request #1984 from FreezyLemon/add-r#-annotation-support

  Add JetBrains.Annotations NuGet package

  Dean Herbert · 2018-01-29 14:07:17 +09:00
  c38f06fd61
• Update framework
  Dean Herbert · 2018-01-29 13:53:35 +09:00
  b789db3a1e
• Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
  Dean Herbert · 2018-01-29 13:52:21 +09:00
  0879366a30
• Merge pull request #1986 from peppy/fix-csproj-case

  Fix incorrect case on migration file

  Dan Balasescu · 2018-01-28 08:59:11 +09:00
  cb939d5370
• Fix incorrect case on migration file
  Dean Herbert · 2018-01-27 23:20:49 +09:00
  247833174c
• make all line endings CR LF (windows style)
  FreezyLemon · 2018-01-26 12:46:58 +01:00
  cff3f25cd7
• Add Jetbrains.Annotations NuGet package
  FreezyLemon · 2018-01-26 12:46:28 +01:00
  8f0ab2040f
• Remember mod selection when re-entering song select

  Removes mod application when exiting back to main menu.
  
  Alternative to #1968.
  Closes #1961.

  Dean Herbert · 2018-01-26 19:32:57 +09:00
  7852015db3
• Merge pull request #1929 from smoogipoo/ruleset-configs

  Implement ruleset-specific config managers and attach them to the global OnScreenDisplay

  Dean Herbert · 2018-01-26 17:54:38 +09:00
  changelog-20180128 v2018.127.0 545a4bd082
• Merge branch 'master' into ruleset-configs
  Dean Herbert · 2018-01-26 17:03:38 +09:00
  5bb547530b
• Merge pull request #1953 from Aergwyn/fix-repeats-appearing-early

  Fix RepeatPoint animations

  Dan Balasescu · 2018-01-26 16:41:28 +09:00
  14092006ef
• Merge branch 'master' into fix-repeats-appearing-early
  Dan Balasescu · 2018-01-26 15:45:20 +09:00
  755ae9802c
• Update resources
  smoogipoo · 2018-01-26 15:39:37 +09:00
  1ab2a4075f
• Merge remote-tracking branch 'origin/master' into ruleset-configs
  smoogipoo · 2018-01-26 15:39:09 +09:00
  5742e61e68
• Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs
  smoogipoo · 2018-01-26 15:37:57 +09:00
  929a710dfc
• Make field readonly
  Dan Balasescu · 2018-01-26 15:17:56 +09:00
  81c759f1e1
• Update framework again
  Dean Herbert · 2018-01-26 15:02:55 +09:00
  db58e4dbfe
• Fix a couple of regressions
  Dean Herbert · 2018-01-26 08:21:09 +09:00
  7a2420ead2
• Update framework
  Dean Herbert · 2018-01-26 07:39:03 +09:00
  3b9318e894
• Fix incorrect initial migration

  Also adds variant to settings

  Dean Herbert · 2018-01-25 23:41:03 +09:00
  03154dbc63
• Remove ManiaPlayfield local scrollTime bindable

  Now not needed due to having this databased.

  smoogipoo · 2018-01-25 20:49:25 +09:00
  45e8a2b69b
• Revert "Remove game-wise settings store for the time being"

  This reverts commit 72df2c681b.

  Dean Herbert · 2018-01-25 18:08:50 +09:00
  80b8780f56
• Update framework
  Dean Herbert · 2018-01-25 17:55:41 +09:00
  c2a58223c5
• Merge pull request #1975 from peppy/new-hitsounds

  Add new default hitsounds (thanks to cYsmix)

  Dan Balasescu · 2018-01-25 11:32:57 +09:00
  08ffd886e3
• Add new default hitsounds

  Getting these in for more widespread feedback.

  Dean Herbert · 2018-01-25 10:21:52 +09:00
  794d82d83f
• Merge pull request #1973 from UselessToucan/MakeMusicControllerDraggableAgain

  Make MusicController draggable again

  Dean Herbert · 2018-01-25 09:18:07 +09:00
  59f62ad8cf
• Merge branch 'master' into MakeMusicControllerDraggableAgain
  Dean Herbert · 2018-01-25 09:01:54 +09:00
  fd7d7c3953
• Merge pull request #1965 from Aergwyn/fix-settings

  Fix settings button

  Dean Herbert · 2018-01-25 08:54:19 +09:00
  b3b4e04950
• Merge branch 'master' into fix-settings
  Dean Herbert · 2018-01-25 07:17:21 +09:00
  b06f60ac3f
• Merge pull request #1950 from ThePyrotechnic/local-name-fix

  Use obtained value for displayed name.

  Dean Herbert · 2018-01-25 07:05:21 +09:00
  d08e8b0c97
• Merge branch 'master' into local-name-fix
  Dean Herbert · 2018-01-25 06:50:28 +09:00
  284ff226b1
• Make MusicController draggable again
  TocoToucan · 2018-01-25 00:38:22 +03:00
  51e188401f
• Merge branch 'master' into fix-settings
  Dean Herbert · 2018-01-25 01:21:41 +09:00
  df43b7d84e
• Merge pull request #1972 from smoogipoo/mania-stage-sounds

  Make mania play the next note's sounds if no note is hit

  Dean Herbert · 2018-01-25 01:21:31 +09:00
  a9cf9ec5bb
• Merge branch 'master' into fix-settings
  Dean Herbert · 2018-01-25 01:19:44 +09:00
  1e80908022
• Make mania play the next note's sounds if no note is hit

  Fixes #1911.
  
  This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.

  smoogipoo · 2018-01-24 20:05:37 +09:00
  b77f08941c
• Merge pull request #1898 from UselessToucan/RefactorPlayerOverlaysInitialization

  Do not assign hudOverlay's and breakOverlay's members in Player class

  Dan Balasescu · 2018-01-24 18:31:24 +09:00
  3a7f20e530