1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 19:22:55 +08:00
Commit Graph

581 Commits

Author SHA1 Message Date
Dean Herbert
d1a115f4ec Merge remote-tracking branch 'upstream/master' into cursor-trail 2018-03-05 23:34:04 +09:00
Dean Herbert
3ddaf1879d CursorTrail always present, just to be safe 2018-03-05 20:20:06 +09:00
Dean Herbert
f4965ee7d6 Use high precision updating on CursorTrail
Avoids bloackage
2018-03-05 20:20:06 +09:00
Dean Herbert
69c0e95d9d Use a better fade effect for the gameplay cursor 2018-03-05 20:20:06 +09:00
Dean Herbert
60f851df3e Add support for DrawInfo alpha when drawing CursorTrail 2018-03-05 20:15:07 +09:00
Dean Herbert
ea6e3938c0 Fix hard crash due to spinner spin requirement being zero
Resolves #2133.
2018-03-04 03:01:47 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert
06cf9cbd63
Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00
Dean Herbert
bd9d26921a Less BeaIBeatmapConvertereatmapConverters 2018-03-02 20:39:43 +09:00
Dean Herbert
22cbbcc639
Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 20:21:41 +09:00
smoogipoo
a2c239d5e3 Rename to IBeatmapConverter, move to separate file 2018-03-02 20:19:47 +09:00
smoogipoo
9fef8a3977 Prettify json 2018-03-02 20:13:48 +09:00
smoogipoo
71755f5363 Prettyfy some JSON 2018-03-02 20:12:29 +09:00
Dean Herbert
ca8e52289b
Merge branch 'master' into fix-hr 2018-03-02 19:37:48 +09:00
smoogipoo
401d3fff7b Add colinear perfect curve test case 2018-03-02 18:38:57 +09:00
smoogipoo
820a852caf Remove unnecessary .osu properties 2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3 Replace testcases with a basic test suite 2018-03-02 18:20:33 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c Add TestFixtureAttribute to all tests 2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751 Ignore broken testcases 2018-03-02 14:01:34 +09:00
smoogipoo
2e3ee00c19 Remove unnecessary changes 2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f Allow multiple mappings to be generated for a single hitobject 2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd Add beatmap parameter to beatmapconverter creation 2018-03-02 13:13:01 +09:00
smoogipoo
6f5acaa8f9 Remove unnecessary explicit JsonProperties 2018-03-02 13:13:01 +09:00
smoogipoo
e87be213d5 Adjust lenience a little bit 2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f Implement basic structure for beatmap conversion testing 2018-03-02 13:13:00 +09:00
smoogipoo
cb39a88c51 Fix HR not affecting slider repeats and ticks 2018-03-02 00:25:14 +09:00
smoogipoo
49b24c2bbf Fix HR not properly applying to sliders 2018-03-02 00:19:09 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
Dean Herbert
0704d823a9 Fix slider selection point not being set to new origin 2018-03-01 22:03:00 +09:00
smoogipoo
e62fab6cc2 Fix overlay positions/sizes due to sliders now being fixed 2018-03-01 14:34:31 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
smoogipoo
195b6642e6 Reimplement important frames 2018-03-01 02:28:15 +09:00
smoogipoo
cf42d5bbd5 Remove mostly-unused Score parameter 2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062 Populate rulesets with their replay frames 2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Dean Herbert
e2f57ae346
Merge branch 'master' into parser-sanity-checks 2018-03-01 00:38:44 +09:00
Dean Herbert
3609c685d1 Fix approach circle fading 2018-02-28 20:35:15 +09:00
Dean Herbert
065630487a Fix slider heads fading out too late 2018-02-28 20:12:16 +09:00
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
2018-02-28 18:12:24 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f Improve vector conditional 2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581 Fix sliders never getting a correct lifetime set 2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2 Division-by-zero safety + reference our own size 2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
996e605e61 Remove temporary testcase 2018-02-24 02:39:44 +09:00
smoogipoo
1e1df2aaff Fix up testcases 2018-02-23 21:04:19 +09:00
smoogipoo
8c90abe0dc Make slider control points relative to start position 2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c Make DrawableSlider contain the slider body 2018-02-23 20:27:05 +09:00
Dean Herbert
84b707f4f8 Add basic hitcircle skinning 2018-02-23 13:38:12 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:25:27 +09:00
smoogipoo
844e87aafe Use the true head position rather than capturing current position 2018-02-22 14:25:10 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
604b0fa20a Fix post-merge issues 2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement 2018-02-22 13:19:39 +09:00
Dean Herbert
3b4e4bd110 Merge remote-tracking branch 'upstream/master' into general-slider-improvements 2018-02-22 12:28:33 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
08e52e8c15 Remove unnecessary schedules 2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c Allow changing accentcolour/bordercolour post-load 2018-02-21 18:00:46 +09:00
smoogipoo
0d60a65c94 Fix OsuAutoGenerator not considering stacking 2018-02-21 17:53:16 +09:00
smoogipoo
f903e6d241 Fix stacking not working with sliders
Fixes #2093.
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da Clean up and document better what "progress" means 2018-02-21 17:10:18 +09:00
Dean Herbert
50d0278cbd
Merge branch 'master' into general-slider-improvements 2018-02-21 11:28:45 +09:00
smoogipoo
9a9f53ddfd Remove 0.75 scale from osu! playfield in the editor 2018-02-21 11:10:43 +09:00
smoogipoo
4934ef7429 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-21 11:07:42 +09:00
smoogipoo
7fe0989427 Merge branch 'general-slider-improvements' into editor-hitobject-overlays 2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c Allow customizing the snake-ability of sliders 2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758 Add BorderColour to SliderBody 2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-20 14:07:04 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
smoogipoo
ef11ce3dd1 Remove Size override from OsuPlayfield 2018-02-19 17:02:27 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869 fade slider ticks with hidden mod 2018-02-11 11:03:01 +01:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff Make slider tails not play hitsounds 2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
Dean Herbert
62547dba51 Remove redundant test method 2018-02-06 18:15:21 +09:00
Dean Herbert
3d0ef8b3bd Move property back to local variable
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17 Adjust appear animations of repeats and ticks 2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f Adjust scale out effect 2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d Simplify iteration code 2018-02-06 17:46:45 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
ColdVolcano
bf26fc94d8 Merge branch 'master' into repeat-points 2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261 Make osu! use HitWindows 2018-02-02 20:33:59 +09:00
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix 2018-02-01 18:44:04 +09:00