13669 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-turkish-i
  Dan Balasescu · 2018-07-26 18:06:58 +09:00
  ceaa23fbbb
• Merge pull request #3116 from AlFasGD/labelled-text-box-fixes

  Apply certain fixes for labelled text box

  Dan Balasescu · 2018-07-25 21:34:44 +09:00
  8a68ec6462
• Merge branch 'master' into labelled-text-box-fixes
  Dan Balasescu · 2018-07-25 21:21:06 +09:00
  6c290702a3
• Remove padding, fix corner radiuses
  AlFasGD · 2018-07-25 15:14:40 +03:00
  c4b1ba2979
• Merge pull request #3101 from peppy/fix-always-skipping

  Fix gameplay always skipping to first hitobject time

  Dean Herbert · 2018-07-25 12:40:14 +02:00
  7400d4d0e9
• Merge branch 'master' into fix-always-skipping
  Dean Herbert · 2018-07-25 12:30:39 +02:00
  ff04527c6d
• Merge pull request #3086 from AlFasGD/labelled-text-box

  Add labelled text box component for the Beatmap Setup Screen

  Dan Balasescu · 2018-07-25 19:15:49 +09:00
  71898754a0
• Add back blue border
  smoogipoo · 2018-07-25 18:38:50 +09:00
  206e3686f2
• Merge remote-tracking branch 'origin/master' into labelled-text-box
  smoogipoo · 2018-07-25 18:35:04 +09:00
  127084ba74
• Cleanup
  smoogipoo · 2018-07-25 18:34:47 +09:00
  b60e4b0728
• Merge branch 'master' into fix-always-skipping
  Dan Balasescu · 2018-07-25 15:30:24 +09:00
  53e55c2f14
• Merge branch 'master' into fix-turkish-i
  Dean Herbert · 2018-07-25 08:15:20 +02:00
  38f221cd60
• Merge pull request #3104 from peppy/fix-invalid-operation

  Fix a potential InvalidOperationException when entering song select

  Dan Balasescu · 2018-07-25 14:49:26 +09:00
  dcf70bbd54
• ToLower -> ToLowerInvariant
  Dean Herbert · 2018-07-25 07:37:05 +02:00
  da8fc0ee5d
• Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i
  Dean Herbert · 2018-07-25 07:36:24 +02:00
  425b5e4119
• Merge branch 'master' into fix-invalid-operation
  Dan Balasescu · 2018-07-25 14:35:36 +09:00
  affecccabc
• Merge pull request #3109 from peppy/fix-migration-fail

  Fix resetting database failing due to incorrect disposal logic

  Dan Balasescu · 2018-07-25 13:56:53 +09:00
  391eaa30e0
• Trim whitespace that magically appeared
  AlFasGD · 2018-07-24 22:33:19 +03:00
  6675c455f3
• Clean code and apply requested changes
  AlFasGD · 2018-07-24 22:04:02 +03:00
  3ca112aef0
• Use ToUpperInvariant
  Dean Herbert · 2018-07-24 14:42:06 +02:00
  5364a6148a
• Hide unnecessary log output
  Dean Herbert · 2018-07-24 12:13:48 +02:00
  1d86083981
• Fix resetting database failing due to incorrect disposal logic
  Dean Herbert · 2018-07-24 12:13:48 +02:00
  b38da34da9
• Fix usage of culture local ToUpper causing incorrect display on Turkish machines

  Closes #3098.

  Dean Herbert · 2018-07-24 11:37:43 +02:00
  ab9340f4be
• 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
• Fix a potential InvalidOperationException when entering song select

  Closes #3052.

  Dean Herbert · 2018-07-23 13:11:06 +02:00
  1b456fd716
• 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
• Fix incorrect variable usage
  Dean Herbert · 2018-07-23 08:33:47 +02:00
  44a2ae5f9a
• Fix testing regression
  Dean Herbert · 2018-07-22 22:47:25 +02:00
  8501967b6a
• 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
• Fix gameplay always skipping to first hitobject time

  Regresssed with previous build

  Dean Herbert · 2018-07-22 22:19:58 +02:00
  3c59ccadd0
• 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