14401 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into patch-2
  Paul Teng · 2018-09-20 06:47:42 -04:00
  199d76217e
• Merge pull request #3456 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-09-20 19:41:39 +09:00
  2018.920.0 7efaaceba5
• Merge branch 'master' into update-framework
  Dean Herbert · 2018-09-20 19:18:30 +09:00
  a28061d87a
• Merge pull request #3454 from smoogipoo/fix-fullscreen-crash

  Fix macOS crashing in fullscreen mode

  Dean Herbert · 2018-09-20 19:18:15 +09:00
  42e87b553e
• Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework
  Dean Herbert · 2018-09-20 19:03:49 +09:00
  aa453f8ff8
• Apply review
  Dean Herbert · 2018-09-20 19:01:04 +09:00
  1861547c86
• Merge remote-tracking branch 'upstream/master' into update-framework
  Dean Herbert · 2018-09-20 18:39:48 +09:00
  37f3035437
• Update framework reference
  Dean Herbert · 2018-09-20 18:39:44 +09:00
  5ee4130351
• Merge pull request #3458 from smoogipoo/fix-status-pill

  Cleanup + adjust display of beatmap status pill

  Dean Herbert · 2018-09-20 18:17:34 +09:00
  474f705309
• Cleanup
  smoogipoo · 2018-09-20 12:56:39 +09:00
  62135c39aa
• Hide status pill when status is none
  smoogipoo · 2018-09-20 12:53:45 +09:00
  04cd68f970
• Move text size/padding out of constructor
  smoogipoo · 2018-09-20 12:53:45 +09:00
  7b8094d731
• Merge branch 'update-framework-event-handling' into update-framework
  Dean Herbert · 2018-09-20 00:29:42 +09:00
  ae4c371bec
• Merge branch 'localisation-changes' into update-framework
  Dean Herbert · 2018-09-20 00:29:31 +09:00
  b2cf636ab5
• Fix macOS crashing in fullscreen mode
  smoogipoo · 2018-09-19 17:52:35 +09:00
  73fb3fa3a4
• Merge pull request #3452 from smoogipoo/fix-bufferedwedge-localisation

  Fix songselect wedge sometimes not updating when localisation changes

  Dean Herbert · 2018-09-19 15:31:14 +09:00
  0237153c27
• Fix song select wedge sometimes not updating when localisation changes
  smoogipoo · 2018-09-19 14:57:32 +09:00
  38a3c2a820
• Apply changes in-line with framework localisation changes
  smoogipoo · 2018-09-19 14:07:46 +09:00
  28f31540c4
• Use Click instead of now removed TriggerOnClick
  ekrctb · 2018-09-19 11:42:32 +09:00
  b790e16217
• Replace usage of now removed TriggerKeyPress and similar methods.
  ekrctb · 2018-09-19 11:36:55 +09:00
  a3e6973b41
• Use new InputStateChangeEvent for RulesetInputManager
  ekrctb · 2018-09-19 11:36:55 +09:00
  c8e9d9375f
• Merge pull request #3425 from LastExceed/close-chattabs-with-Mclick

  Close chat tabs with middle mouse button

  Dan Balasescu · 2018-09-18 15:45:46 +09:00
  492b5edb02
• Cleanup, use similar code to everywhere else
  Dan Balasescu · 2018-09-18 15:27:21 +09:00
  ad31962643
• only return true on Mclick
  LastExceed · 2018-09-18 08:07:19 +02:00
  27ea6102bc
• Merge branch 'master' into close-chattabs-with-Mclick
  Dan Balasescu · 2018-09-18 14:52:56 +09:00
  af6618a239
• Merge pull request #3420 from Aergwyn/add-rank-status

  Add rank status display in song select

  Dan Balasescu · 2018-09-18 14:23:21 +09:00
  008bafae45
• Merge branch 'master' into add-rank-status
  Dan Balasescu · 2018-09-18 14:10:42 +09:00
  d3bb78d139
• Merge pull request #3396 from peppy/music-controller-topmost

  Bring music controller in front of notification overlay

  Dan Balasescu · 2018-09-18 14:03:44 +09:00
  759633d4c8
• Merge branch 'master' into music-controller-topmost
  Dan Balasescu · 2018-09-18 13:56:13 +09:00
  9f1f879f3d
• Merge pull request #3424 from Hanamuke/fix_combo

  Fruit type now depends on combo (osu!catch)

  Dan Balasescu · 2018-09-18 13:17:52 +09:00
  3bd719072c
• Merge branch 'master' into fix_combo
  Dan Balasescu · 2018-09-18 12:54:51 +09:00
  29e023b252
• Cleanup
  smoogipoo · 2018-09-18 12:54:07 +09:00
  aba1de8b1a
• Handle directory checking before entering task
  Paul Teng · 2018-09-17 21:05:28 -04:00
  8bfd981a50
• Merge branch 'master' into patch-2
  Paul Teng · 2018-09-17 15:20:54 -04:00
  000beea01b
• Merge branch 'master' into close-chattabs-with-Mclick
  LastExceed · 2018-09-15 18:05:01 +02:00
  ed01f3067f
• return true since we are handling the action
  LastExceed · 2018-09-15 18:00:47 +02:00
  fce9740f28
• Merge pull request #3438 from peppy/fix-new-inspections

  Fix new resharper redundant parenthesis inspections

  Dean Herbert · 2018-09-16 00:16:39 +09:00
  b17bd6aaaa
• Fix new resharper redundant parenthesis inspections
  Dean Herbert · 2018-09-16 00:09:17 +09:00
  00d0613053
• Merge pull request #3435 from plankp/patch-1

  Make Transform and Wiggle incompatible with each other

  Dean Herbert · 2018-09-15 23:59:48 +09:00
  a34b0d67f8
• Reformat code
  Paul Teng · 2018-09-15 09:53:59 -04:00
  d469748612
• Catch directory not found exception
  Paul Teng · 2018-09-15 09:47:50 -04:00
  42b2c32222
• Revert "Check for skins folder also"

  This reverts commit eb86f9de5e.

  Paul Teng · 2018-09-15 09:33:31 -04:00
  75e6bbc4d8
• Check for skins folder also
  Paul Teng · 2018-09-15 09:28:19 -04:00
  eb86f9de5e
• Remove redundant explicit array type info
  Paul Teng · 2018-09-15 08:55:29 -04:00
  1a8665864c
• Make Wiggle incompatible with Transform
  Paul Teng · 2018-09-15 08:43:22 -04:00
  3e02a36938
• Make Transform incompatible with Wiggle
  Paul Teng · 2018-09-15 08:42:04 -04:00
  92c6b570ea
• Merge pull request #3423 from peppy/update-squirrel

  Bump squirrel version

  Dean Herbert · 2018-09-15 19:07:00 +09:00
  2018.915.0 8cb0b5e98d
• Update efcore packages
  Dean Herbert · 2018-09-15 18:49:01 +09:00
  6a1e2c6fa5
• Merge remote-tracking branch 'upstream/master' into update-squirrel
  Dean Herbert · 2018-09-15 18:45:19 +09:00
  39a6bcba17
• Merge pull request #3388 from peppy/fix-logo-overhead

  Fix osu! logo being present throughout the whole game

  Dean Herbert · 2018-09-15 18:44:12 +09:00
  9a88e09eb0