7709 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
  Dean Herbert · 2017-10-12 21:48:08 +09:00
  d98f1a2bb7
• Merge pull request #1338 from smoogipoo/editor-waveform

  Waveform display for use in the editor

  Dean Herbert · 2017-10-12 21:45:10 +09:00
  24588eeb6a
• Update framework
  Dean Herbert · 2017-10-12 21:26:25 +09:00
  fb8d8ec552
• 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
• Simplify waveform construction
  Dean Herbert · 2017-10-12 19:19:42 +09:00
  8a5e25ce4b
• 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
• Make TimelineButtons combined take up the full height of the timeline
  smoogipoo · 2017-10-12 18:32:39 +09:00
  ab62390336
• Fix potential read from empty queue in SPM counter
  Dean Herbert · 2017-10-12 18:28:26 +09:00
  1b031ca328
• Change TimelineButton icon colour to white when hovered
  smoogipoo · 2017-10-12 18:17:36 +09:00
  a6901c0a27
• Add a way to change the IconButton icon colour
  smoogipoo · 2017-10-12 18:17:23 +09:00
  a5817e6e75
• Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline
  smoogipoo · 2017-10-12 17:52:40 +09:00
  f08f7a4ecb
• Hook up more bindables for hitobjects/hitsounds
  smoogipoo · 2017-10-12 17:51:01 +09:00
  5ccfc1918e
• Implement waveform checkbox
  smoogipoo · 2017-10-12 17:50:51 +09:00
  db672becbc
• graph -> waveform
  smoogipoo · 2017-10-12 17:37:40 +09:00
  3c35a7a6ae
• Merge branch 'master' into editor-waveform
  Dan Balasescu · 2017-10-12 17:32:42 +09:00
  18c67dd936
• Implement magnification buttons
  smoogipoo · 2017-10-12 17:31:21 +09:00
  4586877239
• 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
• Implement TimelineButton and use for the magnification buttons
  smoogipoo · 2017-10-12 16:10:33 +09:00
  de8f9325a3
• Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
  smoogipoo · 2017-10-12 15:37:45 +09:00
  2844764e3c
• Integrate timeline into Compose
  smoogipoo · 2017-10-12 15:37:00 +09:00
  e12fa49436
• 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