24822 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'refs/remotes/ppy/master'
  Shawdooow · 2017-08-17 12:04:14 -04:00
  1f501dd73f
• Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations
  Shane Woolcock · 2017-08-17 23:28:26 +09:30
  df683d9114
• Merge pull request #1121 from peppy/settings-transition-fixes

  Visually improve settings transitions and back button

  Dean Herbert · 2017-08-17 21:18:21 +09:00
  4ad99a2464
• Merged ppy/master
  tgi74000 · 2017-08-17 13:01:42 +02:00
  dc31a0f0ac
• Changed Mods to be a property
  MrTheMake · 2017-08-17 12:24:22 +02:00
  586a652b08
• Update MainSettings.cs
  Dean Herbert · 2017-08-17 18:11:15 +09:00
  f459794665
• Remove unused DI retrieval
  Dean Herbert · 2017-08-17 17:47:55 +09:00
  58b1e9c954
• Fix regression causing global hotkeys to no longer work
  Dean Herbert · 2017-08-17 17:47:44 +09:00
  a44ff5a2c2
• Visually improve settings transitions and back button
  Dean Herbert · 2017-08-17 17:31:14 +09:00
  a19fc28cff
• Merge pull request #1119 from smoogipooo/fix-testcasehitobjects

  Fix hitobjects in TestCaseHitObjects not receiving actions

  Dean Herbert · 2017-08-17 13:40:18 +09:00
  18980bc26e
• Merge branch 'master' into fix-spinner-ignoring-actions
  Dan Balasescu · 2017-08-17 12:33:18 +09:00
  f7ccc81875
• Clear messages when the current channel is removed.

  - Stop using TabContainer.Children

  naoey · 2017-08-17 09:00:45 +05:30
  4f7ae1ed8b
• Fix hitobjects in TestCaseHitObjects not receiving actions.
  smoogipooo · 2017-08-17 12:16:33 +09:00
  cceeb864d5
• Merge branch 'master' into toolbar-button-swap
  Dan Balasescu · 2017-08-17 10:39:02 +09:00
  69a3251f61
• Merge pull request #1113 from Tom94/use-slider-step

  Use SliderStep instead of TestCaseSliderBar

  Dan Balasescu · 2017-08-17 09:47:11 +09:00
  166301fb2d
• Merge remote-tracking branch 'origin/master' into use-slider-step
  Thomas Müller · 2017-08-17 08:50:48 +09:00
  94d081064d
• Merge pull request #1118 from peppy/key-config-integration

  Integrate key configuration with settings overlay

  Thomas Müller · 2017-08-17 08:49:44 +09:00
  d031f4c101
• More localised key binding hover colour logic
  Thomas Müller · 2017-08-17 08:43:45 +09:00
  4ef1be3080
• Update framework
  Thomas Müller · 2017-08-17 07:28:07 +09:00
  118d0f0970
• Remove unnecessary usings
  Thomas Müller · 2017-08-17 07:26:24 +09:00
  55b159b976
• Use SliderStep instead of TestCaseSliderBar

  This greatly simplifies TestCaseKeyCounter and TestCaseHitObject and allows more future automation.

  Thomas Müller · 2017-08-17 07:26:24 +09:00
  8c05a40fbf
• Swap the order of the social and chat toolbar buttons
  MrTheMake · 2017-08-16 17:00:30 +02:00
  94d664a626
• Update framework
  Dean Herbert · 2017-08-16 23:22:12 +09:00
  c6c9c5431f
• Add basic back button
  Dean Herbert · 2017-08-16 23:20:18 +09:00
  0c19202b9a
• Fix potential nullref
  Dean Herbert · 2017-08-16 23:20:08 +09:00
  09089a3126
• Escape to cancel, again
  Dean Herbert · 2017-08-16 23:01:10 +09:00
  e64f455ff7
• Update with latest framework changes
  Dean Herbert · 2017-08-16 22:56:32 +09:00
  c41ba7b704
• Add null check for safety
  Dean Herbert · 2017-08-16 22:56:32 +09:00
  71f83dbdfa
• Integrate key binding config with main settings
  Dean Herbert · 2017-08-16 22:56:32 +09:00
  5ebec53970
• Remove usage of HideOnEscape
  Dean Herbert · 2017-08-16 22:56:32 +09:00
  7e21ddb5eb
• Merge pull request #1112 from peppy/key-config-settings

  Key configuration

  Thomas Müller · 2017-08-16 20:09:55 +09:00
  99c54e348c
• Merge branch 'master' into key-config-settings
  Thomas Müller · 2017-08-16 17:48:00 +09:00
  16372d9b45
• Merge pull request #1114 from peppy/fix-sidebar-click-expansion

  Cancel pending sidebar expansion when a button is clicked

  Thomas Müller · 2017-08-16 17:43:22 +09:00
  1610cfaa28
• Fix forgotten rename
  Dean Herbert · 2017-08-16 17:43:01 +09:00
  7e1fc47b76
• Code review fixes
  Dean Herbert · 2017-08-16 17:39:57 +09:00
  3df51540e1
• Use IntAction instead of new
  Dean Herbert · 2017-08-16 17:27:09 +09:00
  54698f2d8f
• Improve namespaces of key bindings
  Dean Herbert · 2017-08-16 17:24:01 +09:00
  dc82a88bb8
• Change spinner action checks to switches
  Shane Woolcock · 2017-08-16 17:51:57 +09:30
  b1abf83fee
• Cancel pending sidebar expansion when a button is clicked
  Dean Herbert · 2017-08-16 17:06:20 +09:00
  25a3835c3c
• Merge branch 'master' into fix-spinner-ignoring-actions
  Dean Herbert · 2017-08-16 17:00:53 +09:00
  ceead888b5
• Remove unnecessary OnMouseDown/Up from SpinnerDisc
  Shane Woolcock · 2017-08-16 17:25:48 +09:30
  9448e2f192
• Merge remote-tracking branch 'origin/is-alive' into key-config-settings
  Dean Herbert · 2017-08-16 15:49:43 +09:00
  89987229de
• Update framework
  Dean Herbert · 2017-08-16 13:24:40 +09:00
  7d00365154
• Fix some remaining usage of local InputManager instances
  Dean Herbert · 2017-08-16 13:07:18 +09:00
  a5007fc64f
• Update framework
  Dean Herbert · 2017-08-16 12:39:18 +09:00
  6ee4716ec5
• Merge remote-tracking branch 'upstream/master' into is-alive
  Dean Herbert · 2017-08-16 12:11:32 +09:00
  2c7f0629ef
• Code tidy-ups
  Dean Herbert · 2017-08-16 01:19:21 +09:00
  c221472d6e
• Use .Equals
  Dean Herbert · 2017-08-16 01:14:37 +09:00
  72eb082f91
• Add initial implementation of KeyConfiguration overlay
  Dean Herbert · 2017-08-16 00:17:33 +09:00
  9c75df884f
• Improve default key binding logic

  Defaults will be added to the database as long as the database has unbalanced counts for any actions.

  Dean Herbert · 2017-08-15 23:59:58 +09:00
  2bd0981738