13710 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into remove-net471-target
  Dean Herbert · 2018-07-30 15:27:48 +09:00
  bd3e5f7e1b
• Move testing package references to somewhere appveyor will find them
  Dean Herbert · 2018-07-30 15:15:51 +09:00
  338496452d
• Merge pull request #3133 from phosphene47/player-esc-result

  Fix hitting "exit" key after gameplay ends not showing results

  Dean Herbert · 2018-07-30 15:11:42 +09:00
  7642db3572
• Merge remote-tracking branch 'upstream/master' into phosphene47-player-esc-result
  Dean Herbert · 2018-07-30 14:57:04 +09:00
  4abdca92e1
• Remove newline
  Dean Herbert · 2018-07-30 14:55:03 +09:00
  8c3583ac54
• Revert "Specify tests directly"

  This reverts commit 1502edcdc6.

  Dean Herbert · 2018-07-30 14:39:45 +09:00
  0205916b9e
• Merge branch 'master' into peppy-remove-net471-target
  Dean Herbert · 2018-07-30 14:16:38 +09:00
  a3e7d4bb21
• Update framework
  Dean Herbert · 2018-07-30 14:14:16 +09:00
  f57ba4ffb1
• Merge branch 'master' into remove-net471-target
  Dean Herbert · 2018-07-30 11:28:06 +09:00
  3cf906042e
• Merge pull request #3124 from smoogipoo/fix-editor-lifetime

  Fix hitobjects not properly expiring if scrolling in the editor

  Dean Herbert · 2018-07-28 12:43:02 +09:00
  0d8701d0cb
• Merge branch 'master' into fix-editor-lifetime
  Dean Herbert · 2018-07-28 12:35:39 +09:00
  ac67c2dab3
• Esc at the end of play should push to result screen

  Closes #3060

  phosphene47 · 2018-07-28 08:34:51 +10:00
  d32a3ff052
• Merge pull request #3126 from smoogipoo/fix-catch-nullref

  Fix possible nullref if no fruits are ever caught

  ekrctb · 2018-07-26 23:05:03 +09:00
  5b18488174
• Merge branch 'master' into fix-catch-nullref
  ekrctb · 2018-07-26 22:50:37 +09:00
  5d83d00806
• Merge pull request #2515 from odgaard/master

  Disable MusicController's seek during gameplay

  Dan Balasescu · 2018-07-26 21:49:26 +09:00
  28844a97e8
• Merge remote-tracking branch 'origin/master'
  smoogipoo · 2018-07-26 21:28:31 +09:00
  464333cf0b
• Fix possible nullref if no fruits are ever caught
  smoogipoo · 2018-07-26 21:00:18 +09:00
  71c49de031
• Fix hitobjects not properly expiring if scrolling in the editor
  smoogipoo · 2018-07-26 20:07:16 +09:00
  ff2a3a6e92
• Merge pull request #3108 from peppy/fix-turkish-i

  Fix usage of culture local ToUpper causing incorrect display on Turkish machines

  Dan Balasescu · 2018-07-26 18:17:38 +09:00
  dc6898e7e0
• 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