h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 13:32:56 +08:00
Code Issues Releases Wiki Activity
16,444 Commits 6 Branches 666 Tags 358 MiB
f43ee6b6a3
Commit Graph

61 Commits

Author SHA1 Message Date
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it 
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/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
#	osu.Game/Rulesets/Objects/SliderPath.cs
 2018-11-12 13:50:19 +09:00
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
Dean Herbert
bb2f8deb18 ControlPoint -> PathControlPoint 
Also Curve -> Path.
 2018-11-01 03:56:51 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
Hanamuke
7e07a07c01 Fix HitObjects being out of order because of nested objects 2018-09-13 17:15:46 +02:00
Hanamuke
7d3380db66 Fixed comment. Created static CatchArea.GetCatcheWidth method 2018-09-13 17:01:33 +02:00
Hanamuke
a3c3bfb1a8 Fixes hyperdash computation (for nested objects) 2018-09-12 19:48:35 +02:00
smoogipoo
da3e2cfee2 Catch/osu! spinners should have combo 2018-08-15 11:13:23 +09:00
Dean Herbert
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
Dean Herbert
3b262e0d16 Use better casting 2018-06-29 15:01:33 +09:00
smoogipoo
4fb276bab7 Move hyperdash init to PostProcess 2018-06-29 13:52:13 +09:00
smoogipoo
756cabd5d0 Add a preprocess method to BeatmapProcessor 2018-06-29 12:45:48 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Dean Herbert
1a8aa6eab1 Fix regression causing new combos to once again not be respected 2018-06-26 20:13:55 +09:00
ekrctb
516b1c5495 Fix droplet position clamping 2018-06-20 18:29:23 +09:00
ekrctb
9d7e5b4920 Clamp juice stream position 2018-06-20 17:23:55 +09:00
smoogipoo
e1f5498924 Discarding 3 times is correct 2018-06-14 21:38:08 +09:00
smoogipoo
250e8645e1 finalisePosition -> applyPositionOffsets 2018-06-14 21:38:08 +09:00
smoogipoo
9b403b0053 Fix non-catch beatmaps not getting properly converted 
Because Osu.ConvertSpinner implements IHasXPosition.
 2018-06-14 21:38:08 +09:00
smoogipoo
a97a7e13bd Rework RNG discarding comment 2018-06-14 21:38:08 +09:00
smoogipoo
cafdbc2d25 Fix discarding too many RNG values, and add test 2018-06-14 21:38:08 +09:00
Dan Balasescu
cbb883614a
Merge branch 'master' into catch-droplet-fix 2018-06-13 15:18:52 +09:00
Dean Herbert
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
ekrctb
456dc81f2f Fix InspectCode issues 2018-05-25 19:18:11 +09:00
ekrctb
26c6313dec catch: the fruit positions are finalized on the post process 2018-05-25 19:11:29 +09:00
frankhjwx
fda7025ac3 Re-order positionData judgement for correct banana creation 2018-05-23 13:47:33 +08:00
smoogipoo
7eb64ab590 Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
smoogipoo
b9e4b59e46 Actually construct catch beatmaps 2018-05-07 15:51:08 +09:00
smoogipoo
8a4717d2e9 Add catch statistics 2018-05-07 15:51:08 +09:00
smoogipoo
e20323b5f6 Trim whitespace 2018-05-07 11:23:29 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
c38c26eacb Move combo index processing to BeatmapProcessor 2018-03-20 15:57:43 +09:00
Dean Herbert
cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
Dean Herbert
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
Dean Herbert
5b15073010 Add actual banana conversion/reading 
(cherry picked from commit d353158)
 2018-01-12 18:33:41 +09:00
Dean Herbert
5c79bdc41c Use switch pattern matching in more places 
Also switch access to many classes to public.

(cherry picked from commit 86cc3b7)
 2018-01-12 18:33:41 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
02131d75d4 Let fruits know what index they are in the beatmap to draw a visual representation 2018-01-03 16:31:57 +09:00
Dean Herbert
8c3ae9430b Add difficulty scaling considerations to hyperdash initialisation 2017-12-01 20:39:58 +09:00
Dean Herbert
51cae24a26 Add basic hyperdash movement 
Doesn't restrict direction yet. Also improves readability of fruit catch detection.
 2017-12-01 19:33:13 +09:00
Dean Herbert
881745d756 Initial implementation of hyperdash calculation 2017-12-01 17:59:36 +09:00
Dean Herbert
76a1c7db3b Hyperdash preparation 2017-12-01 13:10:51 +09:00
Dean Herbert
8f3fd7092e CatchBaseHit -> CatchHitObject 
Also moves default scale to CatchHitObject.
 2017-11-28 18:37:41 +09:00
Dean Herbert
11d406aa0c Fix osu!catch conversion expecting full positional data, rather than just X. 
Closes #1367.
 2017-11-24 11:49:10 +09:00
Dean Herbert
1f1bdc6162 Make juice streams interactive (and correctly positioned) 2017-10-11 18:18:06 +09:00