18708 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into hold-to-confirm-dim-volume
  Dan Balasescu · 2019-06-06 15:41:49 +09:00
  032ed033d0
• Merge pull request #4926 from peppy/databased-sin-setting

  Add skin settings to database

  Dan Balasescu · 2019-06-06 15:33:27 +09:00
  85ea650643
• Use manual migration
  Dean Herbert · 2019-06-06 13:33:30 +09:00
  02283380c4
• Merge remote-tracking branch 'upstream/master' into databased-sin-setting
  Dean Herbert · 2019-06-05 19:03:57 +09:00
  8607f3b765
• Test github "funding" button
  Dean Herbert · 2019-06-04 22:26:11 +09:00
  e9c4b521af
• Merge pull request #4909 from peppy/abstract-osu-button

  Mark OsuButton as abstract

  Dan Balasescu · 2019-06-04 22:23:53 +09:00
  9d6df33204
• Mark OsuButton as abstract

  Not being used directly, so we probably shouldn't support it for now.

  Dean Herbert · 2019-06-04 22:12:55 +09:00
  2e3d392a9f
• Fix incorrect testcase assertion (#4908)

  Fix incorrect testcase assertion

  Dean Herbert · 2019-06-04 21:54:08 +09:00
  6ba4dde983
• Fix incorrect assertion
  smoogipoo · 2019-06-04 19:25:34 +09:00
  ff647940ca
• Dim music volume when holding to confirm
  Dean Herbert · 2019-06-04 18:37:26 +09:00
  7d2a75b350
• Merge pull request #4873 from peppy/audio-refactor-update

  Update osu! in line with audio subsystem refactor

  Dan Balasescu · 2019-06-04 12:18:58 +09:00
  76474987ef
• Fix blueprint tests crashing due to out-of-order operations
  Dean Herbert · 2019-06-04 12:08:23 +09:00
  b8fc535124
• Merge remote-tracking branch 'upstream/master' into audio-refactor-update
  Dean Herbert · 2019-06-04 12:08:21 +09:00
  80a66b8b3a
• Cleanups
  smoogipoo · 2019-06-04 11:25:18 +09:00
  4763a41c7e
• Fix tests potentially loading tracks upon disposal (#4899)

  Fix tests potentially loading tracks upon disposal
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-06-04 11:17:54 +09:00
  3a187c2d5e
• Update framework
  smoogipoo · 2019-06-04 11:13:21 +09:00
  474191fcec
• Merge branch 'master' into fix-endless-tests
  Dan Balasescu · 2019-06-04 11:07:50 +09:00
  6e79e374e2
• Update with further framework-side changes
  smoogipoo · 2019-06-04 11:04:28 +09:00
  cea353975f
• Update 'ShowMore' button in line with the web version (#4875)

  Update 'ShowMore' button in line with the web version
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-04 10:51:01 +09:00
  5096aaa6f4
• Merge remote-tracking branch 'origin/master' into audio-refactor-update
  smoogipoo · 2019-06-04 10:50:33 +09:00
  53a39e9142
• Add proper tests
  Dean Herbert · 2019-06-04 10:26:35 +09:00
  a5a025de68
• Better handle OnClick
  Dean Herbert · 2019-06-04 10:26:21 +09:00
  e8315085c0
• Fix endless loading state part 2
  EVAST9919 · 2019-06-04 04:04:33 +03:00
  d5a2ebf79f
• Fix endless loading state
  EVAST9919 · 2019-06-04 02:06:15 +03:00
  2c71371282
• Adjust colors to match web design
  EVAST9919 · 2019-06-04 01:47:45 +03:00
  fe6b4112c6
• Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update
  EVAST9919 · 2019-06-04 01:32:12 +03:00
  7e96ff7f14
• Merge branch 'master' into fix-endless-tests
  Dean Herbert · 2019-06-04 00:50:18 +09:00
  167213d3eb
• Merge pull request #4900 from LeNitrous/fix-self-private-channel

  Disallow user from opening their own private channel.

  Dean Herbert · 2019-06-04 00:49:39 +09:00
  808393a878
• don't create "Start Chat" option when the sender is the local user
  LeNitrous · 2019-06-03 18:54:29 +08:00
  516575a132
• disallow current user from opening their own private channel
  LeNitrous · 2019-06-03 17:25:19 +08:00
  4e6d7137aa
• Don't handle clicks when in a loading state
  Dean Herbert · 2019-06-03 17:10:33 +09:00
  633c3b74ec
• Shorten fade duration
  Dean Herbert · 2019-06-03 17:10:33 +09:00
  c4f4f32db8
• Add sample action to test so hover effect is visible
  Dean Herbert · 2019-06-03 17:10:33 +09:00
  1eab4e179d
• Fix tests not ending execution after some exceptions
  Dean Herbert · 2019-06-03 16:42:27 +09:00
  491c9e96e0
• Merge pull request #6 from ppy/master

  Sync fork up to date

  Nathan Alo · 2019-06-03 13:41:31 +08:00
  78f8157e2b
• Merge branch 'master' into more_button_update
  Dean Herbert · 2019-06-03 11:48:05 +09:00
  dff7053a07
• Prevent logo idle state from being updated incorrectly (#4882)

  Prevent logo idle state from being updated incorrectly
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-31 19:04:15 +09:00
  1c96e7593a
• Merge branch 'master' into logo-idle
  Dean Herbert · 2019-05-31 18:50:28 +09:00
  32a2aba631
• Changelog overlay (#3074)

  Changelog overlay

  Dean Herbert · 2019-05-31 15:08:08 +09:00
  e017350b80
• Merge branch 'master' into audio-refactor-update
  Dean Herbert · 2019-05-31 14:58:53 +09:00
  b20ea93906
• Tidy up WaveformTestBeatmap
  Dean Herbert · 2019-05-31 14:57:11 +09:00
  7bed4eb23b
• Pass individual components to DummyWorkingBeatmap, not game
  Dean Herbert · 2019-05-31 14:51:12 +09:00
  b52276c489
• Centralise and update WorkingBeatmap creation in test cases
  Dean Herbert · 2019-05-31 14:40:53 +09:00
  f33a5bc54c
• Update resource stores with GetAvailableResources
  Dean Herbert · 2019-05-31 14:33:18 +09:00
  80d65f9a3b
• More disposal?
  Dean Herbert · 2019-05-31 14:28:53 +09:00
  1629534a0c
• Prevent idle state from being updated incorrectly
  David Zhao · 2019-05-31 14:06:18 +09:00
  465aa4e0f6
• General refactoring
  smoogipoo · 2019-05-31 13:54:40 +09:00
  d7ccf939d8
• Fix size of release stream separator in listing
  smoogipoo · 2019-05-31 13:53:55 +09:00
  e7ae9c249f
• Add comment + fix spinlocking
  smoogipoo · 2019-05-31 13:38:48 +09:00
  57d648df6d
• Fix overlay group + depth
  smoogipoo · 2019-05-31 13:23:50 +09:00
  4dc77d64a3