13435 Commits

This Branch

This Branch

All Branches

• Merge pull request #2984 from peppy/fix-toolbar-ruleset-selector

  Fix toolbar ruleset selector breaking at main menu

  Dan Balasescu · 2018-07-10 15:31:03 +09:00
  5ad45b2d42
• Fix SongSelect binding to ruleset too early

  Causes music to stop playing while at main menu.

  Dean Herbert · 2018-07-10 01:29:24 +09:00
  9e59b4a8e2
• ToolbarMode* -> ToolbarRuleset*
  Dean Herbert · 2018-07-10 01:20:21 +09:00
  974c4f5185
• Update framework
  Dean Herbert · 2018-07-09 23:50:45 +09:00
  2018.709.0 abfebbddd9
• Merge pull request #2979 from peppy/fix-osd-fade-in

  Fix OSD fade-in not correctly debouncing

  Dean Herbert · 2018-07-09 19:19:09 +09:00
  472aed8c91
• Merge branch 'master' into fix-osd-fade-in
  Dean Herbert · 2018-07-09 19:10:57 +09:00
  1670f4fe31
• Merge pull request #2980 from peppy/fix-exit-race-condition

  Fix pressing escape too fast causing multiple exit attempts at song select

  Dean Herbert · 2018-07-09 19:10:41 +09:00
  37f0095ae5
• Merge branch 'master' into fix-exit-race-condition
  Dan Balasescu · 2018-07-09 19:02:37 +09:00
  ee4607c86e
• Merge pull request #2981 from peppy/fix-early-player-entry

  Fix being able to trigger player before carousel is ready

  Dan Balasescu · 2018-07-09 19:02:09 +09:00
  34db414672
• Fix being able to trigger player before carousel is ready

  Causes an eventual crash.

  Dean Herbert · 2018-07-09 18:43:20 +09:00
  49e94850b6
• Merge pull request #2978 from HoutarouOreki/removeAge

  Remove unused age display code

  Dean Herbert · 2018-07-09 18:17:12 +09:00
  ce0a7d7760
• Fix pressing escape too fast causing multiple exit attempts at song select
  Dean Herbert · 2018-07-09 18:12:23 +09:00
  09b3375a9d
• Fix OSD fade-in not correctly debouncing

  It could potentially never fade in on quick presses.

  Dean Herbert · 2018-07-09 17:53:39 +09:00
  df67c0498d
• Merge branch 'master' into removeAge
  Dean Herbert · 2018-07-09 17:43:23 +09:00
  6ced51bb67
• Merge pull request #2977 from smoogipoo/fix-nullrefs

  Fix some possible null reference exceptions

  Dean Herbert · 2018-07-09 17:43:01 +09:00
  10cc95427d
• Remove age from User class
  HoutarouOreki · 2018-07-09 10:33:46 +02:00
  10aae3b0ee
• Remove unused age display code
  HoutarouOreki · 2018-07-09 10:12:10 +02:00
  930667d0f9
• Fix some possible null reference exceptions
  smoogipoo · 2018-07-09 17:09:17 +09:00
  0a67e5a274
• Merge pull request #1 from ppy/master

  Sync to upstream repo

  Jarosław Zgierski · 2018-07-09 09:07:59 +02:00
  1444715641
• Update nuget restore instructions
  Dean Herbert · 2018-07-08 11:21:18 +09:00
  27311ce1fc
• Update README.md
  Dean Herbert · 2018-07-08 02:03:42 +09:00
  f92a90c098
• Merge pull request #2876 from smoogipoo/more-mania-conversion-fixes

  Fix more instances of osu!mania beatmap conversion failing

  Dean Herbert · 2018-07-08 01:54:59 +09:00
  c194618df3
• Merge branch 'master' into more-mania-conversion-fixes
  Dean Herbert · 2018-07-08 01:44:06 +09:00
  ad51d95c1a
• Merge pull request #2933 from ekrctb/fix-menu-cursor-animation

  Fix menu cursor not highlighting when pressing multiple buttons

  Dean Herbert · 2018-07-06 17:56:38 +09:00
  d1846e6128
