9932 Commits

This Branch

This Branch

All Branches

• 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
• Group transforms using delayed sequence

  And some timing adjustments

  EVAST9919 · 2017-10-10 07:07:09 +03:00
  9cad0ce2e9
• Implement scrolling and better zoom
  smoogipoo · 2017-10-10 12:45:27 +09:00
  074a1db4a1
• Use less masking for the ring
  EVAST9919 · 2017-10-10 06:06:09 +03:00
  6fb8755a95
• Remove ring's background field and adjust some timings
  EVAST9919 · 2017-10-10 04:12:01 +03:00
  19723b82f7
• Change Ring type, use RelativeSizeAxes for Background/Foreground
  EVAST9919 · 2017-10-10 03:57:15 +03:00
  e2d6659d48
• CI fixes
  EVAST9919 · 2017-10-10 01:36:40 +03:00
  59a0343c01
• Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
  EVAST9919 · 2017-10-10 00:56:54 +03:00
  0baceaaf0d
• Fix BeatmapMetadata removing
  TocoToucan · 2017-10-10 00:17:12 +03:00
  cbae19b604
• Small DB-related refactoring
  TocoToucan · 2017-10-09 23:30:32 +03:00
  ef417c6388
• Add missing eager loading
  TocoToucan · 2017-10-09 23:28:28 +03:00
  41a90c8b11
• Add tooltip to username in the profile overlay
  EVAST9919 · 2017-10-09 21:12:04 +03:00
  d1f02538cb
• 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
• Create an abstract base class for drawable catch objects
  Dean Herbert · 2017-10-09 19:42:55 +09:00
  26215b4488
• 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
• Fix visual regressions in MedalOverlay
  Dean Herbert · 2017-10-09 17:52:48 +09:00
  222d0c8694
• 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
• Fix foreign key constraint failure
  TocoToucan · 2017-10-09 00:30:52 +03:00
  81b9e08fb6
• Use one DbContext with configured CommandTimeout for all stores
  TocoToucan · 2017-10-08 18:18:28 +03:00
  5d27c66efa
• 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
• remove redundant stuff
  Jorolf · 2017-10-06 22:02:33 +02:00
  f3ca6cc387
• Merge branch 'master' of git://github.com/ppy/osu into direct-previews
  Jorolf · 2017-10-06 21:02:48 +02:00
  de2181b8f5
• move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton
  Jorolf · 2017-10-06 21:02:00 +02:00
  5a8b8dacbb
• Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
  EVAST9919 · 2017-10-06 20:37:59 +03:00
  402531d04c
• Merge branch 'master' into spm-counter
  Dean Herbert · 2017-10-07 01:10:57 +08:00
  3b6596b609
• Merge pull request #1337 from smoogipoo/editor-screens

  Initial implementation of editor screens

  Dean Herbert · 2017-10-07 01:09:04 +08:00
  c22e1520a0
• Put screens below the top and bottom bars of the editor
  smoogipoo · 2017-10-07 01:56:11 +09:00
  10abaa866b
• Make compose mode the default

  Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.

  smoogipoo · 2017-10-07 01:46:54 +09:00
  c0b394811f
• Reorder screen tab control items
  smoogipoo · 2017-10-07 01:44:20 +09:00
  d432ab7510
• Fix bindable binding to make the editor load a screen by default again
  smoogipoo · 2017-10-07 01:42:45 +09:00
  38ae9d905e
• Remove rounded corners on the editor menu bar
  smoogipoo · 2017-10-07 01:38:13 +09:00
  837d1ba12e
• Hook up BeatmapPanel "Edit" item
  smoogipoo · 2017-10-07 00:59:14 +09:00
  d3109a5950
• Add File -> Exit to editor menu
  smoogipoo · 2017-10-07 00:51:30 +09:00
  a154ee3a89
• Remove EditorMenuBarItem
  smoogipoo · 2017-10-07 00:51:20 +09:00
  fc99860f4e
• Remove scale effect on editor screen switches
  Dean Herbert · 2017-10-06 23:41:49 +08:00
  19c663da11
• Update framework
  Dean Herbert · 2017-10-06 23:20:56 +08:00
  3557737a18