7675 Commits

This Branch

This Branch

All Branches

• Remove unused usings
  smoogipoo · 2017-10-12 15:32:18 +09:00
  6fbf52c3eb
• Merge remote-tracking branch 'origin/master' into editor-waveform-timeline

  # Conflicts:
  #	osu-framework

  smoogipoo · 2017-10-12 15:32:11 +09:00
  df6409308a
• 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
• Move mania tests to correct namespace
  Dean Herbert · 2017-10-10 16:50:46 +09:00
  b306eaca6e
• Move origin + anchor outside of ctor
  smoogipoo · 2017-10-10 16:00:11 +09:00
  9cb9151811
• Re-namespace a few classes
  smoogipoo · 2017-10-10 15:22:39 +09:00
  1cf8c0284a
• Further logic simplification
  smoogipoo · 2017-10-10 15:09:26 +09:00
  166194e6b6
• Implement scrolling and better zoom
  smoogipoo · 2017-10-10 12:45:27 +09:00
  074a1db4a1
• Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
  Dean Herbert · 2017-10-09 20:17:05 +09:00
  d5892cf54e
• Merge branch 'master' into spm-counter
  Huo Yaoyuan · 2017-10-09 19:05:30 +08:00
  994959fd77
• Fix trimming too early in OsuLegacyDecoder crashing storyboards
  smoogipoo · 2017-10-09 18:47:12 +09:00
  29c2a29798
• Merge branch 'editor-waveform' into editor-waveform-timeline

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  smoogipoo · 2017-10-09 18:10:52 +09:00
  cb58a1371e
• Merge remote-tracking branch 'origin/master' into editor-waveform

  # Conflicts:
  #	osu-framework

  smoogipoo · 2017-10-09 17:20:24 +09:00
  b97b575b27
• Update in-line with framework
  smoogipoo · 2017-10-09 17:18:11 +09:00
  19b38983df
• Merge pull request #1339 from sunghwan2789/decoder-improve

  Trim end of line

  Dan Balasescu · 2017-10-08 19:07:04 +09:00
  v2017.1008.0 b1a2da58bc
• Trim line
  Bang Sunghwan · 2017-10-08 17:30:21 +09:00
  bd9f2db477
• Trim end of line

  Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136

  Bang Sunghwan · 2017-10-08 09:42:09 +09:00
  6c5c734ff1
• Move spm calculation into counter.
  Huo Yaoyuan · 2017-10-07 15:58:53 +08:00
  09093013a7
• Move spm counter to a seperated control.
  Huo Yaoyuan · 2017-10-07 15:31:42 +08:00
  a876ab9b90