75266 Commits

This Branch

This Branch

All Branches

• Merge pull request #160 from peppy/general-fixes

  Update framework.

  Dean Herbert · 2016-11-11 13:37:56 +09:00
  226d1aa0da
• Merge pull request #154 from peppy/sidebar-toolbar-coexistence

  Make options overlay coexist with toolbar.

  Dean Herbert · 2016-11-11 13:34:08 +09:00
  ff67b77c5b
• Merge pull request #151 from SirCmpwn/options-sidebar

  Expand the options sidebar on hover

  Dean Herbert · 2016-11-11 13:33:10 +09:00
  27542d9747
• Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence

  # Conflicts:
  #	osu.Game/OsuGame.cs

  Dean Herbert · 2016-11-11 13:30:57 +09:00
  a0e1513df6
• Update framework.
  Dean Herbert · 2016-11-11 13:28:51 +09:00
  d589542fc6
• Remove certain options when not running on Windows
  Drew DeVault · 2016-11-10 21:54:01 -05:00
  d36c8e9203
• Implement ShowUnicode option behavior
  Drew DeVault · 2016-11-10 21:35:58 -05:00
  d49b418449
• s/internalText/InternalText/g
  Drew DeVault · 2016-11-10 18:25:20 -05:00
  e2365cfad2
• Add TextBoxOption and wire it up
  Drew DeVault · 2016-11-10 18:17:15 -05:00
  a81f099d40
• Update to latest DI stuff
  Drew DeVault · 2016-11-10 17:40:42 -05:00
  0d4560a054
• Fix player loading from song select
  Drew DeVault · 2016-11-10 16:43:04 -05:00
  7327db307b
• Re-cache the new FontStore when overwritten

  Fixes issues with font loading

  Drew DeVault · 2016-11-10 16:43:04 -05:00
  2362665b8a
• Get the game running, though not perfectly
  Drew DeVault · 2016-11-10 16:42:29 -05:00
  fe9034323b
• Convert everything to DI pattern
  Drew DeVault · 2016-11-10 16:41:18 -05:00
  ee24cd310c
• Use DI for Player
  Drew DeVault · 2016-11-10 16:38:44 -05:00
  dc03f36793
• Introduce dependency injection
  Drew DeVault · 2016-11-10 16:38:25 -05:00
  19fd6fe249
• Merge pull request #103 from huoyaoyuan/music-controller

  Music controller

  Dean Herbert · 2016-11-10 12:54:56 +09:00
  788c11de10
• Fix checkbox not updating correctly.
  Dean Herbert · 2016-11-09 20:13:13 +09:00
  904d258dc3
• Give OptionsOverlay an offset to make up for toolbar possibly being present.
  Dean Herbert · 2016-11-09 15:24:27 +09:00
  a5dcae859c
• Re-organise overlay-level elements in OsuGame.
  Dean Herbert · 2016-11-09 15:24:24 +09:00
  d9bd3717d0
• Make OsuGameModes self-aware of if they want a toolbar or not.
  Dean Herbert · 2016-11-09 15:24:22 +09:00
  fdb83bed79
• Modify toolbar tooltips to be closer to design.
  Dean Herbert · 2016-11-09 15:24:19 +09:00
  9d1d5a5cea
• Add expanding options sidebar
  Drew DeVault · 2016-11-08 23:36:06 -05:00
  676cdc44b2
• Merge pull request #150 from SirCmpwn/options

  Wire up all of the boolean options

  Dean Herbert · 2016-11-09 13:24:18 +09:00
  d6dafd6b70
• Wire up all of the boolean options
  Drew DeVault · 2016-11-08 23:17:08 -05:00
  3ad633f363
• Merge pull request #149 from peppy/general-fixes

  Use margin instead of padding so mouseDown events on the sidebar butt…

  Dean Herbert · 2016-11-09 12:39:42 +09:00
  485f60b418
• Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling.
  Dean Herbert · 2016-11-09 12:32:38 +09:00
  04fa1f897e
• 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