13630 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'origin/open-downloaded-beatmas' into release

  # Conflicts:
  #	osu.Game/Screens/Select/SongSelect.cs

  Dean Herbert · 2018-07-21 23:57:09 +08:00
  2018.722.0 a635f2e53a
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
  Dean Herbert · 2018-07-21 00:03:17 +09:00
  a2f744b05e
• Merge pull request #3063 from peppy/fix-model-import

  Fix ArchiveModelManager's model import method not running import logic

  Dan Balasescu · 2018-07-20 23:50:29 +09:00
  1796ffde14
• Merge branch 'master' into fix-model-import
  Dean Herbert · 2018-07-20 23:30:41 +09:00
  77da100c0f
• Merge pull request #3042 from peppy/pause-input-fixes

  Improve pause logic

  Dean Herbert · 2018-07-20 17:28:25 +09:00
  f226e10033
• Merge branch 'master' into pause-input-fixes
  Dean Herbert · 2018-07-20 17:20:19 +09:00
  7cc999027d
• Remove unnecessary counting change logic
  Dean Herbert · 2018-07-20 17:08:25 +09:00
  241437c819
• Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
  Dean Herbert · 2018-07-20 16:42:46 +09:00
  fc6deb6ab5
• Add ToList
  Dean Herbert · 2018-07-20 16:38:02 +09:00
  7fea2b3a8b
• Merge pull request #3065 from peppy/no-more-memory-sqlite

  Remove SingletonContextFactory database testing interface

  Dan Balasescu · 2018-07-20 16:37:54 +09:00
  56a0cd0789
• Merge branch 'master' into fix-model-import
  Dean Herbert · 2018-07-20 16:17:39 +09:00
  92fe996a8b
• Merge branch 'master' into no-more-memory-sqlite
  Dean Herbert · 2018-07-20 16:17:36 +09:00
  0e7bb3b548
• Merge pull request #3072 from davidv273/fix-import-float-coords

  Fixes parsing of HitObject in case of float coords

  Dean Herbert · 2018-07-20 16:08:39 +09:00
  2af5d795fe
• Add more tests and fix one remaining issue case
  Dean Herbert · 2018-07-20 11:55:17 +09:00
  64ead0fdf7
• Restructure + corrects converting to support all systems
  David V · 2018-07-19 17:47:55 +02:00
  9eb69a1e76
• Converts float to int.
  David V · 2018-07-19 15:55:38 +02:00
  4e72794101
• wip
  Dean Herbert · 2018-07-19 18:51:08 +09:00
  d7f1766ee2
• Rework update methods to separate out ruleset and beatmap changes

  Combining them was causing complexity and logic errors.

  Dean Herbert · 2018-07-19 18:48:40 +09:00
  c31676f8f1
• Add more ToString output
  Dean Herbert · 2018-07-19 18:43:11 +09:00
  693ba8e994
• Merge branch 'fix-model-import' into open-downloaded-beatmas

  # Conflicts:
  #	osu.Game/Beatmaps/BeatmapManager.cs
  #	osu.Game/Database/SingletonContextFactory.cs

  Dean Herbert · 2018-07-19 14:11:31 +09:00
  332c62f110
• Centralise test storage logic
  Dean Herbert · 2018-07-19 14:07:55 +09:00
  7be3a5d466
• Ensure online IDs are validated for imports that don't have an associated archive too
  Dean Herbert · 2018-07-19 13:41:34 +09:00
  68614f1512
• Add more song select tests
  Dean Herbert · 2018-07-19 13:39:42 +09:00
  3e738c607a
• Delay key count stop
  Dean Herbert · 2018-07-19 01:18:07 +09:00
  82ddbb3f5d
• Remove unnecessary cast
  Dean Herbert · 2018-07-18 22:22:28 +09:00
  41441771ae
• Add key counter exceptions for paused state
  Dean Herbert · 2018-07-18 22:19:32 +09:00
  8414fe9d05
• Set restart count
  Dean Herbert · 2018-07-18 22:05:24 +09:00
  a01361f833
• Better pause logic
  Dean Herbert · 2018-07-18 19:59:04 +09:00
  c2cdf12986
• Fix GameplayCursor state not restoring correctly after Show/Hide
  Dean Herbert · 2018-07-18 19:59:04 +09:00
  ffd3040fe2
• Remove SingletonContextFactory

  It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
  
  # Conflicts:
  #	osu.Game/Database/SingletonContextFactory.cs

  Dean Herbert · 2018-07-18 16:50:56 +09:00
  0c24244340
• Remove SingletonContextFactory

  It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.

  Dean Herbert · 2018-07-18 16:44:47 +09:00
  1d52231d4f
• Fix ArchiveModelManager's model import method not running import logic
  Dean Herbert · 2018-07-18 13:18:50 +09:00
  90840c9384
• FilterTask -> PendingFilter
  Dean Herbert · 2018-07-18 13:18:50 +09:00
  9611292f4e
• Improve integrity of song select bind/change logic
  Dean Herbert · 2018-07-18 13:18:50 +09:00
  f1c3fbe644
• Click download button to load beatmap
  Dean Herbert · 2018-07-18 13:18:50 +09:00
  5fe634a3b6
• Fix ArchiveModelManager's model import method not running import logic
  Dean Herbert · 2018-07-18 12:59:22 +09:00
  e3fb781a5a
• Merge pull request #3056 from ekrctb/fix-potential-quadratic-complexity

  Fix potential quadratic complexity in taiko autoplay

  Dean Herbert · 2018-07-18 11:48:22 +09:00
  d0f7bdbcb8
• Merge pull request #3034 from peppy/reduce-panel-width

  Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions

  Dean Herbert · 2018-07-17 19:14:48 +09:00
  aa2f2f3e94
• Fix potential quadratic complexity in taiko autoplay
  ekrctb · 2018-07-17 17:00:28 +09:00
  c6816a6cf3
• Merge pull request #3054 from peppy/use-switch-over-if

  Use switch with type matching in place of if-else where possible

  Dan Balasescu · 2018-07-17 16:58:59 +09:00
  fef78abdb3
• Merge branch 'master' into use-switch-over-if
  Dan Balasescu · 2018-07-17 16:44:57 +09:00
  64cde1ebad
• Merge branch 'master' into reduce-panel-width
  Dean Herbert · 2018-07-17 16:36:05 +09:00
  97e71245e9
• Merge pull request #3055 from smoogipoo/scrolldirection-cleanup

  Remove scroll direction from ScrolingPlayfield constructor

  Dean Herbert · 2018-07-17 16:35:59 +09:00
  2a6ebb1da4
• Apply review feedback
  Dean Herbert · 2018-07-17 16:33:08 +09:00
  9f933187e9
• Merge branch 'master' into scrolldirection-cleanup
  Dean Herbert · 2018-07-17 15:39:13 +09:00
  569d0f7993
• Merge pull request #2959 from peppy/fix-incorrect-mods

  Fix mods not correctly resetting when changing ruleset at song select

  Dean Herbert · 2018-07-17 15:39:02 +09:00
  15516a499d
• Merge branch 'master' into fix-incorrect-mods
  Dean Herbert · 2018-07-17 15:23:21 +09:00
  e681bd3244
• Remove scroll direction from ScrolingPlayfield constructor
  smoogipoo · 2018-07-17 15:14:03 +09:00
  827c5c4939
• Merge pull request #3053 from peppy/fix-incorrect-leadin

  Fix lead-in time not being long enough in many cases

  Dan Balasescu · 2018-07-17 15:11:36 +09:00
  bac577ca24