1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 17:02:55 +08:00
Commit Graph

15014 Commits

Author SHA1 Message Date
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
TPGPL
52a9e21d32 Restructure the MfL issue template 2018-10-26 14:12:18 +02:00
TPGPL
daf7337fba Rename the issue templates 2018-10-26 14:09:17 +02:00
TPGPL
a711112074 Delete redundant fields 2018-10-26 14:08:29 +02:00
HoLLy
cf3b4447eb Fade only textContainer instead of entire MetadataSection 2018-10-26 13:35:51 +02:00
smoogipoo
951a309d04 Increase placement testcase circlesize 2018-10-26 15:36:09 +09:00
smoogipoo
22c545ea8c Make circle piece respond to hitobject scale 2018-10-26 15:26:19 +09:00
smoogipoo
4a507c66ee Cleanup 2018-10-26 15:26:08 +09:00
smoogipoo
f674fcf2c8 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
2018-10-26 14:05:30 +09:00
smoogipoo
ce9b400c4c Add selection mask test cases 2018-10-26 13:58:33 +09: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
smoogipoo
2f42112d87 Add placement mask testcase 2018-10-25 19:11:57 +09:00
smoogipoo
2b141a2bc1 Make PlacementMask abstract 2018-10-25 19:10:59 +09:00
smoogipoo
4ecd4ca462 Add selection mask test cases 2018-10-25 19:10:52 +09:00
smoogipoo
e14719e440 Mask -> Piece for non-mask components 2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b Adjust namespaces 2018-10-25 18:26:28 +09:00
smoogipoo
ea6db8b793 Make the hitobject masks move within their placement/selection 2018-10-25 18:16:25 +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
smoogipoo
8a2a6a3ecb Preserve the beatmap's version 2018-10-23 14:59:21 +09:00
Dean Herbert
d210383d8f
Merge pull request #3615 from plankp/check-before-btn-change
Change DownloadState only when Download is possible
2018-10-22 21:52:29 +09:00
Dan Balasescu
412f65bb70
Merge branch 'master' into check-before-btn-change 2018-10-22 17:29:26 +09:00
smoogipoo
05d89180c8 Move brace on new line 2018-10-22 12:17:23 +09:00
Dean Herbert
a13f3068c5
Merge pull request #3608 from smoogipoo/fix-diffcalc-slider-distance
Fix slider travel distances sometimes not being considered
2018-10-21 20:46:17 +09:00
Dean Herbert
a9e5a4351e
Merge branch 'master' into fix-diffcalc-slider-distance 2018-10-21 20:33:50 +09:00
Dean Herbert
a05abcc246
Merge pull request #3595 from smoogipoo/tighten-diffcalc-tolerances
Fix wrong number of slider ticks being generated
2018-10-20 23:55:35 +09:00
Dean Herbert
f19cc98e6a Add slightly more explanation 2018-10-20 23:10:33 +09:00
Dean Herbert
0952c20c84
Adjust comment slightly 2018-10-20 23:06:48 +09:00
Dean Herbert
3d927a4f24
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-20 23:03:51 +09:00
TPGPL
6882735d6f Add local storages for macOS and Linux 2018-10-19 20:02:08 +02:00
TPGPL
1682090cd5 Fix minor issues 2018-10-19 19:40:55 +02:00
TPGPL
ef4c32d537 Add game feature issue template 2018-10-19 19:39:18 +02:00
TPGPL
fc95a0a2d5 Add feature issue request 2018-10-19 19:36:02 +02:00
TPGPL
294569f966 Add crash issue template 2018-10-19 19:29:56 +02:00
TPGPL
93a3e9fe11 Add bug issue template 2018-10-19 19:27:24 +02:00
miterosan
6d9a1af44d
Merge branch 'master' into Cakefy_osu! 2018-10-19 18:37:38 +02:00
Dean Herbert
39fb7ac743 Remove deploy configuration
Has been moved to buildkite.
2018-10-19 20:32:14 +09:00
Dan Balasescu
8abbd2b626
Merge pull request #3613 from peppy/update-framework
Update framework
2018-10-19 18:04:46 +09:00
Paul Teng
86b29064c6 Change DownloadState only when Download is possible 2018-10-18 08:51:05 -04:00
Dean Herbert
ae94aab677 Update framework 2018-10-18 21:04:29 +09:00