10197 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-repeats-appearing-early
  Dan Balasescu · 2018-01-26 15:45:20 +09:00
  755ae9802c
• 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
• Update framework
  smoogipoo · 2018-01-24 17:59:27 +09:00
  49e61b5658
• Minor cleanups
  smoogipoo · 2018-01-24 17:48:42 +09:00
  8d11596b2f
• review changes

  - use doubles instead of floats
  - simplify logic

  Aergwyn · 2018-01-24 09:44:50 +01:00
  52c4d22c41
• Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization
  smoogipoo · 2018-01-24 17:44:28 +09:00
  7f299b2533
• Merge pull request #1959 from james58899/fix-sb-path

  Fix storyboard using incorrect path separator

  Dan Balasescu · 2018-01-24 15:29:08 +09:00
  4aeb5271d4
• fix settings not getting injected
  Aergwyn · 2018-01-23 19:42:21 +01:00
  205d3ed896
• Merge branch 'local-name-fix' of https://github.com/ThePyrotechnic/osu into local-name-fix
  Michael Manis · 2018-01-23 10:59:23 -05:00
  60078e962a
• Unnecessary because of prior commit.
  Michael Manis · 2018-01-23 10:55:22 -05:00
  6dfd0b5cc2
• merged with master
  Michael Manis · 2018-01-23 10:50:57 -05:00
  d12e18d59b
• fix oversight
  Aergwyn · 2018-01-23 16:44:33 +01:00
  4baadfdd16
• fix storyboard path
  james58899 · 2018-01-23 18:18:54 +08:00
  fa800f0977
• Updated submodule osu-framework
  Aergwyn · 2018-01-23 09:09:19 +01:00
  2c0dd1815c
• Merge branch 'master' into fix-repeats-appearing-early
  Aergwyn · 2018-01-23 09:04:45 +01:00
  24b7d91f5b
• Merge pull request #1957 from smoogipoo/fix-repeat-confusion

  Clean up off-by-one offsets from repeat-related properties

  Dean Herbert · 2018-01-23 16:14:59 +09:00
  098cfa7107
• Merge branch 'master' into fix-repeat-confusion
  Dean Herbert · 2018-01-23 16:06:07 +09:00
  384dc162b3
• Merge pull request #1956 from peppy/allow-quick-retry-key

  Allow user choice of the quick retry hotkey

  Dean Herbert · 2018-01-23 15:58:48 +09:00
  68161fa543
• Merge branch 'master' into fix-repeat-confusion
  Dean Herbert · 2018-01-23 15:22:37 +09:00
  52805cd82b
• Merge branch 'master' into allow-quick-retry-key
  Dan Balasescu · 2018-01-23 14:59:15 +09:00
  fcea12f83d
• Merge pull request #1945 from smoogipoo/bdl-cache-changes

  Update usage of DI in-line with framework changes

  Dean Herbert · 2018-01-23 14:31:05 +09:00
  0edcf1690b
• Update framework
  Dean Herbert · 2018-01-23 14:10:51 +09:00
  2a9b773b49
• Merge branch 'master' into bdl-cache-changes
  Dean Herbert · 2018-01-23 14:10:35 +09:00
  b793c2ec93
• Fix off-by-ones in RepeatPoint code
  smoogipoo · 2018-01-23 13:58:43 +09:00
  33c52ba30f
• Clean up off-by-one offsets from repeat-related properties
  smoogipoo · 2018-01-23 13:37:25 +09:00
  d37844c068
• Remove usings
  Dean Herbert · 2018-01-23 13:24:04 +09:00
  fa1f4304f6
• Allow user choice of the quick retry hotkey
  Dean Herbert · 2018-01-23 13:05:07 +09:00
  f823650b10
• Merge pull request #1908 from andy840119/mania_stage_fix

  Split the playfield columns and change the key number by mod

  Dean Herbert · 2018-01-23 11:03:56 +09:00
  4f360eac56
• Merge branch 'master' into mania_stage_fix
  Dean Herbert · 2018-01-23 10:55:33 +09:00
  b799dac5ac
• Back to max 10 special keys for now, change xmldoc to normal comment
  Dan Balasescu · 2018-01-23 10:51:01 +09:00
  9b471dea33
• Improve xmldoc + remove explicit Special2 value

  Special2 value is implicit at Special1 + 1 (2).

  Dan Balasescu · 2018-01-23 10:03:34 +09:00
  2bc67629b8
• Merge pull request #1955 from fangerm/license-year

  Update license year

  Dan Balasescu · 2018-01-23 09:36:58 +09:00
  8f4d62ec25
• Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
  Felix Ang · 2018-01-22 18:42:03 +01:00
  d294fcfb0b
• Update license year.
  Felix Ang · 2018-01-22 18:22:38 +01:00
  423559ec6c
• Merge branch 'master' into local-name-fix
  ThePyrotechnic · 2018-01-22 09:59:45 -05:00
  4022af6a59
• remove unnecessary variable
  Aergwyn · 2018-01-22 12:44:55 +01:00
  b726f90c37
• fix RepeatPoint animations

  - FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
  - TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time

  Aergwyn · 2018-01-22 12:36:38 +01:00
  66176f2882