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

374 Commits

Author SHA1 Message Date
unknown
fe73b9f8d3 make HP and OD generic and instantiate CS and AR to modes that need it 2019-12-22 16:45:32 +08:00
unknown
0eef218945 add missing new line 2019-12-20 18:42:29 +08:00
unknown
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
smoogipoo
527ab1a72f Fix traceable mod not working on skin change 2019-12-17 19:49:13 +09:00
smoogipoo
7c2884700e Fix various display issues by abstracting further 2019-12-17 19:29:27 +09:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod 2019-11-26 06:57:47 +00:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod 2019-11-25 07:25:30 +00:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie Spriddell
3b9f59cb33 add cinema mod support 2019-11-23 17:34:53 +00:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
smoogipoo
db24cfbead Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
Dean Herbert
1150e9fdfb Bring other mods up-to-date 2019-09-19 01:45:42 +09:00
Dean Herbert
aa1a625643 Add back incompatibility marker 2019-09-18 20:07:44 +09:00
Dean Herbert
cfdac956c2 Fix issues with colour and skin application 2019-09-18 20:04:49 +09:00
Dean Herbert
9c9cb8e217 Merge remote-tracking branch 'upstream/master' into traceable-mod 2019-09-18 19:36:07 +09:00
Dean Herbert
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
smoogipoo
8302658186 Fix other potential nullref cases that rider missed 2019-09-02 18:31:33 +09:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
707911acac Tidy up code formatting / variable naming 2019-08-12 15:05:27 +09:00
Dean Herbert
31fe121fe9 Merge remote-tracking branch 'RedMindZ/master' into autopilot 2019-08-12 14:40:52 +09:00
Dean Herbert
3e74079d02 Add incompatibility with scale tween mods 2019-07-29 01:15:57 +09:00
Dean Herbert
07f905d21c Tidy up code and fix explode animations not playing correctly 2019-07-29 01:00:41 +09:00
Dean Herbert
4204ba6014
Merge branch 'master' into spin-in 2019-07-28 22:51:09 +09:00
Dean Herbert
d5ee4cbc9c Move TouchDevice mod to new "system" category 2019-07-23 13:14:28 +09:00
MaxOhn
581ffb7fb0 Adjusted slider border colour 2019-07-08 13:52:15 +02:00
MaxOhn
130c50eee4 Merge branch 'master' of https://www.github.com/ppy/osu into traceable-mod 2019-07-08 13:43:16 +02:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
MaxOhn
5b4640d3ea Traceable no longer inherits from OsuModHidden and is no longer multi mod 2019-07-03 21:40:14 +02:00
MaxOhn
b63a7593eb Merged with upstream master 2019-07-03 18:56:11 +02:00
MaxOhn
664257fbbe Sliders no longer modified by HD but have transparent body now 2019-07-03 18:42:02 +02:00
Dean Herbert
cc9a28afa8 Add shared base class for both mod imlpementations 2019-07-03 19:42:16 +09:00
MaxOhn
4145173ac9 Combined hidden with traceable as multi mod 2019-07-02 04:04:07 +02:00
Salman Ahmed
a8e8650ddd Move blocking fail logic into a base class 2019-07-02 01:47:39 +03:00
MaxOhn
d753f446e4 Updated license header 2019-07-01 20:20:25 +02:00
MaxOhn
5496b8bc58 Rewrote traceable mod to inherit from hidden 2019-07-01 20:11:50 +02:00
MaxOhn
845bf21f7f Resolved merge with upstream master 2019-07-01 20:00:52 +02:00
MaxOhn
48a828b746 Removed redundant imports and fixed indentation 2019-07-01 17:49:37 +02:00
MaxOhnh
02b9e89f43 Removed old unnecessary change, updated license header and apply deflating onto first object regardless 2019-07-01 14:46:17 +02:00
MaxOhnh
cd5e1bc4b1 Replace deflate progress with modified copy-paste of grow mod 2019-07-01 13:55:09 +02:00
MaxOhnh
93b780c9a8 Resolved merge 2019-07-01 13:53:40 +02:00
iiSaLMaN
9c9334a8ba Hide health bar in relax mod 2019-06-29 04:26:24 +03:00
Dean Herbert
b29b1bf254
Merge branch 'master' into mod-grow-improvement 2019-06-12 13:18:02 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert
8cdcf251b5 Make local bindable private 2019-06-09 16:30:04 +09:00
Ganendra Afrasya
afc3a08953 Use existing setting instead
Now it read IncreaseFirstObjectVisibility bindable instead
2019-06-09 13:11:40 +07:00
Ganendra Afrasya
8ac64b5c16 Make first object not applying custom state 2019-06-08 01:46:05 +07:00
Tav TaOr
7575af6f42 Merged master into autopilot 2019-05-17 14:15:30 +03:00
Tav TaOr
7c50bdd173 Removed redundant parentheses. 2019-05-15 23:48:37 +03:00
Dean Herbert
be6da833f8 Move constant local (and break line) 2019-05-14 11:11:57 +09:00
HoLLy
1809c996bb Use Interpolation.ValueAt instead of manually interpolating FL position. 2019-05-13 12:09:19 +02:00
HoLLy
f7806bc205 Add smoothing to flashlight movement 2019-05-13 01:33:41 +02:00
Tav TaOr
2051be7453 Minor changes to pass the AppVeyor test 2019-05-12 15:00:59 +03:00
Tav TaOr
d229fed128 Implemented Autopilot 2019-05-12 14:00:43 +03:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
KingLuigi4932
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
David Zhao
90d5c64cf3 Remove unused usings 2019-04-24 18:47:00 +09:00
David Zhao
8f101e4f60 Remove unnecessary multi-slider tracking logic 2019-04-24 18:25:38 +09:00
Dean Herbert
67382724f6 Reword and reoganise logic 2019-04-24 16:58:13 +09:00
David Zhao
9890884726 Remove fade in, update comment 2019-04-23 14:23:09 +09:00
David Zhao
3c252d79ea Use var, rework dim application logic 2019-04-22 15:59:47 +09:00
iiSaLMaN
59da78b0d4
nothing. 2019-04-20 06:44:59 +03:00
iiSaLMaN
8e485f3283
Fix issue 2019-04-20 06:41:09 +03:00
David Zhao
d9ed68b189 Add short fade to flashlight dimming 2019-04-12 15:33:31 +09:00
David Zhao
846a4835ca Invert flashlight dim 2019-04-12 11:23:40 +09:00
David Zhao
664a4ba540 Implement flashlight dimming on slider slide 2019-04-12 10:47:22 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dean Herbert
810175235d Fix incorrect application of scaling in some cases
Isolates different usages of hitcircle scale so they can't ever cause regressions.
2019-02-14 18:47:05 +09:00
Dean Herbert
1b61ec4ef4 First pass clean-up 2019-02-14 18:05:23 +09:00
LeNitrous
7e2f4af00d remove whitespaces 2019-01-31 17:58:09 +08:00
LeNitrous
a8d30f6aee remove unused using 2019-01-31 17:05:50 +08:00
LeNitrous
902be0d059 add grow mod 2019-01-31 17:03:43 +08:00
smoogipoo
581544e1d6 Fix TD mod not being ranked 2019-01-31 11:59:36 +09:00
smoogipoo
e9ddf232f0 Add touchdevice mod to performance calculation 2019-01-31 11:51:40 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
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