smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
smoogipoo
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
smoogipoo
|
47be95ce0b
|
Fix slider nodes using the wrong samples
|
2018-10-16 17:10:24 +09:00 |
|
Dean Herbert
|
468f7fd1ea
|
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
|
2018-10-12 19:25:08 +09:00 |
|
Dean Herbert
|
e09e38148b
|
Merge branch 'master' into fix-scroll-speeds
|
2018-10-12 18:25:24 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
ff559a3a1b
|
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-10-05 10:40:16 +09:00 |
|
smoogipoo
|
d0007c047a
|
PlayfieldLayer -> PlayfieldAdjustmentContainer
|
2018-10-05 10:39:18 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
Dan Balasescu
|
0f51007867
|
Merge branch 'master' into judgement-cleanup
|
2018-10-02 09:37:04 +09:00 |
|
smoogipoo
|
08bd363827
|
Adjust taiko scrolling speed
|
2018-10-01 18:15:55 +09:00 |
|
Hanamuke
|
b983e20067
|
Merge branch 'master' into AR_Catch
|
2018-09-30 16:01:55 +02:00 |
|
Kyle Chang
|
88b0c234cc
|
Move judgement text to internal container
|
2018-09-30 04:01:33 -04:00 |
|
smoogipoo
|
3479bfa409
|
Rename variable
|
2018-09-28 17:18:34 +09:00 |
|
smoogipoo
|
5f61faa2d9
|
Fix multiple hits in the same frame pressing multiple hitobjects
|
2018-09-25 18:37:25 +09:00 |
|
smoogipoo
|
0bc2bcaf14
|
Remove GetAspectAdjustedSize() and PlayfieldArea
|
2018-09-21 15:14:49 +09:00 |
|
smoogipoo
|
368ceec47c
|
Simplify creation of a playfield
|
2018-09-21 14:35:50 +09:00 |
|
Hanamuke
|
309d8c8cb4
|
CI
|
2018-09-19 18:43:39 +02:00 |
|
Hanamuke
|
e7d78b94ae
|
Remove ScrollingVisualisation from settings
|
2018-09-19 18:30:25 +02:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +09:00 |
|
smoogipoo
|
2bc827fa0c
|
Fix taiko beatmap conversion attempting to make strong swells
|
2018-08-22 11:32:00 +09:00 |
|
smoogipoo
|
7c3556baf8
|
Throw exception when Swell.IsStrong is set
|
2018-08-15 09:12:29 +09:00 |
|
smoogipoo
|
8be5a606bf
|
Fix swells possibly being strong hitobjects
|
2018-08-14 18:33:07 +09:00 |
|
smoogipoo
|
b045f5c9b6
|
Adjust filename
|
2018-08-14 14:32:06 +09:00 |
|
smoogipoo
|
1a35506386
|
Cleanup strong hit construction
|
2018-08-14 14:29:49 +09:00 |
|
smoogipoo
|
732dfde8ed
|
DrawableStrongHandler -> DrawableNestedStrongHit
|
2018-08-14 14:28:40 +09:00 |
|
smoogipoo
|
7971d06df1
|
Remove AlwaysPresent
|
2018-08-14 14:27:47 +09:00 |
|
smoogipoo
|
5c4c2dff09
|
Fix strong hits not being visualised
|
2018-08-06 13:01:27 +09:00 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
3a7488767c
|
Make HitObject not store the judgement
|
2018-08-06 11:50:18 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
5fd4ed2f4e
|
Rename judgement-related methods/events + commenting
|
2018-08-06 10:55:25 +09:00 |
|
smoogipoo
|
38263714a1
|
Cleanups
|
2018-08-03 16:56:46 +09:00 |
|
smoogipoo
|
412e4ff681
|
Fix display of swells
|
2018-08-03 16:49:24 +09:00 |
|
smoogipoo
|
e6775c7a16
|
Fix playfield display
|
2018-08-03 16:46:03 +09:00 |
|
smoogipoo
|
19c541dbf5
|
Migrate swells to use nested hitobjects for ticks
|
2018-08-03 16:35:29 +09:00 |
|
smoogipoo
|
e8a140930e
|
Migrate drum roll to use nested hitobjects for strong hits
|
2018-08-03 16:35:12 +09:00 |
|
smoogipoo
|
4494853446
|
Migrate DrawableDrumRoll to use a nested hitobject for strong hits
|
2018-08-03 16:20:08 +09:00 |
|
smoogipoo
|
fdf889359f
|
Migrate DrawableHit to use a nested hitobject for strong hits
|
2018-08-03 16:19:37 +09:00 |
|
smoogipoo
|
2dff04392e
|
Re-implement strong judgements via hitobject
|
2018-08-03 16:12:12 +09:00 |
|
smoogipoo
|
fa3c919e2e
|
Fix up taiko judgement creation
|
2018-08-03 16:11:38 +09:00 |
|
smoogipoo
|
0da6c8c1a7
|
Remove unnecessary local variables
|
2018-08-02 22:20:07 +09:00 |
|
smoogipoo
|
a0887a600f
|
Fix swells showing hit circles on intermediate judgements
|
2018-08-02 21:08:06 +09:00 |
|
smoogipoo
|
35b4ab5456
|
Introduce the concept of a "MainResult"
|
2018-08-02 21:07:40 +09:00 |
|
smoogipoo
|
9c2122c0ca
|
Make Rulesets.Taiko use the new judgement result structure
|
2018-08-02 20:36:19 +09:00 |
|
smoogipoo
|
1b7b6f341c
|
Migrate Rulesets.Taiko to the new judgement system
|
2018-08-02 16:09:04 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
Dean Herbert
|
d868d81b59
|
Merge branch 'master' into centralise-judgement-display
|
2018-07-23 02:58:49 +09:00 |
|