13643 Commits

This Branch

This Branch

All Branches

• Clean code and apply requested changes
  AlFasGD · 2018-07-24 22:04:02 +03:00
  3ca112aef0
• Clean code
  AlFasGD · 2018-07-24 10:10:17 +03:00
  0e50e4ee34
• Remove custom text box
  AlFasGD · 2018-07-24 09:46:24 +03:00
  765c6e4ecc
• Make text colour white
  AlFasGD · 2018-07-24 09:21:01 +03:00
  2f452c162c
• Update framework and apply suggested changes
  AlFasGD · 2018-07-24 09:19:45 +03:00
  a833fa3d92
• Merge branch 'master' into labelled-text-box
  AlFasGD · 2018-07-24 09:19:22 +03:00
  cd37b0df23
• Apply proposed changes (untested)
  AlFasGD · 2018-07-23 15:44:10 +03:00
  dd56a2d95f
• Merge pull request #3103 from peppy/fix-testing-regression

  Fix fatal test result on temporary file deletion failures

  Dan Balasescu · 2018-07-23 19:44:25 +09:00
  9dc55688d2
• Prevent fatal failures on delete failures
  Dean Herbert · 2018-07-23 10:39:43 +02:00
  2169a47325
• Fix testing regression
  Dean Herbert · 2018-07-23 10:33:10 +02:00
  82ea4456e4
• Merge pull request #3079 from smoogipoo/centralise-judgement-display

  Centralise method of disabling playfield judgements

  Dean Herbert · 2018-07-23 05:34:50 +09:00
  9f1d37e052
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 05:23:52 +09:00
  6fa70ed696
• Merge pull request #3076 from smoogipoo/per-object-css

  Add support for multiple sample banks on a per-hitobject level

  Dean Herbert · 2018-07-23 05:07:46 +09:00
  f285279258
• Merge branch 'master' into per-object-css
  Dean Herbert · 2018-07-23 03:01:17 +09:00
  d561f54282
• Merge pull request #3095 from VPeruS/patch-1

  README clarification about dotnet restore for VScode users

  Dean Herbert · 2018-07-23 03:00:45 +09:00
  aa54472600
• Use full application name
  Dean Herbert · 2018-07-22 20:00:34 +02:00
  717345f260
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 02:58:49 +09:00
  d868d81b59
• Merge pull request #3093 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-07-23 02:57:46 +09:00
  61a57b8050
• Small clarification about to run dotnet restore
  VperuS · 2018-07-21 13:27:45 +03:00
  41ffc17fe3
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• 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
• Add test case
  AlFasGD · 2018-07-20 14:28:39 +03:00
  6dd5c7e5ab
• Add labelled text box files
  AlFasGD · 2018-07-20 13:05:19 +03:00
  f200cfe40d
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-20 17:29:15 +09:00
  3fc7f33e90
• 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
• Centralise method of disabling playfield judgements
  smoogipoo · 2018-07-20 17:04:33 +09:00
  1139f0dbf2
• 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
• Implement per-hitobject custom sample banks
  smoogipoo · 2018-07-20 15:12:44 +09:00
  c087a73f40
• Remove unnecessary setting of sample name to same value
  smoogipoo · 2018-07-20 15:12:21 +09:00
  de8d05bb0c
• Adjust testcase
  smoogipoo · 2018-07-20 15:12:04 +09:00
  967d0c3c72
• 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
• 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
• 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
• Fix ArchiveModelManager's model import method not running import logic
  Dean Herbert · 2018-07-18 12:59:22 +09:00
  e3fb781a5a