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

775 Commits

Author SHA1 Message Date
Poyo
08d7c2df70 Fix extra hard-rock flipping for sliders 2018-12-21 16:08:08 -08:00
Dean Herbert
ef9d93ff6b Remove mod multipliers
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
Dean Herbert
bb850da200 Remove skinnability for now
Not sure if we want this going forward.
2018-12-20 15:48:45 +09:00
Dean Herbert
4f34d42b33 Major code refactors 2018-12-07 21:11:35 +09:00
Dean Herbert
d379d02761 Remove unnecessary base class 2018-12-07 20:12:56 +09:00
WebFreak001
a14de5bd1b Remove blinds random NPC 2018-12-06 12:52:39 +01:00
WebFreak001
46b98702e1 make target animation call more obvious 2018-12-06 12:48:11 +01:00
WebFreak001
3cb91979bd Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-12-06 12:14:48 +01:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
MaxOhn
8a3425948d Merge branch 'master' of https://github.com/ppy/osu into deflate-branch 2018-11-26 03:45:35 +01:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
smoogipoo
d594ce3530 Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 16:20:38 +09:00
smoogipoo
3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +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
jorolf
023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
jorolf
5c09662c14 Allow flashlight size to be variant 2018-11-07 23:40:33 +01:00
jorolf
2cffce805a add flashlight mod 2018-11-07 00:48:54 +01:00
Dean Herbert
bb2f8deb18 ControlPoint -> PathControlPoint
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
WebFreak001
3b08ad0742 Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02:00
MaxOhn
69775f62db Merge remote-tracking branch 'upstream/master' into deflate-branch 2018-10-12 21:34:44 +02:00
MaxOhn
a876beeada Variable adjustments 2018-10-12 21:34:24 +02:00
MaxOhn
19efa1cafb Added TestCase, first RepeatPoint now deflates aswell 2018-10-12 20:55:42 +02:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2 2018-10-12 11:44:55 +02:00
smoogipoo
e130204a3b Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-12 12:26:15 +09:00
smoogipoo
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2 2018-10-10 19:48:46 +09:00
MaxOhn
951ac30de8 ArmedState now considered, SliderBody now deflates (TODO: handle slider's nested objects) 2018-10-10 01:36:37 +02:00
MaxOhn
edb69463fd Trimming whitespace from comment...... 2018-10-09 18:52:34 +02:00
MaxOhn
954bcd8c12 Treat non-DrawableHitCircle's similar to OsuModHidden 2018-10-09 18:36:12 +02:00
MaxOhn
1366b53a71 Added traceable mod + HideButApproachCircle function for DrawableHitCircle 2018-10-09 13:16:27 +02:00
Fayne Aldan
edf87bfdd8
Merge branch 'master' into wiggle-repeat-points 2018-10-08 15:23:45 -06:00
MaxOhn
0ae9c78c38 set drawableOnApplyCustomUpdateState private to make AppVeyor happy :) 2018-10-01 12:29:21 +02:00
MaxOhn
0f0ee48bfd Merge with ppy/osu master 2018-10-01 12:10:42 +02:00
MaxOhn
8b09935c37 previous commit only added scaling-up (oops), this one includes fading 2018-09-30 14:49:52 +02:00
MaxOhn
98042eb7d4 add the default fadeout-while-scaling-up to clicked objects 2018-09-30 14:46:36 +02:00
MaxOhn
9a5127d506 fixed object scale upon hit 2018-09-30 14:29:55 +02:00
Kyle Chang
3cc75bac34 Adjust easings 2018-09-21 20:26:01 -04:00
Kyle Chang
3cb33e53cc Hid approach circles after rewinding replays 2018-09-21 00:07:09 -04:00
Kyle Chang
bfa430ad8c Fix judgement backgrounds without breaking other things 2018-09-20 23:51:43 -04:00
Kyle Chang
51d26fb648 Now spin in mod; circles spin in 2018-09-20 19:09:58 -04:00
Kyle Chang
3a0d376645 Merge remote-tracking branch 'upstream/master' into zoom-in 2018-09-20 17:13:11 -04:00
Kyle Chang
1e3599bdde Disable fade in 2018-09-20 00:23:54 -04:00
Kyle Chang
dbc2eb4771 Create ZoomIn Mod 2018-09-19 00:03:00 -04:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
WebFreak001
c9ea5ce817 Made blinds open during breaks and start 2018-09-16 16:51:18 +02:00
WebFreak001
633e8fafee Style & const fix 2018-09-16 12:57:54 +02:00
WebFreak001
91b25870ef Make fruit catcher enter and leave what's behind the blinds 2018-09-16 12:48:36 +02:00
Fayne Aldan
d855e5957a Don't wiggle repeat points independently 2018-09-15 16:16:37 -06:00
WebFreak001
5f3c0549c9 Sprites in blinds mod & gameplay improvements
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2 2018-09-15 20:12:06 +02:00
Paul Teng
1a8665864c Remove redundant explicit array type info 2018-09-15 08:55:29 -04:00
Paul Teng
3e02a36938
Make Wiggle incompatible with Transform 2018-09-15 08:43:22 -04:00
Paul Teng
92c6b570ea
Make Transform incompatible with Wiggle 2018-09-15 08:42:04 -04:00
Dean Herbert
14c2aec53e Merge remote-tracking branch 'upstream/master' into ArrangeMod 2018-09-14 18:48:32 +09:00
Dean Herbert
ec6185cd31 Reduce random allocations 2018-09-14 18:21:12 +09:00
Dean Herbert
ef31698f56 Further code tidying 2018-09-14 18:21:12 +09:00
Dean Herbert
00daaef27a Use a slightly more suiting icon 2018-09-14 18:21:12 +09:00
Dean Herbert
9d94aa4e62 Fix formatting and constants 2018-09-14 18:21:12 +09:00
MaxOhn
b1f6828a1a Added OsuModWiggle class and adjusted OsuRuleset.cs 2018-09-14 18:21:11 +09:00
MaxOhn
b72d44b1e8 Added OsuModDeflate class and adjusted OsuRuleset.cs 2018-09-05 22:54:07 +02:00
miterosan
4c42d40314 Correct the comment from explosion to object 2018-09-05 21:09:09 +02:00
Dean Herbert
34c42aed89
Merge branch 'master' into ArrangeMod 2018-09-05 02:33:00 +09:00
Dean Herbert
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
miterosan
726a510189 remove not needed usings 2018-08-24 22:33:14 +02:00
miterosan
8b016f05e6 Remove unessesary nl 2018-08-24 22:24:57 +02:00
miterosan
8112a51d5f Only apply the transformation once and make the distance and theta dynamic. 2018-08-24 22:23:27 +02:00
miterosan
0a48f8eadd remove empty object ctar args 2018-08-22 21:39:59 +02:00
miterosan
6600f7b30e correct the namings and styling 2018-08-22 21:27:20 +02:00
miterosan
5c5191b9c3 Rename the mod class to transform. 2018-08-22 21:19:28 +02:00
miterosan
173d12c1ec rename arrange to transform 2018-08-22 21:17:18 +02:00
miterosan
c374755cc8 only affect spinner, hitcircle and slider and nothing else. 2018-08-22 21:16:45 +02:00
miterosan
d070a3e2d8 Only affect hitcicles, slider and spinner 2018-08-22 20:46:03 +02:00
Dean Herbert
442f6795bc Block user input 2018-08-17 19:33:14 +09:00
Dean Herbert
bc22a28fef Clean up logic and variables 2018-08-16 18:18:15 +09:00
Dean Herbert
870f6bea47 Only process alive objects 2018-08-16 18:18:08 +09:00
miterosan
89a18e4aac remove nl and add comment for -1 and +1 2018-08-05 15:39:12 +02:00
miterosan
d1ffb7c2d7 Use timepreempt and put appeartime and move duration into their own vars. 2018-08-05 15:38:27 +02:00
miterosan
8ad8c2b6d0 Reset the ScoreMultiplier to 1 2018-08-05 15:16:25 +02:00
miterosan
7653ce80cd add a period after EVERYTHING 2018-08-05 15:16:10 +02:00
miterosan
d32ffc1ebc Swtich order of the moveto and the movetooffset. 2018-08-05 15:14:52 +02:00
miterosan
876d410fa1 Add missing ; 2018-08-05 15:13:04 +02:00
miterosan
f02d1f9013 move the 250 appear disance to a const var. 2018-08-05 15:10:42 +02:00
WebFreak001
b33954d9db Implement blinds mod 2018-08-05 14:20:56 +02:00
tgi74000
924bf9174c Fix overclick in certain situations 2018-08-05 09:58:15 +02:00
tgi74000
b1d1a2400b Remove IUpdatableByHitObject completely 2018-08-05 09:52:19 +02:00
miterosan
546bdf0618 remove default value init .-. 2018-08-04 00:36:59 +02:00
miterosan
159ce8e93e Add license header 2018-08-04 00:29:32 +02:00
miterosan
67c64ac459 Put the arrange mod into the fun section. 2018-08-04 00:26:26 +02:00
miterosan
5bb12b574b The arrange mod is not ranked I think. 2018-08-04 00:26:06 +02:00
miterosan
3457bc08e5 Merge branch 'master' of https://github.com/ppy/osu into ArrangeMod 2018-08-04 00:21:48 +02:00
tgi74000
07d6a75e23 Rename variables to be human readable 2018-08-04 00:18:09 +02:00
tgi74000
7310c38df9 Add relax mod 2018-08-03 14:03:11 +02:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
miterosan
4d306ef837 Add comments and clean up code. 2018-07-30 11:39:21 +02:00
miterosan
23a37d06cf Implement the arrange mod. 2018-07-30 11:34:20 +02:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Dean Herbert
f253828d49 Fix regressions 2018-06-06 13:51:51 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
Vidalee
16bcd6c3ed
Appvtests (#1)
* Resolving AppVeyor's errors
2018-05-08 14:33:26 +02:00
Vidalee
393c01ba90 Made the changes requested 2018-05-06 12:38:25 +02:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
Joseph Madamba
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
Joseph Madamba
90d763fda5 Apply review changes and suggestions 2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
Vidalee
505a7c14fc was persuaded I changed the if statement... 2018-03-21 21:14:17 +01:00
Vidalee
8159e219fd increaseFirstObjectVisibility now cannot be null 2018-03-20 22:23:27 +01:00
Vidalee
cdbe6bf22d cleared comment 2018-03-20 21:55:35 +01:00
Vidalee
4068be1293 cleared comment 2018-03-20 21:54:44 +01:00
Vidalee
9252203916 build fix 2018-03-20 18:23:41 +01:00
Vidalee
fea8f868d7 Fixing hidden test bug 2018-03-17 13:22:58 +01:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Vidalee
8a86766324 Changes requests 2018-03-13 23:21:47 +01:00
Vidalee
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
Vidalee
9516bec13d Fix naming rule 2018-03-11 21:45:15 +01:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01: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
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
Aergwyn
c3ce015869 fade slider ticks with hidden mod 2018-02-11 11:03:01 +01:00
Aergwyn
52c4d22c41 review changes
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
Aergwyn
54c0197eb0 remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42 remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Shawdooow
e0beefdfd5 make this a float 2018-01-01 10:30:55 -05:00
Shawdooow
064758b96d fixes 2017-12-31 11:30:58 -05:00
Shawdooow
3ba5dce052 new Approach to approach rate 2017-12-31 11:15:14 -05:00
Dean Herbert
a0966305d4 Remove unnecessary new event 2017-12-30 14:46:44 +09:00
Aergwyn
5e887240ae actually use option to override values... 2017-12-29 18:04:40 +01:00
Aergwyn
07040f9fd1 rename field 2017-12-29 17:52:28 +01:00
Aergwyn
5c3b67bcef remove unnecessary values 2017-12-29 17:51:59 +01:00
Aergwyn
f547c7986d created option to override values before UpdateState is called 2017-12-29 17:50:55 +01:00
Aergwyn
a58b5ff5f2 simplify sequence 2017-12-29 17:46:22 +01:00
Aergwyn
b200134a18 fix spinner easing with hidden 2017-12-29 17:44:10 +01:00
Dean Herbert
db8228f69d Don't think we need this expire call 2017-12-29 18:57:38 +09:00
Dean Herbert
a4f941cdf1 Move lifetime adjustment to DrawableHitCircle 2017-12-29 18:51:14 +09:00
Dean Herbert
dd2ae3f701 SImplify everything 2017-12-29 18:48:10 +09:00
Dean Herbert
0ae00cbd17 Rename one more variable 2017-12-29 18:28:16 +09:00
Dean Herbert
ced2d9749d Adjust presets and rename more 2017-12-29 18:25:33 +09:00
Dean Herbert
c9d4da65d2 Simplify and rename time variables 2017-12-29 18:06:41 +09:00
Dean Herbert
27cb445c24 Always recrusively apply custom sequence to nested hitobjects 2017-12-29 17:48:05 +09:00
Dean Herbert
b74248a705 Rename application method 2017-12-29 16:22:06 +09:00
Aergwyn
cd237da6d3 extend TestCaseHitCircle with new steps
- Hidden, Size and Scale
- also fix Auto still missing because no judgement was created
2017-12-28 17:06:15 +01:00
Aergwyn
0b23ceb781 fix slider fade out to be eased
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Aergwyn
e42fa7205b adjust spinner sequence to the new fadeout speed 2017-12-27 21:23:56 +01:00
Aergwyn
7d29c076d2 fix circles and slider sequences
+ minor cleanup
2017-12-27 21:12:02 +01:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Aergwyn
f5d4ed2a22 add interface to adjust DrawableHitObjects 2017-12-26 11:49:42 +01:00
smoogipoo
ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
smoogipooo
56292bd7f0 Use constant definition. 2017-08-23 16:54:06 +09:00
smoogipooo
42e6865493 Flip hit objects. 2017-08-23 16:35:30 +09:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
EVAST9919
19728b3d98 Fixed IncompatibleMods for OsuModAutoplay 2017-05-12 15:13:02 +03:00
Thomas Tan
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
Thomas Tan
2af6c7aa00 Fix build errors o.o 2017-04-29 00:21:33 +08:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00