5225 Commits

This Branch

This Branch

All Branches

• Merge https://github.com/ppy/osu into channel-selection
  DrabWeb · 2017-05-31 22:32:05 -03:00
  e7bf1e02cb
• Make the transition when chat is too tall and opening the channel selector smoother
  DrabWeb · 2017-05-31 22:29:52 -03:00
  6176f1d275
• Merge pull request #887 from peppy/increase-ipc-timeout

  Increase timeout in TestImportOverIPC

  Dan Balasescu · 2017-06-01 10:22:40 +09:00
  b8d070b29b
• Merge branch 'master' into increase-ipc-timeout
  Dan Balasescu · 2017-06-01 10:11:10 +09:00
  f29322e374
• Fix the channel selector not appearing if the chat is scaled up too tall then back down
  DrabWeb · 2017-05-31 22:08:25 -03:00
  d970430174
• Merge pull request #866 from ColdVolcano/storyboards

  Allow for variables in storyboards

  Dean Herbert · 2017-05-31 16:03:25 +09:00
  f59edd697c
• Merge branch 'master' into storyboards
  Dean Herbert · 2017-05-31 15:59:01 +09:00
  a5695aca1c
• Increase timeout in TestImportOverIPC

  Has been failing CI randomly, so let's increase the timeout a bit.

  Dean Herbert · 2017-05-31 15:51:52 +09:00
  0f59645e17
• Merge pull request #886 from DrabWeb/user-dropdown-arrow

  Fix user dropdown menu item chevron alignment

  Dean Herbert · 2017-05-31 15:44:17 +09:00
  013e9d5c69
• Merge branch 'master' into user-dropdown-arrow
  Dean Herbert · 2017-05-31 15:39:52 +09:00
  bab3f1b89a
• Text -> Label
  DrabWeb · 2017-05-31 02:03:13 -03:00
  cd57343191
• Fix user dropdown menu item chevron alignment
  DrabWeb · 2017-05-31 01:57:32 -03:00
  4fd7405fb8
• Merge pull request #882 from peppy/update-framework

  Update in line with framework

  Dan Balasescu · 2017-05-31 13:16:29 +09:00
  2c438e6a8e
• Merge branch 'master' into update-framework
  Dan Balasescu · 2017-05-31 13:01:17 +09:00
  d90006b229
• Merge pull request #838 from MrTheMake/playsongselect-exit-fix

  Unregister OnBeatmapChanged() when exiting song selection

  Dean Herbert · 2017-05-31 11:31:12 +09:00
  9a40470298
• Merge branch 'master' into playsongselect-exit-fix
  Dean Herbert · 2017-05-31 11:14:41 +09:00
  40312080f7
• Add issue URL to comment
  Dean Herbert · 2017-05-31 11:04:18 +09:00
  61fb5d6ac8
• Add comment
  Dean Herbert · 2017-05-31 11:02:26 +09:00
  b61452024a
• Update in line with framework
  Dean Herbert · 2017-05-30 22:23:51 +09:00
  8544b45443
• Remove key/val in favor of local variables + method call.
  smoogipooo · 2017-05-30 20:59:53 +09:00
  223c75327f
• Back to using val...
  smoogipooo · 2017-05-30 20:37:30 +09:00
  5b5c2e4717
• Fixes + cleanup.
  smoogipooo · 2017-05-30 20:26:39 +09:00
  0728aea6a4
• Merge branch 'master' into storyboards
  Dan Balasescu · 2017-05-30 19:53:44 +09:00
  fe68e1b1af
• val -> value, val -> line (in cases where a key is not used).
  smoogipooo · 2017-05-30 19:52:43 +09:00
  93a33be596
• Cleanups.
  smoogipooo · 2017-05-30 19:52:21 +09:00
  0175b91927
• Redundant parentheses
  DrabWeb · 2017-05-29 22:22:14 -03:00
  2edbf64d69
• Hook up to channel selector tab item
  DrabWeb · 2017-05-29 22:10:07 -03:00
  96efa5a240
• Merge https://github.com/ppy/osu into channel-selection
  DrabWeb · 2017-05-29 22:06:05 -03:00
  b9292b6240
• Merge pull request #786 from Jorolf/channel-selector-tab-item

  Add an "Add new channel" tab

  Dean Herbert · 2017-05-30 10:05:26 +09:00
  03ac700838
• Channel list item hover effect
  DrabWeb · 2017-05-29 22:04:53 -03:00
  2ba86cffa6
• Better scroll dragger position
  DrabWeb · 2017-05-29 22:00:15 -03:00
  d8e86da78c
• Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item
  Dean Herbert · 2017-05-30 09:54:35 +09:00
  e91a3f06f1
• User a simpler method to hide the background icon
  Dean Herbert · 2017-05-30 09:54:29 +09:00
  fde579262f
• Show scroll dragger
  DrabWeb · 2017-05-29 21:50:15 -03:00
  d29bf58817
• Make the channel selection overlay hide/resize with chat
  DrabWeb · 2017-05-29 21:23:03 -03:00
  745e2e5e18
• Merge pull request #879 from Tom94/fix-triangle-smoothness

  Fix triangle smoothness and optimize further

  Dean Herbert · 2017-05-30 09:15:09 +09:00
  751e954735
• Merge branch 'master' into fix-triangle-smoothness
  Dean Herbert · 2017-05-30 08:58:05 +09:00
  b8461cd02d
• Update with framework changes
  DrabWeb · 2017-05-29 20:33:28 -03:00
  50e50ce67e
• Merge https://github.com/ppy/osu into channel-selection
  DrabWeb · 2017-05-29 20:31:35 -03:00
  21a8071293
• Structure velocity code more clearly and avoid redundant parenthesis
  Thomas Müller · 2017-05-29 19:08:06 +02:00
  298c0f5757
• Reduce per-triangle per-frame computation significantly
  Thomas Müller · 2017-05-29 18:30:49 +02:00
  db444a61cb
• Fix incorrect triangle state within the first frame
  Thomas Müller · 2017-05-29 18:24:17 +02:00
  d3f2d480a8
• Make triangle edges smooth again
  Thomas Müller · 2017-05-29 18:20:51 +02:00
  2f063ee41d
• Merge pull request #873 from smoogipooo/mania-judgements

  Mania judgements

  Dean Herbert · 2017-05-29 22:06:59 +09:00
  v2017.529.0 cf540a60a2
• Merge branch 'master' into mania-judgements
  Dean Herbert · 2017-05-29 21:31:48 +09:00
  476526714d
• Merge pull request #876 from smoogipooo/mania-barlines

  Mania barlines

  Dean Herbert · 2017-05-29 21:31:00 +09:00
  efab2296e1
• Merge branch 'master' into mania-barlines
  Dean Herbert · 2017-05-29 20:36:50 +09:00
  a0c542f461
• Merge pull request #877 from smoogipooo/mania-holdnote-input

  Fix hold note samples not being set correctly for mania-specific beatmaps.

  Dean Herbert · 2017-05-29 18:34:23 +09:00
  d1f32cfbf0
• Merge branch 'master' into mania-holdnote-input
  Dean Herbert · 2017-05-29 18:20:31 +09:00
  fe3e8b146f
• Merge pull request #864 from Jorolf/better-multimod-animation

  Improve animation when rotating between available mods

  Dean Herbert · 2017-05-29 18:20:22 +09:00
  1f247bf213