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

368 Commits

Author SHA1 Message Date
Dean Herbert
1b1c255394
Make the Easy mod's extra life count customizable (#7331)
Make the Easy mod's extra life count customizable
2019-12-25 20:19:08 +09:00
Dean Herbert
911dc2d98d Fix code inspections 2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816 Rename method to be more appropriate
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
Lucas A
e3753ae29f Make the easy mod's extra life count customizable 2019-12-24 10:13:12 +01:00
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
1bd44529dd add full-stop to mod description for consistency 2019-12-20 18:31:16 +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
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
87035f8251 Simplify complex method 2019-12-17 12:12:15 +09:00
Dean Herbert
438d97f4f5 Rename variable for clarity 2019-12-16 19:42:28 +09:00
Dean Herbert
cfd8111120 Better initial beat handling 2019-12-16 19:41:02 +09:00
Dean Herbert
72404bff9a Add support for simple triple time 2019-12-16 19:16:54 +09:00
Dean Herbert
210fecc951 Fix incorrect hat logic; add support for first barline omission 2019-12-16 18:57:11 +09:00
Dean Herbert
0f9ff32cdc Fix beat playing while paused 2019-12-16 18:51:22 +09:00
Dean Herbert
c883c97bab Fix off-by-one starting bar 2019-12-16 18:50:58 +09:00
Dean Herbert
3e0fda58ea Play finish in addition to kick, not isolated 2019-12-16 18:47:06 +09:00
Dean Herbert
9de6b62fb1 Fix nightcore beat not playing if song doesn't hit beat index 0 2019-12-16 18:24:29 +09:00
unknown
88d3a1707d ensure beatIndex is 0 before starting beats 2019-12-16 06:35:18 +08:00
unknown
c06e558f87 add setting to start fully wounded 2019-12-15 18:12:37 +08:00
unknown
154bc57c6e remove unused dependency 2019-12-15 17:46:44 +08:00
unknown
6da168118e remove unused usings 2019-12-15 17:02:29 +08:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
smoogipoo
72ea871bff Make constructor protected 2019-12-13 21:55:20 +09:00
Dean Herbert
af15662856 Fix WindUp applying too much change 2019-12-13 21:55:07 +09:00
unknown
ab5aa8594d remove whitespace 2019-12-13 15:46:58 +08:00
unknown
0311cc83ad add whitespace 2019-12-13 15:27:34 +08:00
unknown
ababe7b6c9 refactor mod to make use of #7175 2019-12-13 15:22:07 +08:00
unknown
002a125b4a make ModDifficultyAdjust generic 2019-12-12 21:14:26 +08:00
Dean Herbert
623ab1ef3b Update time ramp preview on setting change 2019-12-12 17:38:18 +09:00
Dean Herbert
d15f49f60f Also hide the break overlay 2019-12-12 16:13:02 +09:00
Dean Herbert
99280db694 Add note about AlwaysPresent requirement 2019-12-12 16:12:40 +09:00
Dean Herbert
e4297ffead Hide HUD in a better way 2019-12-12 16:12:32 +09:00
Dean Herbert
4c4199269c Use protected constructors 2019-12-12 15:25:37 +09:00
unknown
472fa9822c make ModDifficultyAdjust incompatible with ModEasy and ModHardRock 2019-12-12 08:25:51 +08:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod 2019-12-11 18:00:17 +00:00
Albie
caa9286a90 update tests, change binding and reduce lines in cinema mod 2019-12-11 17:39:40 +00:00
unknown
b0cf44c3be fix appveyor issues 2019-12-11 20:12:29 +08:00
unknown
b795532aa5 add difficulty adjustment mods 2019-12-11 19:43:16 +08:00
smoogipoo
40f918dce6 Remove unused using 2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed Remove time ramp and rate adjust mod incompatibility 2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff Refactor ModNightcore/ModDaycore 2019-12-11 19:43:32 +09:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
dc9775742c
Fix incorrect code migration
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-12-10 02:23:17 +09:00
Dean Herbert
12bdb1dafd Pin DC/NC pitch 2019-12-09 20:40:38 +09:00
Dean Herbert
edc8220554 Add time ramp settings 2019-12-09 19:58:51 +09:00
Dean Herbert
7fd52c21f5 Update mods and user adjust to use adjustments 2019-12-09 19:41:31 +09:00
Dean Herbert
ba538cf09b Merge branch 'apply-to-track' into adjustable-double-time 2019-12-09 17:45:19 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
Dean Herbert
0c7e5a2e3b Add bindable adjustments for DT/HT rate 2019-12-09 16:54:00 +09:00
Dean Herbert
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods 2019-11-27 19:44:32 +09: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
9fdbb2a58e change name of interface and expose method instead of seperate values 2019-11-25 07:24:29 +00:00
Albie
1d6665fe57 improve code quality using resharper and codefactor advice 2019-11-24 07:42:39 +00:00
Albie
b8e5796af5 add forced video/storyboard and disabled dim for mod inside new interface 2019-11-24 07:37:06 +00:00
Albie Spriddell
20edaf4ba6 add cinema mod support 2019-11-23 17:32:16 +00:00
Andrei Zavatski
458496206c Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-21 18:49:37 +03: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
Andrei Zavatski
2592a0489b Use existing ModNoMod 2019-11-15 11:57:40 +03:00
unknown
2bc6932567 make interface mod applicable 2019-11-05 00:55:55 +08:00
LeNitrous
59b2f02828 initial implementation of customizable mods 2019-10-08 18:34:09 +08:00
Dean Herbert
c99b48f934 Bring up-to-date and use IApplicableFailOverride 2019-09-21 23:30:54 +09:00
Dean Herbert
4c4b71eeec
Merge branch 'master' into master 2019-09-21 22:45:05 +09:00
smoogipoo
bc9941a990 Newline required when xmldocs are involved 2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235 Remove whitespace 2019-09-19 17:58:10 +09:00
smoogipoo
da15b900f7 Remove virtual member from ModBlockFail 2019-09-19 17:44:24 +09:00
Dean Herbert
2296ea75d7
Add reference to xmldoc
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-19 02:03:30 +09:00
Dean Herbert
1150e9fdfb Bring other mods up-to-date 2019-09-19 01:45:42 +09:00
Dean Herbert
ff3a7c1d13 Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect 2019-09-19 01:36:29 +09:00
Dean Herbert
b0e0659715 Dispose instead 2019-08-07 17:33:30 +09:00
Dean Herbert
c6d481238d Move QuadBatch to a local variable to stop resharper complaining 2019-08-07 16:56:22 +09:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
smoogipoo
776757545d Fix FTB causing flashlight to block vision correctly 2019-07-23 15:17:02 +09:00
Dean Herbert
d5ee4cbc9c Move TouchDevice mod to new "system" category 2019-07-23 13:14:28 +09:00
Dean Herbert
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
Salman Ahmed
1f13b94c72
Fix build error 2019-07-06 18:44:55 +03:00
Salman Ahmed
a42c79895d
Remove unnecessary private field 2019-07-06 18:38:41 +03:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
Salman Ahmed
98daaf634a Simplify changes 2019-07-03 06:44:17 +03:00
Salman Ahmed
3f39541cc2 Fade health bar on value change 2019-07-03 05:11:11 +03:00
Salman Ahmed
a8e8650ddd Move blocking fail logic into a base class 2019-07-02 01:47:39 +03:00
iiSaLMaN
41597efdf7 Hide health bar in no fail 2019-06-29 04:25:52 +03:00
iiSaLMaN
d37cefbad8 Implement IApplicableToHUD 2019-06-29 04:23:59 +03:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +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
abc163fa36 Fix merge 2019-05-07 12:07:45 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dean Herbert
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +09:00
Dean Herbert
6a4dc5e25c Improve xmldoc slightly 2019-05-02 14:03:58 +09:00
iiSaLMaN
ddd9262384
fix xmldoc 2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
iiSaLMaN
e0abd0b2c1
fix comment 2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment 2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc 2019-04-30 18:12:27 +03:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
KingLuigi4932
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
David Zhao
9890884726 Remove fade in, update comment 2019-04-23 14:23:09 +09:00
David Zhao
3fbbb7dcf9 Move intiial fade outside of absolute sequence 2019-04-22 16:39:28 +09:00
iiSaLMaN
26f0b2a4fe
Remove bindable
Bad usage
2019-04-22 06:12:41 +03:00
iiSaLMaN
c5bf01cc5c
Fix issue 2019-04-21 18:05:52 +03:00
iiSaLMaN
77614189c9
Make AdjustRank Bindable 2019-04-21 17:48:50 +03:00
iiSaLMaN
4e07975e7c
Ranks must be adjusted in Hidden Mod 2019-04-21 15:58:40 +03:00
David Zhao
037e23247f Remove unused using 2019-04-18 14:31:47 +09:00
David Zhao
dfa5beea89 Use the actual scale of Flashlight for FlashlightSize 2019-04-18 14:24:19 +09:00
David Zhao
e25c7fdb9b Use absolute sequence for flashlight breaks 2019-04-12 17:39:25 +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
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
RORIdev
ca6a73cb9d Fixed Code Inspection Fails. 2019-04-04 18:04:49 -03:00
RORIdev
c195481223 Trimmed Whitespace 2019-04-04 13:28:43 -03:00
RORIdev
5a3e5036ed All suggestions were applied. 2019-04-04 13:21:53 -03:00
RORIdev
27fe6f610a Removed deprecated code. Thanks peppy. 2019-04-03 22:55:09 -03:00
RORIdev
ff1815e714 Fixed lives being not reseting between maps.
E.G.  quitting a map with only 1 revive and getting 2 lives on another map.
2019-04-03 20:22:48 -03:00
RORIdev
28bf3156ba Fixed the mod being not resetting. 2019-04-03 19:32:29 -03:00
RORIdev
5aa284781e Reverted back Player.cs changes. 2019-04-03 19:20:20 -03:00
RORIdev
ebaaaef4d6 Fixed Inconsistent Naming 2019-04-03 18:17:21 -03:00
RORIdev
621f8fd78d Trimmed whitespaces. 2019-04-03 18:05:47 -03:00
RORIdev
f6e1cb07a1 Changed the logic to ModEasy. 2019-04-03 17:58:17 -03:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
d8af5e1c5a Update in-line with drawnode changes 2019-04-02 11:56:22 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
fe255c54d0
Merge pull request #4496 from smoogipoo/reinstantiate-mods
Fix mods being reused for difficulty calculation
2019-03-20 19:10:52 +09:00
smoogipoo
6df275c83a Use fresh mods for each difficulty calculation iteration 2019-03-20 16:37:25 +09:00
Dean Herbert
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert
e0ab40b082 Rename missed files 2019-03-19 23:56:12 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
smoogipoo
2815c3b07c Remove unused variable 2019-03-14 15:12:26 +09:00
Dean Herbert
85c518f146 Change logic to better handle external adjustments 2019-03-14 12:29:16 +09:00
Dean Herbert
c40e24739b Fix weird application logic 2019-03-13 21:37:33 +09:00
Dan Balasescu
5d23a966d7
Fix incorrect application logic for rate fallback
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 20:55:33 +09:00
Dean Herbert
a10cd2288d Improve ModRamp's handling of external rate changes 2019-03-12 18:15:18 +09:00
Dean Herbert
6832e384a9 Simplify DT/HT/NC/DC 2019-03-12 18:14:41 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
smoogipoo
04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00