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

273 Commits

Author SHA1 Message Date
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
Dean Herbert
2300e59e91 Formatting and simplification 2019-03-06 14:19:00 +09:00
LeNitrous
74a23edaf7 no longer adjust the clock rate 2019-03-04 17:48:51 +08:00
LeNitrous
86e861ddeb update mod descriptions 2019-03-04 17:39:13 +08:00
LeNitrous
b83d44c316 use ternary operator instead 2019-03-03 16:50:31 +08:00
LeNitrous
a1a8246c05 trim whitespace 2019-03-03 16:30:08 +08:00
LeNitrous
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +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
LeNitrous
03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
LeNitrous
d920ee67ee forgot last whitespace 2019-01-26 13:47:33 +08:00
LeNitrous
73dbf5712d add license headers 2019-01-26 13:43:27 +08:00
LeNitrous
d76681aa82 use IApplicableToBeatmap instead of IApplicableToRulesetContainer 2019-01-26 13:39:23 +08:00
LeNitrous
c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
smoogipoo
2e767a5292 Fix incorrect acronym 2018-12-14 13:38:13 +09:00
smoogipoo
439d741dee Implement basic api structure for rooms 2018-12-12 16:06:56 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
Dean Herbert
9718e476c7 Add license header 2018-11-30 18:07:15 +09:00
Dean Herbert
be37f3c328 Rename NoModMod 2018-11-30 17:35:13 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
smoogipoo
69370c53ca Fix rank not being read 2018-11-30 14:48:25 +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
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +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
smoogipoo
ea52d2d527 Make Mod IJsonSerializable 2018-11-28 13:12:29 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01: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
Dean Herbert
6dde5e3b4a
Merge branch 'master' into auto-restart-mod-perfect 2018-10-31 03:56:08 +09:00
Paul Teng
007dfedbb7 Combine RestartOnFail into FailOverride 2018-10-30 07:12:06 -04:00
Kyle Chang
6d00aff9fd Add type parameter to IApplicableToBeatmap 2018-10-30 00:13:33 -04:00
Paul Teng
52b9a3f5e9 Remove unused using 2018-10-29 17:51:49 -04:00
Paul Teng
cb9ec94dc2 Remove option from settings 2018-10-29 08:19:38 -04:00
Kyle Chang
df6fc4013a Add interface to adjust Beatmaps 2018-10-28 02:21:25 -04:00
Paul Teng
794afa988f Make both SD and PF auto-restart based on settings 2018-10-24 13:37:27 -04:00
Paul Teng
39c767af2d Update file name and update summary 2018-10-14 11:25:05 -04:00
Paul Teng
fd774c6a09 Allow restarts in ModPerfect 2018-10-14 11:18:52 -04:00
Paul Teng
dea2acaea3 Add new interface that allows restarts 2018-10-14 11:18:10 -04:00
Dean Herbert
ed0dcb2e73 Add comment explaining why 2018-10-10 19:41:40 +09:00
tgi74000
b1d1a2400b Remove IUpdatableByHitObject completely 2018-08-05 09:52:19 +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
Dean Herbert
e28a610757 Fix mods not correctly resetting when changing ruleset at song select 2018-07-05 13:22:52 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +09:00
smoogipoo
e19ca0c120 Add nomod mod type 2018-06-06 14:08:02 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
Dean Herbert
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +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
7a31986812 resolving the lost code problem 2018-05-22 22:39:55 +02:00
Vidalee
08e423ac5b code sanity 2018-05-22 21:35:17 +02:00
Vidalee
50e2871c89 why this line was ommited 2018-05-22 21:29:41 +02:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
smoogipoo
3f67d04429 Cap CS to 10 also 2018-05-15 21:57:08 +09:00
smoogipoo
1acfc1bbab Fix ModHardRock not properly clamping Drain/OD 2018-05-15 21:25:20 +09: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
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
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
Joseph Madamba
f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Vidalee
87b9ffced2 added description of the IReadFromConfig interface 2018-03-20 21:51:05 +01:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Vidalee
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
Vidalee
6a8bc067cd Add license header 2018-03-11 21:30:48 +01:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f 2018-01-15 16:11:00 +01:00
Dean Herbert
b55adf655f Yeah, cinema mod isn't going to work 2018-01-12 17:46:24 +09:00
Dean Herbert
7f189080b9 Move fail override back to abstract implementation 2018-01-12 17:43:56 +09:00
Dean Herbert
9a77005d2e Make sure unimplemented auto mods aren't consumable 2018-01-12 14:26:23 +09:00
Dean Herbert
057efa24c7 Move a few interfaces to base classes 2018-01-12 14:26:09 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
Dean Herbert
b8fa33459a Merge branch 'master' into disable-unimplemented-mods 2018-01-03 13:39:29 +09:00
Felix Ang
3e6f0c198c Remove tab 2018-01-02 18:02:04 +01:00
Felix Ang
dccc134efa Don't allow auto to fail 2018-01-02 17:53:29 +01:00
Dean Herbert
f419518887 Make comment xmldoc 2018-01-02 15:33:00 +09:00