14784 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into editor-mask-placement
  Dean Herbert · 2018-10-31 06:46:48 +09:00
  b28c0cd128
• Merge pull request #3642 from smoogipoo/selection-mask-testcase

  Add testcases for selection masks

  Dean Herbert · 2018-10-31 06:28:08 +09:00
  6851696f63
• Merge branch 'master' into selection-mask-testcase
  Dean Herbert · 2018-10-31 06:14:33 +09:00
  7e88b8b457
• Merge pull request #3641 from smoogipoo/mask-separation

  Separate hitobject mask visuals from selection logic

  Dean Herbert · 2018-10-31 06:14:14 +09:00
  72d0b5b46b
• Merge branch 'master' into mask-separation
  Dean Herbert · 2018-10-31 05:59:07 +09:00
  5f5e30c378
• Merge pull request #3611 from plankp/reduce-handle-height

  Reduce height of song progress handle

  Dean Herbert · 2018-10-31 03:28:12 +09:00
  98633f02f3
• Proportionally adjust width in line with change
  Dean Herbert · 2018-10-31 02:56:25 +09:00
  6f1ef3243d
• Merge remote-tracking branch 'upstream/master' into reduce-handle-height
  Dean Herbert · 2018-10-31 02:55:38 +09:00
  4502fa39e9
• Leave bigger gap if replaying
  Paul Teng · 2018-10-30 08:32:12 -04:00
  4bc9161cd1
• Merge pull request #3135 from miterosan/Cakefy_osu!

  Use CakeBuild for building osu!

  Dean Herbert · 2018-10-30 17:18:43 +09:00
  8efe115cdd
• Merge branch 'master' into Cakefy_osu!
  Dean Herbert · 2018-10-30 00:48:54 -07:00
  701a1ecb00
• Fix post-merge conflict
  smoogipoo · 2018-10-30 16:47:39 +09:00
  71b6789136
• Merge remote-tracking branch 'origin/master' into mask-separation

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs

  smoogipoo · 2018-10-30 16:46:13 +09:00
  5712a52817
• Merge pull request #3654 from smoogipoo/separate-slider-body

  Separate snaking logic from base SliderBody

  Dean Herbert · 2018-10-30 00:28:52 -07:00
  517307f065
• Update framework
  Dean Herbert · 2018-10-30 00:10:34 -07:00
  0b534885b8
• Merge remote-tracking branch 'upstream/master' into separate-slider-body
  Dean Herbert · 2018-10-30 00:07:29 -07:00
  113f80570b
• Reword readme
  Dean Herbert · 2018-10-30 00:02:32 -07:00
  d173335b6d
• Fix weird code formatting
  Dean Herbert · 2018-10-30 00:01:19 -07:00
  b0ccd61480
• Merge pull request #3649 from qwewqa/mania-dual-fix

  Make mania dual stages mod properly apply two stages

  Dan Balasescu · 2018-10-30 13:44:00 +09:00
  2485621384
• Add type parameter to IApplicableToBeatmap
  Kyle Chang · 2018-10-30 00:13:33 -04:00
  6d00aff9fd
• Remove the framework settings. It is not used.
  miterosan · 2018-10-29 18:49:31 +01:00
  4d97b96705
• Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
  miterosan · 2018-10-29 18:45:53 +01:00
  ab276b5635
• Mention the bash script in the readme.
  miterosan · 2018-10-29 18:45:08 +01:00
  bf83c1eb6a
• Create a simple bootstrapper in the bash script language
  miterosan · 2018-10-29 18:42:35 +01:00
  ff47b2be7a
• Merge branch 'master' into Cakefy_osu!
  Dean Herbert · 2018-10-29 05:49:13 -07:00
  dbd5e6ea0e
• Update with slider body changes
  smoogipoo · 2018-10-29 15:25:20 +09:00
  9b19050faf
• Merge branch 'separate-slider-body' into editor-mask-placement

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs

  smoogipoo · 2018-10-29 15:24:15 +09:00
  619a0dfd59
• Fix SliderMask not working
  smoogipoo · 2018-10-29 15:17:45 +09:00
  dd5a3ad59c
• Separate slider body to bypass snaking logic

  The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.

  smoogipoo · 2018-10-29 15:15:29 +09:00
  86e09a68f7
• Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix
  Kyle Chang · 2018-10-29 00:16:29 -04:00
  8f5e495585
• Merge pull request #3650 from qwewqa/editor-mod-fix

  Fix mods being erroneously applied when entering editor from song select

  Dan Balasescu · 2018-10-29 13:15:36 +09:00
  30bf15ebf6
• Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
  Kyle Chang · 2018-10-29 00:04:51 -04:00
  c7e950af7f
• Remove unneeded using directive
  Kyle Chang · 2018-10-28 13:21:12 -04:00
  886dd0f0d4
• Make beatmap edit button reload beatmap without mods
  Kyle Chang · 2018-10-28 13:04:45 -04:00
  2b736c3cd6
• Stop transferring track when editing
  Kyle Chang · 2018-10-28 12:43:19 -04:00
  f8a8c7cb6b
• Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix
  Kyle Chang · 2018-10-28 12:02:18 -04:00
  8c4e08d280
• Merge pull request #3500 from smoogipoo/skinnable-spritetext

  Implement a skinnable SpriteText

  Dean Herbert · 2018-10-28 08:44:23 -07:00
  68044df29d
• Merge branch 'master' into skinnable-spritetext
  Dean Herbert · 2018-10-28 08:35:25 -07:00
  4f65d67e2b
• Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
  miterosan · 2018-10-28 13:15:08 +01:00
  cf41cc83dc
• Reference the build script in the README.
  miterosan · 2018-10-28 13:04:54 +01:00
  3a61594da4
• Merge branch 'master' into Cakefy_osu!
  miterosan · 2018-10-28 08:21:55 +01:00
  28c3b4a654
• Have dual stage mod apply changes to beatmap directly
  Kyle Chang · 2018-10-28 02:23:18 -04:00
  9b246f065c
• Add interface to adjust Beatmaps
  Kyle Chang · 2018-10-28 02:21:25 -04:00
  df6fc4013a
• Merge pull request #3632 from HoLLy-HaCKeR/fix-beatmap-details

  Fade MetadataSection back in if non-null Text is set

  Dan Balasescu · 2018-10-27 10:36:07 +09:00
  5b048d9a99
• Fade only textContainer instead of entire MetadataSection
  HoLLy · 2018-10-26 13:35:51 +02:00
  cf3b4447eb
• Increase placement testcase circlesize
  smoogipoo · 2018-10-26 15:36:09 +09:00
  951a309d04
• Make circle piece respond to hitobject scale
  smoogipoo · 2018-10-26 15:26:19 +09:00
  22c545ea8c
• Cleanup
  smoogipoo · 2018-10-26 15:26:08 +09:00
  4a507c66ee
• Merge branch 'mask-separation' into editor-mask-placement

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
  #	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
  #	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs

  smoogipoo · 2018-10-26 14:05:30 +09:00
  f674fcf2c8
• Add selection mask test cases
  smoogipoo · 2018-10-26 13:58:33 +09:00
  ce9b400c4c