10296 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into update-taiko-hitsounds
  Dan Balasescu · 2018-02-01 14:05:19 +09:00
  c8ccd3cfbf
• Merge pull request #1993 from smoogipoo/better-slider-objects

  Make slider tails count towards the slider's judgement

  Dean Herbert · 2018-02-01 13:14:38 +09:00
  080ed66f99
• Merge branch 'master' into better-slider-objects
  Dean Herbert · 2018-02-01 08:39:39 +09:00
  cd37be9440
• Merge pull request #1980 from smoogipoo/fix-taiko-fastforwarding

  Fix taiko and mania missing when fastforwarding replays

  Dean Herbert · 2018-01-31 18:55:33 +09:00
  f78fbc32f4
• Merge branch 'master' into fix-taiko-fastforwarding
  Dean Herbert · 2018-01-31 18:30:41 +09:00
  46a7de1845
• Merge pull request #1921 from aQaTL/mute-toggle

  Ability to mute the game using F4 (or button on volume control)

  Dean Herbert · 2018-01-31 18:30:31 +09:00
  ef6adb0c27
• Merge branch 'master' into fix-taiko-fastforwarding
  Dean Herbert · 2018-01-31 18:30:15 +09:00
  888d2362fd
• Revert "Add volume ducking"

  This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.

  Dean Herbert · 2018-01-31 18:12:25 +09:00
  fef69cea04
• Fix mute button not prolonging volume control display
  Dean Herbert · 2018-01-31 18:00:44 +09:00
  47b92f3d1d
• Fix button alignment and animation
  Dean Herbert · 2018-01-31 17:36:53 +09:00
  93ffa1f8a2
• Add inactive volume ducking, rather than outright mute
  Dean Herbert · 2018-01-31 16:57:26 +09:00
  86f5c9d6f1
• Remove outwards exposure of mute property
  Dean Herbert · 2018-01-31 16:56:26 +09:00
  97ae44f23c
• Replace missed hardcoded int with enum reference
  Dean Herbert · 2018-01-31 16:20:01 +09:00
  2865dd3a10
• Remove unnecessary arrays
  Dean Herbert · 2018-01-31 16:10:55 +09:00
  5a99651561
• Add migration to ensure database aligns to changed enum
  Dean Herbert · 2018-01-31 16:10:48 +09:00
  042a34e1c2
• Merge remote-tracking branch 'upstream/master' into mute-toggle
  Dean Herbert · 2018-01-31 14:20:15 +09:00
  b47061f43d
• 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
• Update taiko hitsounds (courtesey of cYsmix)
  Dean Herbert · 2018-01-30 18:23:25 +09:00
  9b4546bdc4
• Fix failing testcase
  smoogipoo · 2018-01-30 18:22:40 +09:00
  58cdb59a27
• Better judgement visualisations in testcase
  smoogipoo · 2018-01-30 18:10:14 +09:00
  00001364c3
• Properly construct slider ends using HitObject.AddNested
  smoogipoo · 2018-01-30 16:53:19 +09:00
  cd4a0612c0
• Add hit/miss display to TestCaseSlider
  smoogipoo · 2018-01-30 16:45:48 +09:00
  4b63d25871
• Simplify condition
  smoogipoo · 2018-01-30 16:28:38 +09:00
  27357e100a
• Give Slider a tail hitobject to make slider ends counts towards score
  smoogipoo · 2018-01-30 16:28:14 +09:00
  702c4efb88
• Construct the head of sliders from Slider
  smoogipoo · 2018-01-30 15:50:48 +09:00
  b293408147
• Post-process beatmap before applying defaults
  smoogipoo · 2018-01-30 15:49:55 +09:00
  c97ea3ed60
• 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