61410 Commits

This Branch

This Branch

All Branches

• Shuffle playlist.
  Huo Yaoyuan · 2016-11-07 22:12:58 +08:00
  02b903f1ea
• Don't play transition if audio equals.
  Huo Yaoyuan · 2016-11-07 21:58:30 +08:00
  dc347a74f5
• AudioEquals method for BeatmapInfo.
  Huo Yaoyuan · 2016-11-07 21:52:23 +08:00
  c59cad2478
• Make external changes into history.
  Huo Yaoyuan · 2016-11-07 21:30:25 +08:00
  d1f64cfbfc
• Use play history for back and forward.
  Huo Yaoyuan · 2016-11-07 21:25:37 +08:00
  ad1dccf6ce
• Add a list for play history.
  Huo Yaoyuan · 2016-11-07 20:57:33 +08:00
  644e337cf6
• Support generic FlowContainer.
  Dean Herbert · 2016-11-07 21:17:29 +09:00
  d57d5daac9
• Initial updates to make generic containers work.
  Dean Herbert · 2016-11-07 21:13:56 +09:00
  a61fb5ef5d
• Block click and drag at MusicController level.
  Huo Yaoyuan · 2016-11-07 20:07:45 +08:00
  c272041f37
• Update FontAwesome usage.
  Huo Yaoyuan · 2016-11-07 19:00:20 +08:00
  736079a60d
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-07 18:58:35 +08:00
  8037f1233f
• Merge pull request #145 from peppy/update-font-awesome

  Update FontAwesome definitions.

  Dean Herbert · 2016-11-07 19:54:25 +09:00
  dd57f52744
• Update resources.
  Dean Herbert · 2016-11-07 19:44:48 +09:00
  8797b04dc2
• Update FontAwesome definitions.
  Dean Herbert · 2016-11-07 17:59:00 +09:00
  f14a35d480
• Merge pull request #142 from Tom94/smooth-wedged-buttons

  Smoothen wedged buttons in main menu and the wedges on song select ba…

  Dean Herbert · 2016-11-07 04:03:18 +09:00
  6ce9491f00
• Update framework.
  Thomas Müller · 2016-11-06 19:59:30 +01:00
  fa8d668cb6
• Smoothen wedged buttons in main menu and the wedges on song select background.
  Thomas Müller · 2016-11-06 19:34:44 +01:00
  90c889a7ce
• Merge pull request #140 from Tom94/better-clocks

  Better clocks

  Dean Herbert · 2016-11-07 02:57:12 +09:00
  7989090f51
• Update framework.
  Thomas Müller · 2016-11-06 18:50:21 +01:00
  108d32b6d8
• Ensure transformations are never used prior to being added to the Drawable tree.
  Thomas Müller · 2016-11-06 11:13:52 +01:00
  103176826f
• Merge branch 'master' of github.com:ppy/osu into better-clocks

  # Conflicts:
  #	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

  Thomas Müller · 2016-11-06 10:08:24 +01:00
  32ee20b843
• Remove now obsolete clock usages.
  Thomas Müller · 2016-11-06 10:06:09 +01:00
  5f2bf165a2
• Minor implementation changes.
  Huo Yaoyuan · 2016-11-06 16:47:37 +08:00
  c8a7bd2ece
• Make background update happens in update thread, and thread-safer.
  Huo Yaoyuan · 2016-11-06 16:34:47 +08:00
  000c2218b8
• Fade the options overlay to prevent unnecessary updates to its content.
  Thomas Müller · 2016-11-06 08:54:36 +01:00
  8894e5f73a
• Make use of new timing system in Drawables and Transforms.
  Thomas Müller · 2016-11-06 08:25:21 +01:00
  a6c0fd29f2
• Merge pull request #138 from grafitter/general-fixes

  Working beatmap background scaling fix

  Dean Herbert · 2016-11-06 14:41:28 +09:00
  49d170339b
• Background scaling different approach
  Maciej · 2016-11-06 04:37:41 +01:00
  bcc1d7c669
• Working beatmap background scaling fix

  Add a check for the working beatmap background width and assign a proper
  scaling value to cover the whole box

  Maciej · 2016-11-06 04:12:35 +01:00
  c4132339a6
• Add fallback texture of beatmap when getting null;
  Huo Yaoyuan · 2016-11-06 05:37:55 +08:00
  d63e3b6724
• Adjust visual behavior.
  Huo Yaoyuan · 2016-11-06 05:35:35 +08:00
  0c6825bb20
• Update framework.
  Huo Yaoyuan · 2016-11-06 05:33:44 +08:00
  2bd447ca56
• Update font size (*1.25) to follow the design image.
  Huo Yaoyuan · 2016-11-06 01:53:10 +08:00
  c53298a3b1
• Set font in music controller.
  Huo Yaoyuan · 2016-11-06 01:50:38 +08:00
  74000f77ad
• Async workflow on music controller.
  Huo Yaoyuan · 2016-11-06 00:46:09 +08:00
  a19bb1270d
• Set children in constructor.
  Huo Yaoyuan · 2016-11-06 00:24:03 +08:00
  859a59a8ab
• Update access of WorkingBeatmap.
  Huo Yaoyuan · 2016-11-06 00:13:45 +08:00
  5eed07db57
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-06 00:11:30 +08:00
  c470140d64
• Merge pull request #136 from Tom94/general-fixes

  Fix wrong initial state of beatmap panels.

  Dean Herbert · 2016-11-05 23:04:37 +09:00
  3c8f94dd0f
• Merge pull request #133 from peppy/hitcircle-revision-2

  Hitcircles v2

  Thomas Müller · 2016-11-05 14:50:35 +01:00
  945856b559
• Fix broken tests.
  Dean Herbert · 2016-11-05 22:48:32 +09:00
  cc140c9634
• Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
  Thomas Müller · 2016-11-05 14:05:42 +01:00
  7c7e2160ec
• Fix indentation and typo.
  Thomas Müller · 2016-11-05 13:51:52 +01:00
  619d97c642
• Merge pull request #135 from huoyaoyuan/thread-safety

  Add lock on each property of WorkingBeatmap.

  Dean Herbert · 2016-11-05 21:35:30 +09:00
  a859a90b56
• Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
  #	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

  Thomas Müller · 2016-11-05 13:35:15 +01:00
  07e74068e7
• Fix lock object.
  Huo Yaoyuan · 2016-11-05 20:21:08 +08:00
  e69dac7745
• Add lock on each property of WorkingBeatmap.
  Huo Yaoyuan · 2016-11-05 20:01:46 +08:00
  f2b37e1fe7
• Fix wrong initial state of beatmap panels.
  Thomas Müller · 2016-11-05 12:24:15 +01:00
  ba39a9df8e
• Merge pull request #134 from peppy/beatmap-backgrounds

  Add beatmap backgrounds to song select.

  Dean Herbert · 2016-11-05 20:12:39 +09:00
  223a9c6282
• Update framework.
  Dean Herbert · 2016-11-05 20:06:04 +09:00
  76e6931a59