15144 Commits

This Branch

This Branch

All Branches

• Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"

  This reverts commit 3e2e2a7000, reversing
  changes made to d94801b6c6.

  smoogipoo · 2018-11-19 17:52:31 +09:00
  bcdaee7d39
• Merge pull request #3735 from peppy/fix-hold-menu-disappearing

  Fix hold for menu button occasionally disappearing

  Dan Balasescu · 2018-11-19 12:24:41 +09:00
  11b13d1a5f
• Fix hold for menu button occasionally disappearing
  Dean Herbert · 2018-11-19 12:06:47 +09:00
  970ea928ae
• Merge pull request #3729 from UselessToucan/improve_hud_overlay_colour_setting

  Set AccentColour in concrete counters

  Dean Herbert · 2018-11-19 08:30:44 +09:00
  eb5cb44a60
• Merge branch 'master' into improve_hud_overlay_colour_setting
  Dean Herbert · 2018-11-19 08:14:51 +09:00
  72c9c66461
• Merge pull request #3699 from smoogipoo/fix-mask-disposal

  Use bindables for hitobject events

  Dean Herbert · 2018-11-18 22:42:21 +09:00
  5ec28c31ca
• Merge branch 'master' into fix-mask-disposal
  Dean Herbert · 2018-11-18 21:18:00 +09:00
  dd21daa635
• Set AccentColour and GlowColour in StandardHealthDisplay
  Roman Kapustin · 2018-11-16 19:30:58 +03:00
  ecf8a89f26
• Merge pull request #3688 from jorolf/flashlight-mod

  Add flashlight mod

  Dan Balasescu · 2018-11-16 18:57:14 +09:00
  974873f5b4
• Merge branch 'master' into flashlight-mod
  Dan Balasescu · 2018-11-16 18:45:15 +09:00
  57c1ddb1e0
• Update osu-resources
  smoogipoo · 2018-11-16 18:31:37 +09:00
  92b1c56aed
• Set AccentColour in concrete counters
  Roman Kapustin · 2018-11-15 23:37:21 +03:00
  37b19f78ae
• apply suggestions
  jorolf · 2018-11-15 17:38:38 +01:00
  80bd98bb9d
• 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
• remove unused using
  jorolf · 2018-11-15 00:45:27 +01:00
  f0f7b15edc
• Merge branch 'master' into flashlight-mod
  jorolf · 2018-11-15 00:35:42 +01:00
  41a0f9896e
• split shader, remove unnecessary clutter and fix some bugs
  jorolf · 2018-11-15 00:33:13 +01:00
  7d2958b7b0
• Fix SettingsTextBox having width of 0
  HoLLy · 2018-11-14 22:29:11 +01:00
  9dd3d28436
• Merge branch 'master' into fix-mask-disposal
  Dean Herbert · 2018-11-14 21:27:37 +09:00
  1501e05c04
• 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
• Fix post-merge issues
  smoogipoo · 2018-11-14 14:29:22 +09:00
  050af88be9
• Merge branch 'master' into fix-mania-selections
  Dean Herbert · 2018-11-14 14:24:45 +09:00
  1b2924ea4a
• Merge remote-tracking branch 'origin/master' into fix-mask-disposal

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
  #	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
  #	osu.Game.Rulesets.Osu/Objects/Slider.cs

  smoogipoo · 2018-11-14 14:03:25 +09:00
  29422345f7
• 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