10240 Commits

This Branch

This Branch

All Branches

• Updated submodule osu-resources
  Aergwyn · 2018-01-31 10:46:03 +01:00
  41329052d9
• remove unwanted using
  Aergwyn · 2018-01-29 12:08:03 +01:00
  f6501e73e3
• update SliderTick calculation + more ticks in tests

  math is hard >_<

  Aergwyn · 2018-01-29 12:03:44 +01:00
  373b3871f9
• Merge branch 'master' into fix-ticks-appearing-late
  Dean Herbert · 2018-01-29 13:40:30 +09:00
  8425f3ee93
• 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
• 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 fix-ticks-appearing-late
  Aergwyn · 2018-01-26 09:07:33 +01:00
  b95719c23e
• 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
• fix SliderTicks appearing too late
  Aergwyn · 2018-01-25 10:52:03 +01:00
  214938b98d
• 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
• Remove unused code file
  Dean Herbert · 2018-01-24 18:04:54 +09:00
  53c6526b22
• Remove game-wise settings store for the time being
  Dean Herbert · 2018-01-24 18:01:39 +09:00
  72df2c681b
• Combine Setting and DatabasedSetting
  Dean Herbert · 2018-01-24 17:59:49 +09:00
  29e98a58f2
• Update framework
  smoogipoo · 2018-01-24 17:59:27 +09:00
  49e61b5658
• Minor cleanups
  smoogipoo · 2018-01-24 17:48:42 +09:00
  8d11596b2f
• Merge branch 'master' into ruleset-configs
  Dean Herbert · 2018-01-24 17:45:47 +09:00
  aa913f6de5
• Add database-based configuration for rulesets
  Dean Herbert · 2018-01-24 17:45:28 +09:00
  5a00ae36d1
• 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