5270 Commits

This Branch

This Branch

All Branches

• Fix namespaces and class names
  Dean Herbert · 2017-06-05 16:47:42 +09:00
  af6f8bbd89
• Fix lots of small issues
  Dean Herbert · 2017-06-05 16:43:23 +09:00
  c3c56820fa
• Merge remote-tracking branch 'upstream/master' into ingame_options
  Dean Herbert · 2017-06-05 14:53:37 +09:00
  0cb1df35e9
• Merge pull request #896 from Tom94/separate-skip

  Move skip button into its own test, because it is no longer two-layered

  Dan Balasescu · 2017-06-05 12:10:37 +09:00
  a36148e57c
• Merge branch 'master' into separate-skip
  Dan Balasescu · 2017-06-05 11:58:53 +09:00
  04c5fed1ad
• Merge pull request #890 from peppy/async-channel-load

  Load initial channel content asynchronously

  Dan Balasescu · 2017-06-05 10:16:06 +09:00
  1cf10263cb
• Merge branch 'master' into async-channel-load
  Dan Balasescu · 2017-06-05 10:02:01 +09:00
  6bda62f260
• Merge pull request #883 from Shawdooow/Daycore

  Mod Suggestion: Daycore

  Dan Balasescu · 2017-06-05 09:50:01 +09:00
  d28e8a4b51
• Change to fa_question for now, pending flyte redesign.
  smoogipooo · 2017-06-05 09:40:22 +09:00
  52bb2df69b
• Merge branch 'master' into Daycore
  Dan Balasescu · 2017-06-05 09:33:30 +09:00
  d6a1205d08
• Remove unused using
  Thomas Müller · 2017-06-03 20:05:51 +02:00
  0afb188cde
• Merge branch 'master' into separate-skip
  Thomas Müller · 2017-06-03 17:45:57 +02:00
  04925594ca
• Trim whitespace
  Thomas Müller · 2017-06-03 17:45:44 +02:00
  d498a4a022
• Merge pull request #895 from Jorolf/framework-tooltips

  update osu to use the framework's TooltipContainer

  Thomas Müller · 2017-06-03 17:34:43 +02:00
  3b987e35c9
• Move skip button into its own test, because it is no longer two-layered
  Thomas Müller · 2017-06-03 17:33:24 +02:00
  8cd2f509ef
• Remove unnecessary usings
  Thomas Müller · 2017-06-03 17:29:20 +02:00
  2c5979ea8a
• Remove TestCaseTooltip
  Thomas Müller · 2017-06-03 17:28:34 +02:00
  3daae480d2
• Fix compile error
  Thomas Müller · 2017-06-03 17:17:56 +02:00
  9c6ce230bc
• Update framework
  Thomas Müller · 2017-06-03 17:01:21 +02:00
  b2bbf65e39
• Fix incorrect proportions of menu cursor
  Thomas Müller · 2017-06-03 16:34:00 +02:00
  50158a1cd2
• update osu to use the framework's TooltipContainer
  Jorolf · 2017-06-03 14:50:35 +02:00
  a43890ffb4
• Load initial channel content asynchronously

  Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.

  Dean Herbert · 2017-06-01 18:29:34 +09:00
  5b80c8ac49
• Merge pull request #888 from Drenata/random-selection-alternatives

  Add alternative for random beatmap selection

  Dean Herbert · 2017-06-01 18:04:31 +09:00
  900e3ce3e2
• Merge branch 'master' into random-selection-alternatives
  Dean Herbert · 2017-06-01 17:58:15 +09:00
  2025eee8eb
• Changed default selection type and added suggestions from PR feedback
  Patrick Andersson · 2017-06-01 08:54:48 +02:00
  94294e4b45
• 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
• Added suggestions by code inspector
  Patrick Andersson · 2017-05-31 22:04:29 +02:00
  a3945bb11d
• Trim whitespace
  Patrick Andersson · 2017-05-31 20:31:05 +02:00
  9592e9778b
• Add alternative for random beatmap selection

  "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button

  Patrick Andersson · 2017-05-31 20:11:26 +02:00
  1dd85b5986
• 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
• Merge branch 'master' of https://github.com/ppy/osu into ingame_options
  EVAST9919 · 2017-05-31 08:23:06 +03:00
  8cde50a88a
• 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
• change mania multiplier
  Shawdooow · 2017-05-30 13:27:10 -04:00
  cb5fcf2572
• Daycore mod
  Shawdooow · 2017-05-30 12:49:06 -04:00
  ecc0d0b11c
• 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