19539 Commits

This Branch

This Branch

All Branches

• 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
• Merge branch 'master' into settings-footer-show-changelog-current-build
  Dean Herbert · 2019-06-04 11:04:30 +09:00
  c34de5a957
• 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
• Added close button and indictors of hotkeys to buttons
  Welsar55 · 2019-06-03 11:09:21 -05:00
  194bb80354
• 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
• Add missing file
  Dean Herbert · 2019-06-03 16:48:44 +09:00
  e32f62db5b
• Localise GridTestScene as an OsuGridTestScene
  Dean Herbert · 2019-06-03 16:45:18 +09:00
  17d04545fa
• Fix tests not ending execution after some exceptions
  Dean Herbert · 2019-06-03 16:42:27 +09:00
  491c9e96e0
• Fix editor regressions
  Dean Herbert · 2019-06-03 16:34:09 +09:00
  171fc14776
• Merge branch 'master' of https://github.com/ppy/osu
  Welsar55 · 2019-06-03 01:23:25 -05:00
  fa331fbee1
• Merge pull request #6 from ppy/master

  Sync fork up to date

  Nathan Alo · 2019-06-03 13:41:31 +08:00
  78f8157e2b
• Remove unused DI
  Dean Herbert · 2019-06-03 13:58:55 +09:00
  65e3b7c2ae
• Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build
  Dean Herbert · 2019-06-03 13:55:23 +09:00
  e55f5efa82
• Merge branch 'master' into osu-clickable-container
  Dean Herbert · 2019-06-03 13:55:08 +09:00
  cf9bc831ab
• Fix sizing of OsuAnimatedButton and OsuClickableContainer

  Was incorrect under some combinations of relative and autosize usage.

  Dean Herbert · 2019-06-03 13:53:24 +09:00
  3ef17a54f6
• Make clickable text actually a button
  Dean Herbert · 2019-06-03 13:38:06 +09:00
  4e5788959e
• Update test scene to support dynamic compilation
  Dean Herbert · 2019-06-03 13:37:29 +09:00
  b249fb3544
• Use a constant for lazer variables
  Dean Herbert · 2019-06-03 13:16:05 +09:00
  115a75e4c6
• Merge branch 'master' into more_button_update
  Dean Herbert · 2019-06-03 11:48:05 +09:00
  dff7053a07
• Merge branch 'master' into selection-update
  Dean Herbert · 2019-06-03 11:47:30 +09:00
  2d15e02406
• Disallow null references for dependencies loaded via load()
  Lucas A · 2019-06-02 15:17:03 +02:00
  d8f45f7299
• Resolve dependencies via Resolved Attribute
  Lucas A · 2019-06-02 12:40:18 +02:00
  0a867e37af
• Invert if statement
  Lucas A · 2019-06-01 08:46:38 +02:00
  58564579e4
• Allow dependencies to be null in certain cases (Unit tests)
  Lucas A · 2019-05-31 22:42:09 +02:00
  0625f51e65
• Show changelog for current build by clicking on settings footer in settings overlay.
  Lucas A · 2019-05-31 17:43:58 +02:00
  55c0c6a1bb
• Merge remote-tracking branch 'upstream/master' into user-status-wiring
  Lucas A · 2019-05-31 12:41:26 +02:00
  b3f6640d11
• 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