9806 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into expand-social-tab
  Dean Herbert · 2018-01-12 15:54:42 +09:00
  8f7c048c4e
• Merge pull request #1881 from james58899/fix-background-dim

  Fix background dim not being applied correctly

  Dean Herbert · 2018-01-12 15:53:26 +09:00
  ee23c33422
• keep BlurTo
  james58899 · 2018-01-12 14:24:42 +08:00
  f83c84a0a6
• useless using
  james58899 · 2018-01-12 12:39:32 +08:00
  61c8fd4ab9
• fix background dim
  james58899 · 2018-01-12 12:21:37 +08:00
  1985e5bdb2
• 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
• if not storyboard file
  james58899 · 2018-01-11 13:53:41 +08:00
  4fa038aa27
• enable query

  change Avatar animation too
  add forgotten usings

  Aergwyn · 2018-01-10 16:46:55 +01:00
  312f52072b
• fix load storyboard in osu file
  james58899 · 2018-01-10 18:55:04 +08:00
  fbffc8bb89
• 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 expand-social-tab
  Dean Herbert · 2018-01-10 11:52:08 +09:00
  1a37812d1f
• 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
• remove unnecessary Schedules

  one was bugging out when rapidly switching display styles and the other was... unnecessary

  Aergwyn · 2018-01-09 19:03:23 +01:00
  4ce125478a
• tidying up
  Aergwyn · 2018-01-09 16:29:12 +01:00
  44d821172a
• 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 expand-social-tab
  Dean Herbert · 2018-01-09 21:08:26 +09:00
  1c9e9cb8af
• 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
• Merge pull request #1819 from LittleEndu/fix-randomizer

  Don't allow randomizer to select invisible maps

  Dean Herbert · 2018-01-09 12:52:25 +09:00
  bb57d33239
• Improve variable names
  Dean Herbert · 2018-01-09 12:44:52 +09:00
  722eb2515f
• Avoid unnecessary use of linq
  Dean Herbert · 2018-01-09 12:43:10 +09:00
  a3f05ca9ec
• Merge branch 'master' into fix-randomizer
  Dean Herbert · 2018-01-09 12:00:21 +09:00
  b90b1e326e
• Merge pull request #1854 from james58899/fix-storyboard-variables

  Fix storyboard variable parsing

  Dean Herbert · 2018-01-09 11:59:53 +09:00
  cab702cc94
• Merge branch 'master' into fix-storyboard-variables
  Dean Herbert · 2018-01-09 11:50:03 +09:00
  4c0259a040
• Merge pull request #1869 from Aergwyn/ingame-keybinds

  Add skip cutscene as "in game" keybinding

  Dean Herbert · 2018-01-09 11:49:32 +09:00
  e7f9c9f22b
• add skip cutscene as "in game" keybinding
  Aergwyn · 2018-01-08 18:22:43 +01:00
  f6c168be27
• Merge pull request #1858 from Aergwyn/fix-leaderboard-requests

  Fix Leaderboard loading scores multiple times

  Dean Herbert · 2018-01-08 20:30:34 +09:00
  805e91c625
• Merge branch 'master' into fix-leaderboard-requests
  Dean Herbert · 2018-01-08 20:21:18 +09:00
  22665337a5
• Merge branch 'master' into fix-dotsettings-file
  Dean Herbert · 2018-01-08 20:18:24 +09:00
  8fe319286f