7460 Commits

This Branch

This Branch

All Branches

• 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
• Merge remote-tracking branch 'origin/master' into editor-timing-timeline

  # Conflicts:
  #	osu-framework

  smoogipoo · 2017-09-25 17:20:55 +09:00
  7fb8008e44
• Merge branch 'master' into online-beatmap-set-overlay
  Dean Herbert · 2017-09-25 16:15:58 +08:00
  b83596b44d
• Merge pull request #1306 from peppy/set-busy-timeout

  Add BusyTimeout to avoid hard crashes on database contention

  Dan Balasescu · 2017-09-25 17:14:47 +09:00
  2d0555b552
• Merge branch 'master' into set-busy-timeout
  Dan Balasescu · 2017-09-25 17:05:40 +09:00
  c8cad6d9aa
• Merge pull request #1303 from MrTheMake/chat-commands

  Initial implementation of chat commands

  Dean Herbert · 2017-09-25 15:58:20 +08:00
  4151285190
• Merge branch 'master' into chat-commands
  Dean Herbert · 2017-09-25 15:52:35 +08:00
  a80f0d4858
• Merge pull request #1309 from huoyaoyuan/net46

  Use .net 4.6 features

  Dean Herbert · 2017-09-25 13:26:16 +08:00
  6349c50510
• Update framework
  Dean Herbert · 2017-09-25 13:09:06 +08:00
  b6a6042b5c
• Merge branch 'master' into net46
  Dean Herbert · 2017-09-25 12:43:35 +08:00
  2c99fa29f0
• Merge pull request #1275 from EVAST9919/icons_jumping_fix

  Fix icons in main button system jumps on one side for a long time

  Dean Herbert · 2017-09-25 12:19:20 +08:00
  3001d6826b
• Merge branch 'master' into icons_jumping_fix
  Dean Herbert · 2017-09-25 12:07:25 +08:00
  0aebfdd578
• Merge branch 'master' into set-busy-timeout
  Dean Herbert · 2017-09-25 12:05:57 +08:00
  33a9bb6997
• Add back missing tests
  Dean Herbert · 2017-09-25 11:58:37 +08:00
  1e6c480791
• Set a busy timeout when creating an SQLIteConnection
  Dean Herbert · 2017-09-25 11:51:48 +08:00
  a1b313620c
• Merge pull request #1305 from WebFreak001/master

  URL encode beatmap filename

  Dan Balasescu · 2017-09-25 10:02:56 +09:00
  860b389e9a
• Merge branch 'master' into master
  Dan Balasescu · 2017-09-25 09:58:29 +09:00
  a5622bb293
• Remove usings to extensions.
  Huo Yaoyuan · 2017-09-24 06:03:52 +08:00
  2b11ecec13
• Use Array.Empty.
  Huo Yaoyuan · 2017-09-24 03:45:46 +08:00
  87c8278139
• Use TimeSpan to represent time.
  Huo Yaoyuan · 2017-09-24 03:23:31 +08:00
  c5aebf6401
• Use DateTimeOffset.ToUnixTime
  Huo Yaoyuan · 2017-09-24 00:42:46 +08:00
  d277952e0f
• Merge pull request #1307 from huoyaoyuan/song-select-fix

  Fix overlay toggling in song select.

  Dean Herbert · 2017-09-23 20:01:10 +08:00
  b59379252b
• Fix overlay toggling in song select.
  Huo Yaoyuan · 2017-09-23 19:47:23 +08:00
  442259d9e0
• URL encode beatmap filename
  WebFreak001 · 2017-09-22 22:47:26 +02:00
  e04526222c
• Removed generic parameter function
  MrTheMake · 2017-09-22 16:17:03 +02:00
  34fb6ccdf5
• Merge pull request #1298 from peppy/song-select-toggle-overlays

  Ensure only one dialog is being displayed by the SongSelect footer at a time

  Dan Balasescu · 2017-09-22 22:57:53 +09:00
  8853cab911
• Merge branch 'master' into song-select-toggle-overlays
  Dan Balasescu · 2017-09-22 22:41:52 +09:00
  9e02570802