19539 Commits

This Branch

This Branch

All Branches

• Merge pull request #147 from peppy/options-fixes

  Options: Fix paddings, transitions, const variable names.

  Dean Herbert · 2016-11-09 12:20:15 +09:00
  f1395b8408
• Update framework.
  Dean Herbert · 2016-11-09 12:15:15 +09:00
  b2291ed615
• Don't derive ScrollContainer unnecessarily.
  Dean Herbert · 2016-11-09 12:10:22 +09:00
  d41d7b8e9a
• Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes
  Dean Herbert · 2016-11-09 11:41:36 +09:00
  d70e8806b4
• Merge pull request #148 from peppy/generic-container

  Generic containers.

  Dean Herbert · 2016-11-09 11:33:58 +09:00
  fe843edc4e
• Update framework.
  Dean Herbert · 2016-11-09 08:00:44 +09:00
  2cbb74a2b8
• Remove unused constant.
  Dean Herbert · 2016-11-08 20:35:21 +09:00
  28a94e2df1
• Fix paddings, transitions, const variable names.
  Dean Herbert · 2016-11-08 20:23:18 +09:00
  3ef26a6bf0
• Ctrl+O for options.
  Dean Herbert · 2016-11-08 19:27:37 +09:00
  97f3023cd9
• Move OptionsOverlay to OsuGame.
  Dean Herbert · 2016-11-08 19:26:12 +09:00
  4426a683ed
• Handle sidebar buttons onClick not onMouseDown.
  Dean Herbert · 2016-11-08 19:18:31 +09:00
  89b11ed099
• OptionsSideNav -> OptionsSidebar.
  Dean Herbert · 2016-11-08 19:17:09 +09:00
  8c68f9ba93
• Max sidebar draggable.
  Dean Herbert · 2016-11-08 19:16:39 +09:00
  3b0114671e
• Use preload for options (fix icons).
  Dean Herbert · 2016-11-08 18:49:20 +09:00
  30323876a8
• Updates.
  Dean Herbert · 2016-11-08 18:33:31 +09:00
  a851d7b44f
• Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container
  Dean Herbert · 2016-11-08 18:29:21 +09:00
  c36b54b35a
• Merge pull request #146 from SirCmpwn/options-wired-up

  Wire up one of the settings to the config

  Dean Herbert · 2016-11-08 12:39:47 +09:00
  53d1798dee
• Wire up alternative chat font
  Drew DeVault · 2016-11-07 22:37:21 -05:00
  743c1bde58
• Wire up one of the settings to the config

  One step at a time, right

  Drew DeVault · 2016-11-07 22:36:24 -05:00
  1bca78f4b6
• Merge pull request #131 from SirCmpwn/options

  Implement scrolling to each section of options

  Dean Herbert · 2016-11-08 12:33:25 +09:00
  42102f7378
• Remove unnecessary TODO
  Drew DeVault · 2016-11-07 22:28:02 -05:00
  fbbd05e606
• Say NO to RelativeSizeAxes = Both
  Drew DeVault · 2016-11-07 22:19:02 -05:00
  a6593505b3
• Rearrange some options a bit, update framework
  Drew DeVault · 2016-11-07 22:15:48 -05:00
  4d04eb6fb1
• Remove unused using statements
  Drew DeVault · 2016-11-07 21:28:06 -05:00
  cbbac0565f
• Rearrange options namespaces
  Drew DeVault · 2016-11-07 21:24:41 -05:00
  1ce6a7285a
• Refactor how the sidebar buttons are created/used
  Drew DeVault · 2016-11-07 18:04:49 -05:00
  b2bbdfa284
• Implement scrolling to each section
  Drew DeVault · 2016-11-07 17:07:55 -05:00
  e6c3fc1091
• More robust metadata handling.
  Huo Yaoyuan · 2016-11-07 23:12:49 +08:00
  ef5968e243
• Fix corner case when shuffling.
  Huo Yaoyuan · 2016-11-07 23:06:14 +08:00
  fd977cacb3
• 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