15122 Commits

This Branch

This Branch

All Branches

• Set AccentColour and GlowColour in StandardHealthDisplay
  Roman Kapustin · 2018-11-16 19:30:58 +03:00
  ecf8a89f26
• Set AccentColour in concrete counters
  Roman Kapustin · 2018-11-15 23:37:21 +03:00
  37b19f78ae
• Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle

  Return to large logo after idle period

  Dan Balasescu · 2018-11-15 15:40:15 +09:00
  3e2e2a7000
• Merge branch 'master' into return_to_large_logo_after_idle
  Dan Balasescu · 2018-11-15 15:16:10 +09:00
  e8f34ddff0
• Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox

  Fix SettingsTextBox having width of 0

  Dan Balasescu · 2018-11-15 12:15:11 +09:00
  d94801b6c6
• Fix SettingsTextBox having width of 0
  HoLLy · 2018-11-14 22:29:11 +01:00
  9dd3d28436
• Merge pull request #3719 from smoogipoo/dropdown-updates

  Update with osu!-side dropdown changes

  Dean Herbert · 2018-11-14 21:27:16 +09:00
  92adcb7613
• Correct framework version
  Dean Herbert · 2018-11-14 21:16:08 +09:00
  caaa5645e3
• Merge remote-tracking branch 'upstream/master' into dropdown-updates
  Dean Herbert · 2018-11-14 20:03:45 +09:00
  30547ac064
• Merge pull request #3686 from peppy/hold-for-menu-back

  Require holding back button to quit gameplay

  Dan Balasescu · 2018-11-14 19:32:24 +09:00
  287d7043f8
• Use SkinInfo directly
  smoogipoo · 2018-11-14 19:29:20 +09:00
  f1f2fc133a
• Merge branch 'master' into hold-for-menu-back
  Dan Balasescu · 2018-11-14 19:13:07 +09:00
  81a3170e3b
• Merge pull request #3714 from smoogipoo/placement-hiding

  Hide the placement blueprint when cursor is outside the playfield

  Dean Herbert · 2018-11-14 18:54:26 +09:00
  e34881c2c0
• Merge branch 'master' into hold-for-menu-back
  Dan Balasescu · 2018-11-14 18:35:08 +09:00
  61a62a4eae
• Merge remote-tracking branch 'origin/master' into placement-hiding
  smoogipoo · 2018-11-14 18:34:45 +09:00
  4b86c29f7b
• Reduce chaining
  smoogipoo · 2018-11-14 18:34:13 +09:00
  c963fc7cd2
• Merge pull request #3708 from smoogipoo/add-mania-selection-testcase

  Add mania selection blueprint testcases

  Dean Herbert · 2018-11-14 18:28:30 +09:00
  996e51db11
• Merge branch 'master' into hold-for-menu-back
  Dan Balasescu · 2018-11-14 18:22:34 +09:00
  e9b47c6233
• Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
  Dean Herbert · 2018-11-14 18:11:53 +09:00
  a83efe225e
• Merge pull request #3710 from smoogipoo/notepieces

  Separate note selection mask into a note piece

  Dean Herbert · 2018-11-14 18:11:07 +09:00
  9e24266934
• Update with osu!-side dropdown changes
  smoogipoo · 2018-11-14 18:02:38 +09:00
  aff5fa6169
• Merge branch 'master' into notepieces
  Dean Herbert · 2018-11-14 17:30:39 +09:00
  3fbabdfed2
• Merge pull request #3707 from smoogipoo/more-global-scrollalgo

  Move scroll algorithm to a more global location

  Dean Herbert · 2018-11-14 17:27:32 +09:00
  635c1bf833
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 17:15:24 +09:00
  a1dd1057ce
• Merge branch 'master' into placement-hiding
  Dean Herbert · 2018-11-14 16:59:41 +09:00
  84d16ee71b
• Merge pull request #3694 from smoogipoo/fix-mania-selections

  Fix mania selection blueprint sizing

  Dean Herbert · 2018-11-14 16:59:26 +09:00
  4a28d66d2d
• Merge pull request #2371 from miterosan/Private_Messages

  Add framework for private messaging support

  Dan Balasescu · 2018-11-14 15:43:46 +09:00
  4fbad65e3d
• Implement interface
  smoogipoo · 2018-11-14 15:33:09 +09:00
  7274908059
• Merge branch 'master' into fix-mania-selections
  Dean Herbert · 2018-11-14 14:24:45 +09:00
  1b2924ea4a
• Merge remote-tracking branch 'upstream/master' into Private_Messages
  Dean Herbert · 2018-11-14 13:59:17 +09:00
  fb22fc11f6
• More refactors
  Dean Herbert · 2018-11-14 13:59:02 +09:00
  9a9d5e60af
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:54:53 +09:00
  2ae139d260
• Merge pull request #3709 from smoogipoo/scrollalgorithm-timeat

  Implement IScrollAlgorithm.TimeAt()

  Dean Herbert · 2018-11-14 13:50:48 +09:00
  5c66547c18
• Merge branch 'master' into scrollalgorithm-timeat
  Dean Herbert · 2018-11-14 13:32:16 +09:00
  34973a3e9f
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:32:14 +09:00
  8b190edde0
• Merge pull request #3706 from smoogipoo/no-drawable-speedchangevis

  Make scroll algorithms not tied to drawable hitobjects

  Dean Herbert · 2018-11-14 13:31:35 +09:00
  1b936dfc17
• Merge branch 'master' into no-drawable-speedchangevis
  Dean Herbert · 2018-11-14 13:22:01 +09:00
  8d59b7299f
• Refactors
  Dean Herbert · 2018-11-14 13:19:51 +09:00
  c4769f6802
• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-11-14 12:49:54 +09:00
  396a5b3cd0
• Merge pull request #3671 from gotopie/hide-seekbar-with-no-song

  Hide seekbar when no song is playing

  Dean Herbert · 2018-11-14 12:16:42 +09:00
  059f1d9bcb
• Fix brackets
  Dean Herbert · 2018-11-14 12:05:07 +09:00
  b9278b3488
• Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
  Dean Herbert · 2018-11-14 11:53:43 +09:00
  161d476091
• Merge conditionals
  Dean Herbert · 2018-11-14 11:53:34 +09:00
  c77412992e
• Merge branch 'master' into no-drawable-speedchangevis
  Dean Herbert · 2018-11-13 19:42:04 +09:00
  3caf0cb0d9
• Merge branch 'master' into fix-mania-selections
  Dean Herbert · 2018-11-13 18:33:53 +09:00
  da3c4bc050
• Merge pull request #3704 from smoogipoo/immutable-sliderpath

  Make SliderPath immutable

  Dean Herbert · 2018-11-13 18:27:36 +09:00
  7a918b06d9
• Merge branch 'master' into immutable-sliderpath
  Dean Herbert · 2018-11-13 18:06:14 +09:00
  e7d984415b
• Add support for creating new PM conversations
  Dean Herbert · 2018-11-13 17:24:11 +09:00
  72ae22b0c4
• Fix testcase
  Dean Herbert · 2018-11-13 15:36:36 +09:00
  82ebc74eee
• Add back support for new API and private messages
  Dean Herbert · 2018-11-13 15:20:59 +09:00
  f241fcdba1