9813 Commits

This Branch

This Branch

All Branches

• Add some comments
  smoogipoo · 2018-01-12 13:06:17 +09:00
  4b2d971b00
• Revert "Add OSD + config value for scroll speed"

  This reverts commit a6d8b28221.

  smoogipoo · 2018-01-12 12:28:43 +09:00
  712d586d41
• Remove scale from all but palpable fruit
  Dean Herbert · 2018-01-11 22:36:21 +09:00
  e5f17e3ddb
• Update framework
  Dean Herbert · 2018-01-11 21:12:27 +09:00
  61062164cb
• Fix up DrawableJuiceStream/BananaShower

  (cherry picked from commit 0bfb3b6)

  Dean Herbert · 2018-01-11 20:56:09 +09:00
  0609fc40de
• Change anchors in line with new ScrollingPlayfield implementation

  (cherry picked from commit 079827d)

  Dean Herbert · 2018-01-11 20:55:43 +09:00
  66ebe2ee66
• Use correct container type when removing fruit

  (cherry picked from commit a2be7f7)

  Dean Herbert · 2018-01-11 20:55:25 +09:00
  5b190d3cd2
• Merge remote-tracking branch 'upstream/master' into scrolling-hitobjects-rewrite
  Dean Herbert · 2018-01-11 20:38:48 +09:00
  abcfe08f8d
• Merge pull request #1877 from smoogipoo/overlaycontainer-mouse-block

  Allow mouse wheel to change volume in overlays

  Dean Herbert · 2018-01-11 20:28:39 +09:00
  f6e6701749
• Update framework
  Dean Herbert · 2018-01-11 20:18:46 +09:00
  35c3ee261d
• Make VolumeControlReceptor handle global input

  Fixes volume not being able to be changed in dead areas of OverlayContainers.

  smoogipoo · 2018-01-11 19:03:31 +09:00
  5cfb2c2ffe
• OverlayContainer changes in-line with framework
  smoogipoo · 2018-01-11 19:03:01 +09:00
  c5c33e20bf
• Merge pull request #1875 from james58899/fix-storyboard

  Fix Storyboard not load in osu file

  Dan Balasescu · 2018-01-11 17:10:00 +09:00
  2a983efe0a
• Remove extra braces
  Dan Balasescu · 2018-01-11 17:02:09 +09:00
  86581b6451
• Move back to using load(), fix testcase
  smoogipoo · 2018-01-11 16:51:46 +09:00
  ab762045d6
• Fix testcase errors
  smoogipoo · 2018-01-11 15:50:44 +09:00
  d998936e9e
• Optimise nested hitobject position computations
  smoogipoo · 2018-01-11 15:25:15 +09:00
  9ae67b519b
• Fix up license header
  smoogipoo · 2018-01-11 15:08:56 +09:00
  428f8b6670
• Make ScrollingHitObjectContainer handle nested hitobjects
  smoogipoo · 2018-01-11 15:08:30 +09:00
  9d00e5bb7d
• if not storyboard file
  james58899 · 2018-01-11 13:53:41 +08:00
  4fa038aa27
• Add OSD + config value for scroll speed
  smoogipoo · 2018-01-11 13:40:46 +09:00
  a6d8b28221
• Add a flag to disable user scroll speed adjustments
  smoogipoo · 2018-01-11 12:44:39 +09:00
  3a869edf36
• Fix license headers
  smoogipoo · 2018-01-11 12:39:06 +09:00
  6a5a3b01b2
• fix load storyboard in osu file
  james58899 · 2018-01-10 18:55:04 +08:00
  fbffc8bb89
• Per-hitobject lifetime management
  smoogipoo · 2018-01-10 19:17:43 +09:00
  6255aaab68
• Run child updates for nested hitobjects when parent hitobjects are masked
  smoogipoo · 2018-01-10 18:29:46 +09:00
  9036ea92eb
• Fix post-merge issues
  smoogipoo · 2018-01-10 18:08:43 +09:00
  f71d086a41
• Update submodules
  smoogipoo · 2018-01-10 18:04:12 +09:00
  1c412e233a
• Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
  smoogipoo · 2018-01-10 18:02:49 +09:00
  86b5591583
• Merge pull request #1873 from peppy/rulesetinfo-refactor

  Allow rulesets to create their own instantiation info

  Dean Herbert · 2018-01-10 17:34:01 +09:00
  5b6ddb984f
• Allow rulesets to create their own instantiation info
  Dean Herbert · 2018-01-10 17:04:07 +09:00
  58626e3b30
• Merge pull request #1754 from ColdVolcano/background-blur

  Add setting to adjust background blur level during gameplay

  Dean Herbert · 2018-01-10 13:50:08 +09:00
  fe7ce26b84
• Merge remote-tracking branch 'upstream/master' into background-blur
  Dean Herbert · 2018-01-10 13:38:53 +09:00
  338eaad0e5
• Merge pull request #1853 from peppy/drop-fruit

  Drop fruit when last in combo is not caught

  Dan Balasescu · 2018-01-10 13:35:18 +09:00
  4f8ce272ae
• Ensure changes are only applied when we are the current screen
  Dean Herbert · 2018-01-10 13:24:26 +09:00
  9ec8f130a6
• Merge branch 'master' into drop-fruit
  Dean Herbert · 2018-01-10 12:29:53 +09:00
  1c20fba6bc
• Merge pull request #1852 from peppy/fix-catcher-width

  Fix catcher width and playfield scaling

  Dan Balasescu · 2018-01-10 12:19:37 +09:00
  632e6fcdd3
• Merge branch 'master' into drop-fruit
  Dean Herbert · 2018-01-10 11:39:46 +09:00
  32e237d138
• Merge branch 'master' into fix-catcher-width
  Dean Herbert · 2018-01-10 10:04:10 +09:00
  9d099feadc
• Merge pull request #1864 from peppy/fix-dotsettings-file

  FIx incorrect licence header template

  Dean Herbert · 2018-01-10 09:45:15 +09:00
  77276e3e8e
• Merge branch 'master' into fix-dotsettings-file
  Dan Balasescu · 2018-01-10 09:35:49 +09:00
  9afd823d6e
• Merge pull request #1848 from peppy/drawable-fruit-improvements

  Improvements to osu!catch visuals

  Dan Balasescu · 2018-01-10 09:34:49 +09:00
  d0fd7fe1f4
• Fix incorrect licence header
  Dean Herbert · 2018-01-09 22:24:12 +09:00
  c4490b5fe8
• Simplify logic
  Dean Herbert · 2018-01-09 22:21:15 +09:00
  fcb197f7b6
• Merge branch 'master' into drawable-fruit-improvements
  Dan Balasescu · 2018-01-09 22:06:16 +09:00
  9c602f8770
• Denote unused variable
  Dean Herbert · 2018-01-09 21:34:31 +09:00
  2518d16a77
• Merge branch 'master' into background-blur
  Dean Herbert · 2018-01-09 21:20:05 +09:00
  c2fadcfc1f
• Merge branch 'master' into fix-dotsettings-file
  Dean Herbert · 2018-01-09 14:32:40 +09:00
  51513b45eb
• Merge pull request #1870 from peppy/mod-per-file

  Move mod implementations to individual files

  Dan Balasescu · 2018-01-09 14:30:51 +09:00
  96226e1f27
• Move mod implementations to individual files
  Dean Herbert · 2018-01-09 14:08:18 +09:00
  b8bb0a52e3