• Merge branch 'master' into fix-menu-cursor-animation
  Dean Herbert · 2018-07-06 17:46:29 +09:00
  c4952569cc
• Remove casting
  Dean Herbert · 2018-07-06 17:45:39 +09:00
  54db287791
• Merge pull request #2946 from peppy/go-forward

  Add "Select" action

  Dean Herbert · 2018-07-06 16:48:37 +09:00
  a300b5c924
• Merge branch 'master' into go-forward
  Dan Balasescu · 2018-07-06 14:29:26 +09:00
  8f3f872182
• Fix incorrect default drain time
  Dan Balasescu · 2018-07-06 13:29:40 +09:00
  a1d2092cc9
• Merge branch 'master' into more-mania-conversion-fixes
  Dan Balasescu · 2018-07-06 13:29:16 +09:00
  290812cf65
• Merge pull request #2964 from johnneijzen/JSON-format-fix

  Remove extra commas in vscode build configuration

  Dean Herbert · 2018-07-06 13:20:38 +09:00
  7da5a2fec9
• Merge branch 'master' into JSON-format-fix
  Dean Herbert · 2018-07-06 11:41:28 +09:00
  56196885e6
• Merge branch 'master' into fix-menu-cursor-animation
  Dean Herbert · 2018-07-06 11:29:53 +09:00
  dffe6af5d9
• Remove extra , make this valid JSON file
  John Neijzen · 2018-07-05 22:38:34 +08:00
  7a09108387
• Merge pull request #2890 from ekrctb/fix-volme-meter

  Update volume controls to use mouse wheel actions

  Dean Herbert · 2018-07-05 22:59:50 +09:00
  2018.705.0 fa6ffe9a34
• Update framework
  Dean Herbert · 2018-07-05 21:08:53 +09:00
  7e28a993f7
• Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
  Dean Herbert · 2018-07-05 21:04:19 +09:00
  e5001b84bd
• Merge branch 'master' into fix-menu-cursor-animation
  Dean Herbert · 2018-07-05 21:04:06 +09:00
  5f5790f566
• Merge pull request #2929 from smoogipoo/hitobject-samples

  Add support for HitObject level custom samples

  Dean Herbert · 2018-07-05 20:28:07 +09:00
  6ae342d1a0
• Add missing xmldoc
  Dean Herbert · 2018-07-05 20:16:55 +09:00
  8f04acc506
• Merge branch 'master' into hitobject-samples
  Dean Herbert · 2018-07-05 19:43:19 +09:00
  4f894969df
• Merge pull request #2867 from LastExceed/fix-BASS-not-being-loaded-on-linux

  Hint bass library path when running from vscode on linux

  Dean Herbert · 2018-07-05 19:41:41 +09:00
  f5b275bc0b
• Merge remote-tracking branch 'upstream/master' into LastExceed-fix-BASS-not-being-loaded-on-linux
  Dean Herbert · 2018-07-05 19:30:01 +09:00
  d825eec364
• Remove LD_PRELOAD as it is now unnecessary
  Dean Herbert · 2018-07-05 19:29:49 +09:00
  7328121ef5
• Merge pull request #2908 from smoogipoo/legacy-custom-banks

  Add support for multiple sample banks

  Dean Herbert · 2018-07-05 19:14:21 +09:00
  ef5fa978c7
• Apply renaming of wheel -> scroll
  ekrctb · 2018-07-05 16:50:04 +09:00
  bbceac6cda
• Rename method to EquivalentTo
  Dean Herbert · 2018-07-05 15:00:02 +09:00
  44aecdc3a0
• Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
  Dean Herbert · 2018-07-05 14:53:31 +09:00
  d11ba2df0e
• Merge pull request #2942 from Joehuu/fix-footer-clicking-area

  Fix FooterButton clicking area

  Dan Balasescu · 2018-07-05 14:03:04 +09:00
  dd7ed7d42e
• Merge branch 'master' into fix-footer-clicking-area
  Dean Herbert · 2018-07-05 13:39:53 +09:00
  aea1299762