7685 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into editor-waveform
  Dean Herbert · 2017-10-12 20:49:48 +09:00
  182bb71eb0
• Merge pull request #1365 from peppy/remove-codeanalysis-reference

  Remove references to CodeAnalysisRulesets

  Dan Balasescu · 2017-10-12 20:49:34 +09:00
  8d28999dd6
• Remove references to CodeAnalysisRulesets

  Having these produce warnings under certain compile environments.

  Dean Herbert · 2017-10-12 20:37:20 +09:00
  70c55b23f4
• Merge pull request #1359 from Tom94/remove-ratio-adjust

  Remove now obsolete RatioAdjust

  Dean Herbert · 2017-10-12 19:43:41 +09:00
  af17408cad
• Merge branch 'master' into remove-ratio-adjust
  Dean Herbert · 2017-10-12 19:26:03 +09:00
  a22fe901a3
• Merge pull request #1363 from peppy/fix-creator-username

  Make creatorUsername a property so it is correctly deserialised

  Dean Herbert · 2017-10-12 19:23:18 +09:00
  1eec6d8167
• Make creatorUsername a property so it is correctly deserialised
  Dean Herbert · 2017-10-12 19:15:59 +09:00
  4d78a0492c
• Merge branch 'master' into remove-ratio-adjust
  Thomas Müller · 2017-10-12 12:05:41 +02:00
  882e4b68bb
• Merge pull request #1362 from peppy/fix-spm-queue

  Fix potential read from empty queue in SPM counter

  Thomas Müller · 2017-10-12 12:05:24 +02:00
  78a4045154
• Update framework
  Thomas Müller · 2017-10-12 11:49:10 +02:00
  d9bf465b9c
• Merge branch 'master' into remove-ratio-adjust
  Dan Balasescu · 2017-10-12 18:48:32 +09:00
  753383a740
• Fix potential read from empty queue in SPM counter
  Dean Herbert · 2017-10-12 18:28:26 +09:00
  1b031ca328
• Merge branch 'master' into editor-waveform
  Dan Balasescu · 2017-10-12 17:32:42 +09:00
  18c67dd936
• Merge pull request #1341 from peppy/fix-medal-overlay

  Fix visual regressions in MedalOverlay

  Dan Balasescu · 2017-10-12 17:05:17 +09:00
  818cbc0082
• Merge + update framework
  smoogipoo · 2017-10-12 17:02:39 +09:00
  622659336d
• Update framework
  Dean Herbert · 2017-10-12 16:57:05 +09:00
  881eeaa650
• Merge remote-tracking branch 'upstream/master' into fix-medal-overlay
  Dean Herbert · 2017-10-12 16:56:40 +09:00
  00f7007036
• Remove now obsolete RatioAdjust
  Thomas Müller · 2017-10-12 09:42:06 +02:00
  78f2037d84
• Merge pull request #1354 from Tom94/vscode-build

  Improve VSCode build / debug tasks

  Thomas Müller · 2017-10-11 10:48:06 +02:00
  6a91175c0f
• Update framework
  Dean Herbert · 2017-10-11 17:38:21 +09:00
  a6c54034fe
• Merge branch 'master' into vscode-build
  Dan Balasescu · 2017-10-11 17:18:44 +09:00
  e4398eb54b
• Merge pull request #1352 from peppy/import-test-fix

  Improve resilience of beatmap import test

  Dan Balasescu · 2017-10-11 17:18:32 +09:00
  310db20c74
• Add launch task for visual tests in release mode
  Thomas Müller · 2017-10-11 10:12:36 +02:00
  f55b980793
• Mark release build task as "build"
  Thomas Müller · 2017-10-11 10:12:31 +02:00
  4922896636
• Fix capitalization of launch tasks
  Thomas Müller · 2017-10-11 10:12:21 +02:00
  76cf0e55a6
