13414 Commits

This Branch

This Branch

All Branches

• 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
• Merge pull request #2947 from peppy/fix-popup-dialog-regression

  Fix selecting a button on a dialog causing both that button and exit to animate

  Dan Balasescu · 2018-07-04 12:04:56 +09:00
  b02603000e
• Merge branch 'master' into fix-popup-dialog-regression
  Dan Balasescu · 2018-07-04 11:15:18 +09:00
  7a4d3f9ffa
• Merge pull request #2931 from smoogipoo/non-null-nestedobjects

  Tidy up lookups to nested hitobjects

  Dean Herbert · 2018-07-03 19:59:00 +09:00
  8ecd235820
• Merge branch 'master' into non-null-nestedobjects
  Dean Herbert · 2018-07-03 19:43:46 +09:00
  1e1ff8339e
• Add "Select" action

  Allows progressing forwards in the interface

  Dean Herbert · 2018-07-03 18:39:15 +09:00
  5fc17bacf3
• Fix selecting a button on a dialog causing both that button and exit to animate
  Dean Herbert · 2018-07-03 18:35:09 +09:00
  b33206c212
• Merge pull request #2944 from smoogipoo/fix-beatmap-deserialisation

  Fix beatmap details not loading for unranked beatmaps

  Dean Herbert · 2018-07-03 16:06:46 +09:00
  5f33ab579e
• Fix beatmap details not working for unranked beatmaps
  smoogipoo · 2018-07-03 15:57:05 +09:00
  73851fb194
• Modify MenuCursor hightlight animation
  ekrctb · 2018-07-03 15:15:03 +09:00
  f9f192ce34
• Fix FooterButton clicking area
  Joehu · 2018-07-02 22:03:17 -07:00
  d476842c44
• Merge pull request #2932 from ekrctb/fix-menu-cursor-crash

  Fix MenuCursor assertion failure when multiple mouse buttons pressed

  Dean Herbert · 2018-07-02 21:29:00 +09:00
  2018.702.0 e37b931a55
• Merge branch 'master' into fix-menu-cursor-crash
  Dean Herbert · 2018-07-02 18:09:11 +09:00
  627a5deff9
• Merge pull request #2928 from peppy/fix-dialog-popups

  Standardise input handling of popup dialogs

  Dan Balasescu · 2018-07-02 18:09:02 +09:00
  908f555a64
• Add comment about last button invocation
  Dean Herbert · 2018-07-02 17:48:16 +09:00
  6c848f135c
• Merge branch 'master' into fix-dialog-popups
  Dan Balasescu · 2018-07-02 17:41:16 +09:00
  e99c05c85e
• Merge pull request #2690 from peppy/add-scroll-speed-keybinds

  Add key bindings for scroll speed

  Dan Balasescu · 2018-07-02 17:40:16 +09:00
  8f6ec0e7b1
• Merge branch 'master' into add-scroll-speed-keybinds
  Dan Balasescu · 2018-07-02 17:26:05 +09:00
  6abb3fa62c
• Merge pull request #2924 from peppy/fix-leaderboard-placeholder

  Fix leaderboard showing placeholder briefly when entering song select

  Dan Balasescu · 2018-07-02 17:25:31 +09:00
  0123c76b3d
• Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds

  # Conflicts:
  #	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs

  smoogipoo · 2018-07-02 17:21:18 +09:00
  f0ec117bcb
• Merge branch 'master' into fix-leaderboard-placeholder
  Dan Balasescu · 2018-07-02 17:17:40 +09:00
  118366303c
• Merge pull request #2934 from smoogipoo/fix-skin-crash

  Fix crash if the skin stored in the config doesn't exist anymore

  Dean Herbert · 2018-07-02 17:07:47 +09:00
  7c5ad43d22