14035 Commits

This Branch

This Branch

All Branches

• Merge pull request #3267 from smoogipoo/fix-stacking

  Fix hitobject stacking being applied too early

  Dean Herbert · 2018-08-21 18:33:24 +09:00
  63b596f75a
• Add very simple stacking test
  smoogipoo · 2018-08-21 17:22:28 +09:00
  8b795cd52a
• Fix hitobject stacking being applied too early
  smoogipoo · 2018-08-21 16:01:28 +09:00
  d14dad64e8
• Merge pull request #3266 from smoogipoo/remove-override

  Remove sliderball's ReceiveMouseInput override

  Dean Herbert · 2018-08-21 13:04:04 +09:00
  1984ae6d0b
• Remove sliderball's input override
  smoogipoo · 2018-08-21 12:24:48 +09:00
  34b1abeca3
• Merge pull request #3172 from tgi74/relax

  Implement Relax mod

  Dan Balasescu · 2018-08-21 12:24:17 +09:00
  6d446e1502
• Merge branch 'master' into relax
  Dan Balasescu · 2018-08-21 12:11:10 +09:00
  c4264794e0
• Merge pull request #3265 from smoogipoo/storyboard-hotpath

  Slightly improve performance of beatmap/storyboard parsing

  Dean Herbert · 2018-08-21 12:10:37 +09:00
  9182302254
• Cleanup
  smoogipoo · 2018-08-21 12:10:00 +09:00
  fcf98390f5
• Use ordinal string comparison in hot paths
  smoogipoo · 2018-08-21 11:10:54 +09:00
  541c4daa81
• Merge pull request #3255 from peppy/catch-cancelled

  Catch OperationCanceledException in single file load sequence

  Dan Balasescu · 2018-08-21 10:32:08 +09:00
  a8b20b8b98
• Merge branch 'master' into catch-cancelled
  Dan Balasescu · 2018-08-21 10:24:11 +09:00
  1d50dacacd
• Merge pull request #3256 from peppy/fix-logo-flying

  Fix logo flying off-screen when exiting game

  Dan Balasescu · 2018-08-21 10:24:03 +09:00
  0711f30395
• Merge branch 'master' into fix-logo-flying
  Dan Balasescu · 2018-08-21 10:16:03 +09:00
  9d2c679f12
• Merge pull request #3262 from peppy/fix-mod-crash

  Fix crash when selecting mods after entering play mode

  Dan Balasescu · 2018-08-21 10:10:30 +09:00
  d921d50e11
• Merge branch 'master' into fix-mod-crash
  Dan Balasescu · 2018-08-21 10:00:48 +09:00
  9f985928f6
• Merge pull request #3263 from smoogipoo/fix-string-interp

  Fix missed string interpolation

  Dean Herbert · 2018-08-21 09:25:50 +09:00
  3551005071
• Fix missed string interpolation
  smoogipoo · 2018-08-21 09:17:44 +09:00
  da13266ae9
• Fix crash when selecting mods after entering play mode

  Closes #3260.

  Dean Herbert · 2018-08-21 00:15:51 +09:00
  4a68b14447
• Merge pull request #3258 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-08-20 18:43:30 +09:00
  2018.820.0 0501d58f70
• Update framework
  Dean Herbert · 2018-08-20 18:26:34 +09:00
  7add4a8cc7
• Expand out on to multiple lines
  Dean Herbert · 2018-08-20 16:06:12 +09:00
  295ccabf64
• Fix logo flying off-screen when exiting game
  Dean Herbert · 2018-08-20 14:58:02 +09:00
  39aa98d12d
• Catch OperationCanceledException in single file load sequence
  Dean Herbert · 2018-08-20 14:42:37 +09:00
  65dc9f44e5
• Merge pull request #3253 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-08-20 14:34:49 +09:00
  9376a4fe49
• Unbind song select's ruleset to avoid test failures
  Dean Herbert · 2018-08-20 14:27:32 +09:00
  18aa30fcb0
• Update uniform usage
  Dean Herbert · 2018-08-20 13:39:22 +09:00
  e628e78f24
• Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework
  Dean Herbert · 2018-08-20 13:38:07 +09:00
  e982901205
• Update framework
  Dean Herbert · 2018-08-20 13:37:59 +09:00
  6b0ed4a68d
• Merge branch 'master' into relax
  Dean Herbert · 2018-08-17 23:17:07 +09:00
  6a4ff19c90
• Also handle OnScroll
  Dean Herbert · 2018-08-17 20:13:14 +09:00
  41f8609e0f
• Block user input
  Dean Herbert · 2018-08-17 19:33:14 +09:00
  442f6795bc
• Merge pull request #3241 from smoogipoo/fix-mirror-note-conversion

  Fix mirror note generation never completing

  Dean Herbert · 2018-08-17 14:54:13 +09:00
  2018.817.0 29df5b5353
• Merge branch 'master' into fix-mirror-note-conversion
  Dean Herbert · 2018-08-17 14:47:16 +09:00
  786ed8203f
• Adjust with framework-side screenchanges
  smoogipoo · 2018-08-17 14:30:44 +09:00
  9a1e92800b
• Merge pull request #3244 from peppy/log-display-fix

  Fix notifications suggesting automatic reporting in non-deployed builds

  Dean Herbert · 2018-08-17 14:27:56 +09:00
  d0ffab6987
• Merge branch 'master' into log-display-fix
  Dan Balasescu · 2018-08-17 14:15:14 +09:00
  e7e14cc76c
• Merge pull request #3245 from smoogipoo/import-output

  Output the currently importing model

  Dean Herbert · 2018-08-17 13:57:57 +09:00
  5ddef1afed
• Merge pull request #3239 from smoogipoo/spinner-combo-fix

  Fix spinners creating an extra combo

  Dean Herbert · 2018-08-17 13:57:48 +09:00
  0e5dbe5689
• Merge branch 'master' into import-output
  Dean Herbert · 2018-08-17 13:57:39 +09:00
  7de958769d
• Merge branch 'master' into log-display-fix
  Dan Balasescu · 2018-08-17 13:53:45 +09:00
  2aae39eff3
• Merge branch 'master' into spinner-combo-fix
  Dean Herbert · 2018-08-17 13:50:41 +09:00
  8915ed658e
• Output the currently importing model
  smoogipoo · 2018-08-17 13:50:27 +09:00
  83bda313d1
• Merge pull request #3243 from smoogipoo/increase-conversion-leniency

  Increase the maximum allowable iterations during mania conversion

  Dean Herbert · 2018-08-17 13:37:21 +09:00
  c6cfdf97ef
• Add explanatory comments
  smoogipoo · 2018-08-17 13:31:12 +09:00
  16d30f6756
• Don’t suppress unhandled exceptions in debug builds
  Dean Herbert · 2018-08-17 13:28:35 +09:00
  583e026906
• Increase the maximum allowable iterations during mania conversion
  smoogipoo · 2018-08-17 13:26:53 +09:00
  3d6721111a
• Fix notifications suggesting automatic reporting in non-deployed builds
  Dean Herbert · 2018-08-17 13:18:48 +09:00
  7a8aabc402
• Merge branch 'master' into spinner-combo-fix
  Dean Herbert · 2018-08-17 12:59:36 +09:00
  49f455e55d
• Fix mirror note generation never completing
  smoogipoo · 2018-08-17 12:54:32 +09:00
  99ace9805f