• Merge branch 'master' into import-test-fix
  Dan Balasescu · 2017-10-11 17:08:29 +09:00
  6cc7e26f7c
• Merge pull request #1353 from huoyaoyuan/fix

  Ignore filename case in BeatmapManager

  Dean Herbert · 2017-10-11 16:07:39 +09:00
  e83cb91185
• Ignore filename case in BeatmapManager. Fixes #1295.
  Huo Yaoyuan · 2017-10-11 15:01:02 +08:00
  cf7f3411fc
• Always use live queries to ensure waiting asserts actually get dynamic data
  Dean Herbert · 2017-10-11 13:37:24 +09:00
  bf6ab77b0e
• Merge branch 'master' into import-test-fix
  Dean Herbert · 2017-10-11 13:11:55 +09:00
  c55ae5049f
• Merge pull request #1342 from smoogipoo/fix-storyboard-exception

  Fix trimming too early in OsuLegacyDecoder crashing storyboards

  Dean Herbert · 2017-10-11 13:04:41 +09:00
  6542079385
• Improve resilience of beatmap import test

  Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests

  Dean Herbert · 2017-10-11 12:41:43 +09:00
  b6cfc49b06
• Merge branch 'master' into fix-storyboard-exception
  Dean Herbert · 2017-10-11 12:26:34 +09:00
  71fc5c4da2
• Merge pull request #1348 from smoogipoo/iconbutton-refactor

  Refactor + improve IconButton

  Dean Herbert · 2017-10-11 12:14:59 +09:00
  4c8fe5f678
• Merge branch 'master' into iconbutton-refactor
  Dean Herbert · 2017-10-11 12:05:38 +09:00
  6de100d446
• Merge pull request #1329 from huoyaoyuan/spm-counter

  Implement SPM counter on osu! spinners

  Dean Herbert · 2017-10-11 11:39:36 +09:00
  bb2b5fa86d
• Merge remote-tracking branch 'upstream/master' into spm-counter
  Dean Herbert · 2017-10-11 11:23:09 +09:00
  2b309be3c2
• Remove unnecessary bool
  Dean Herbert · 2017-10-11 11:23:02 +09:00
  e76961a932
• Formatting
  Dean Herbert · 2017-10-11 11:20:44 +09:00
  1fc16693d6
• Merge pull request #1343 from peppy/hidden-judgements

  Add a bool to specify whether judgements should be visible for certain DrawableHitObjects

  Dan Balasescu · 2017-10-10 19:25:29 +09:00
  78c160af87
• Only split beatmap lines twice
  smoogipoo · 2017-10-10 19:24:24 +09:00
  b8d2a04fe1
• Use IsNullOrWhiteSpace instead of trimming
  smoogipoo · 2017-10-10 19:21:38 +09:00
  ad344eb719
• Remove unused using
  smoogipoo · 2017-10-10 18:35:30 +09:00
  8cea875f5f
• Add TestCaseIconButton to demonstrate IconButton usages
  smoogipoo · 2017-10-10 18:32:09 +09:00
  c2f3c0e6df
• Fix properties not being set leading to colours not being set
  smoogipoo · 2017-10-10 18:31:56 +09:00
  071b1b049c
• Make it possible to change colours before load()
  smoogipoo · 2017-10-10 18:04:41 +09:00
  44141a38b8
• Merge branch 'master' into hidden-judgements
  Dan Balasescu · 2017-10-10 17:59:34 +09:00
  d8b7f4efa7
• Merge pull request #1347 from peppy/fix-tests-namespace

  Move mania tests to correct namespace

  Dan Balasescu · 2017-10-10 17:58:36 +09:00
  cd870b5acd
• xmldoc + hook up IconColour
  smoogipoo · 2017-10-10 17:25:39 +09:00
  bbd1a7059e
• Expose colours of IconButton
  smoogipoo · 2017-10-10 17:20:23 +09:00
  d7fb59ee0e