Dean Herbert
|
72d0b5b46b
|
Merge pull request #3641 from smoogipoo/mask-separation
Separate hitobject mask visuals from selection logic
|
2018-10-31 06:14:14 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
98633f02f3
|
Merge pull request #3611 from plankp/reduce-handle-height
Reduce height of song progress handle
|
2018-10-31 03:28:12 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
Dean Herbert
|
8efe115cdd
|
Merge pull request #3135 from miterosan/Cakefy_osu!
Use CakeBuild for building osu!
|
2018-10-30 17:18:43 +09:00 |
|
Dean Herbert
|
701a1ecb00
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-30 00:48:54 -07:00 |
|
smoogipoo
|
71b6789136
|
Fix post-merge conflict
|
2018-10-30 16:47:39 +09:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
Dean Herbert
|
517307f065
|
Merge pull request #3654 from smoogipoo/separate-slider-body
Separate snaking logic from base SliderBody
|
2018-10-30 00:28:52 -07:00 |
|
Dean Herbert
|
0b534885b8
|
Update framework
|
2018-10-30 00:10:34 -07:00 |
|
Dean Herbert
|
113f80570b
|
Merge remote-tracking branch 'upstream/master' into separate-slider-body
|
2018-10-30 00:07:29 -07:00 |
|
Dean Herbert
|
d173335b6d
|
Reword readme
|
2018-10-30 00:02:32 -07:00 |
|
Dean Herbert
|
b0ccd61480
|
Fix weird code formatting
|
2018-10-30 00:01:19 -07:00 |
|
Dan Balasescu
|
2485621384
|
Merge pull request #3649 from qwewqa/mania-dual-fix
Make mania dual stages mod properly apply two stages
|
2018-10-30 13:44:00 +09:00 |
|
Kyle Chang
|
6d00aff9fd
|
Add type parameter to IApplicableToBeatmap
|
2018-10-30 00:13:33 -04:00 |
|
miterosan
|
4d97b96705
|
Remove the framework settings. It is not used.
|
2018-10-29 18:49:31 +01:00 |
|
miterosan
|
ab276b5635
|
Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
|
2018-10-29 18:45:53 +01:00 |
|
miterosan
|
bf83c1eb6a
|
Mention the bash script in the readme.
|
2018-10-29 18:45:08 +01:00 |
|
miterosan
|
ff47b2be7a
|
Create a simple bootstrapper in the bash script language
|
2018-10-29 18:42:35 +01:00 |
|
Dean Herbert
|
dbd5e6ea0e
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-29 05:49:13 -07:00 |
|
smoogipoo
|
dd5a3ad59c
|
Fix SliderMask not working
|
2018-10-29 15:17:45 +09:00 |
|
smoogipoo
|
86e09a68f7
|
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.
|
2018-10-29 15:15:29 +09:00 |
|
Kyle Chang
|
8f5e495585
|
Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix
|
2018-10-29 00:16:29 -04:00 |
|
Dan Balasescu
|
30bf15ebf6
|
Merge pull request #3650 from qwewqa/editor-mod-fix
Fix mods being erroneously applied when entering editor from song select
|
2018-10-29 13:15:36 +09:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
Kyle Chang
|
8c4e08d280
|
Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix
|
2018-10-28 12:02:18 -04:00 |
|
Dean Herbert
|
68044df29d
|
Merge pull request #3500 from smoogipoo/skinnable-spritetext
Implement a skinnable SpriteText
|
2018-10-28 08:44:23 -07:00 |
|
Dean Herbert
|
4f65d67e2b
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-28 08:35:25 -07:00 |
|
miterosan
|
cf41cc83dc
|
Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
|
2018-10-28 13:15:08 +01:00 |
|
miterosan
|
3a61594da4
|
Reference the build script in the README.
|
2018-10-28 13:04:54 +01:00 |
|
miterosan
|
28c3b4a654
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-28 08:21:55 +01:00 |
|
Kyle Chang
|
9b246f065c
|
Have dual stage mod apply changes to beatmap directly
|
2018-10-28 02:23:18 -04:00 |
|
Kyle Chang
|
df6fc4013a
|
Add interface to adjust Beatmaps
|
2018-10-28 02:21:25 -04:00 |
|
Dan Balasescu
|
5b048d9a99
|
Merge pull request #3632 from HoLLy-HaCKeR/fix-beatmap-details
Fade MetadataSection back in if non-null Text is set
|
2018-10-27 10:36:07 +09:00 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
smoogipoo
|
ea3c960b5b
|
Mask -> Piece for components
|
2018-10-26 13:51:03 +09:00 |
|
smoogipoo
|
9656186b64
|
Make the hitobject masks move within their placement/selection
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
|
2018-10-26 13:45:31 +09:00 |
|
smoogipoo
|
4051864bb4
|
Re-namespace
|
2018-10-26 13:39:19 +09:00 |
|
smoogipoo
|
e1db2bbc25
|
Split visuals of HitCircleSelectionMask into HitCircleMask
|
2018-10-26 13:31:44 +09:00 |
|
smoogipoo
|
677d0d4a19
|
Renamespace ruleset masks
|
2018-10-26 13:31:38 +09:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
Dean Herbert
|
6019d9e57b
|
Merge pull request #3629 from peppy/update-search-api
Update beatmap search API to match latest osu-web structure
|
2018-10-23 18:19:13 +09:00 |
|
Dean Herbert
|
94093ac948
|
Update beatmap search API to match latest osu-web structure
|
2018-10-23 18:05:41 +09:00 |
|
Dean Herbert
|
7ed6520052
|
Merge pull request #3627 from smoogipoo/fix-beatmap-version
Preserve the beatmap's version when using databased BeatmapInfo
|
2018-10-23 17:24:23 +09:00 |
|