7486 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-invisible-marker
  Dan Balasescu · 2017-09-27 14:53:58 +09:00
  5dceee2e36
• Merge pull request #1320 from peppy/api-state-fixes

  Make APIAccess's state only privately settable

  Dan Balasescu · 2017-09-27 14:53:16 +09:00
  5a3abadfe1
• Merge branch 'master' into api-state-fixes
  Dan Balasescu · 2017-09-27 14:41:25 +09:00
  9c14d3b696
• Merge pull request #1319 from peppy/fix-login-overlay

  Fix yellow line in login overlay not following size correctly

  Dan Balasescu · 2017-09-27 14:41:13 +09:00
  6e83449731
• Merge branch 'master' into fix-login-overlay
  Dean Herbert · 2017-09-27 13:17:46 +08:00
  e81d9cb5fc
• Merge branch 'master' into fix-invisible-marker
  Dan Balasescu · 2017-09-27 14:17:42 +09:00
  43d56bc9d7
• Make APIAccess's state only privately settable
  Dean Herbert · 2017-09-27 13:16:17 +08:00
  a17cc04cde
• Merge pull request #1317 from peppy/api-state-fixes

  Move all APIAccess State changes to the local thread

  Dan Balasescu · 2017-09-27 14:11:50 +09:00
  23d688bb35
• Fix yellow line in login overlay not following size correctly

  Also allows right click context menu to correctly extrude beyond the local masking.

  Dean Herbert · 2017-09-27 13:06:57 +08:00
  4a95d64239
• Merge branch 'master' into api-state-fixes
  Dan Balasescu · 2017-09-27 14:02:19 +09:00
  67481a1e6a
• Merge pull request #1315 from peppy/close-beatmap-overlay

  Close BeatmapSetOverlay when clicking outside of it

  Dan Balasescu · 2017-09-27 14:02:08 +09:00
  9be595a234
• Merge branch 'master' into close-beatmap-overlay
  Dan Balasescu · 2017-09-27 13:51:13 +09:00
  4881d01b7e
• Merge pull request #1316 from peppy/fix-concurrent-tests

  Assign a name to individual import tests to avoid file contention

  Dan Balasescu · 2017-09-27 13:51:07 +09:00
  529b98ba35
• Fix test case not working as expected
  Dean Herbert · 2017-09-27 12:46:34 +08:00
  e64860ad45
• Arbitrarily move colour assignment
  Dean Herbert · 2017-09-27 12:40:32 +08:00
  faad3fc7d3
• Merge branch 'master' into fix-concurrent-tests
  Dan Balasescu · 2017-09-27 13:39:08 +09:00
  b0c5f90645
• Merge pull request #1318 from peppy/osu-direct-default-mode

  Load osu!direct overlay to "newest maps" tab by default

  Dan Balasescu · 2017-09-27 13:38:10 +09:00
  f0cfd5271c
• Load osu!direct overlay to "newest maps" tab by default
  Dean Herbert · 2017-09-27 12:23:48 +08:00
  ec50834e98
• Move all APIAccess State changes to the local thread

  Previously changes to the state were triggering events like Logout, which could get things into a bad state.

  Dean Herbert · 2017-09-27 12:18:24 +08:00
  05c6829deb
• Assign a name to individual import tests to avoid file contention
  Dean Herbert · 2017-09-27 11:26:56 +08:00
  bbc990a6fd
• Close BeatmapSetOverlay when clicking outside of it
  Dean Herbert · 2017-09-27 11:22:47 +08:00
  3018d32b13
• Fix timeline sizes being updated potentially before the track has a length
  Dean Herbert · 2017-09-27 11:07:43 +08:00
  d5ed218488
• Simplify marker part construction
  Dean Herbert · 2017-09-27 11:07:23 +08:00
  7ad21d9a6d
• Fix marker being cleared each beatmap change
  Dean Herbert · 2017-09-27 11:07:17 +08:00
  eae29820c0
• Remove second unnecessary colour set
  Dean Herbert · 2017-09-27 10:06:36 +08:00
  708632bca8
• Merge pull request #1278 from Damnae/storyboard_integration

  Storyboard integration

  Dean Herbert · 2017-09-26 20:47:07 +08:00
  v2017.926.0 3fd4a97a19
• Merge branch 'master' into storyboard_integration
  Dean Herbert · 2017-09-26 20:19:26 +08:00
  7c70d3d2cb
• Merge pull request #1312 from Xinnoh/patch-1

  changed description for hidden

  Dean Herbert · 2017-09-26 20:12:46 +08:00
  9892572db4
• Merge branch 'master' into patch-1
  Dean Herbert · 2017-09-26 19:28:03 +08:00
  00067d0d18
• Merge pull request #1299 from smoogipoo/editor-timing-timeline

  Initial implementation of the editor summary timeline

  Dean Herbert · 2017-09-26 19:27:34 +08:00
  76cba2b311
• Simplify null check
  smoogipoo · 2017-09-26 20:11:45 +09:00
  10dbd68c1e
• Bind to the screen Beatmap instead of the game-wide Beatmap
  smoogipoo · 2017-09-26 17:58:40 +09:00
  c578509a20
• changed description for hidden

  ctb doesn't have approach circles

  Sinnoh · 2017-09-26 16:50:12 +08:00
  3b9c2d1d5f
• Add missing license headers
  smoogipoo · 2017-09-26 15:58:30 +09:00
  3937ebdc3d
• Merge branch 'master' into editor-timing-timeline
  Dan Balasescu · 2017-09-26 15:54:01 +09:00
  b8b54e95a5
• A bit of cleanup
  smoogipoo · 2017-09-26 15:51:45 +09:00
  10e5fe40b2
• Re-namespace SummaryTimeline
  smoogipoo · 2017-09-26 15:45:27 +09:00
  5953c1084e
• Implement MarkerPart for the marker
  smoogipoo · 2017-09-26 15:45:08 +09:00
  85cb541fef
• Re-namespace and split out timeline parts from the SummaryTimeline
  smoogipoo · 2017-09-26 15:44:40 +09:00
  a1f88a17b1
• Merge pull request #1253 from DrabWeb/online-beatmap-set-overlay

  Online beatmap set overlay

  Dean Herbert · 2017-09-26 09:17:49 +08:00
  797e77e651
• Add download button to grid view panels
  Dean Herbert · 2017-09-26 00:18:35 +08:00
  40f597f762
• Close beatmap overlay on stray mouse clicks
  Dean Herbert · 2017-09-25 23:41:27 +08:00
  c1081e02b2
• Avoid nullrefs when data is not present
  Dean Herbert · 2017-09-25 23:35:02 +08:00
  f129902ee0
• Populate author using existing data for now
  Dean Herbert · 2017-09-25 23:34:56 +08:00
  f9300ec3fe
• Add minimal viable implementation of BeatmapSetOver in game
  Dean Herbert · 2017-09-25 17:58:03 +08:00
  c2bb3ea7bc
• Rename to BeatmapSetOverlay
  Dean Herbert · 2017-09-25 17:26:27 +08:00
  5be11f539b
• Apply beatmap settings when creating the DrawableStoryboard.
  Damnae · 2017-09-25 11:03:57 +02:00
  2d4616fd43
• Better expression to avoid invalid values
  smoogipoo · 2017-09-25 18:00:52 +09:00
  d86e81f07c
• Fix bookmarks not working

  We should be dealing with the array in every situation, with the exception of the database.

  smoogipoo · 2017-09-25 17:46:51 +09:00
  d787c740fa
• Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
  Damnae · 2017-09-25 10:40:22 +02:00
  0996867112