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

1343 Commits

Author SHA1 Message Date
smoogipoo
cbf662eb56 Remove redundant else statement 2019-05-15 10:55:02 +09:00
Alten
37ec722a1d Shorten code 2019-05-14 16:18:46 -04:00
Alten
ad5ad8ccb5 Fix hard crash 2019-05-13 23:29:24 -04: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
Dean Herbert
daa2786dbd Use a constant for the default value 2019-05-12 23:08:42 +09:00
Dean Herbert
487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev 2019-05-12 21:45:52 +09:00
Dean Herbert
b8446fb67f Fix fallbacks for SliderTrackOverride and SliderBall too 2019-05-12 18:51:31 +09:00
Dean Herbert
cbf126db25
Merge branch 'master' into fix-slider-border-color 2019-05-12 17:25:49 +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
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Joehu
8ef6a745f7 Fix slider border not reverting to default color 2019-05-05 22:43:03 -07:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
Dean Herbert
27c1c368ac Remove unused using 2019-04-27 20:42:07 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
KingLuigi4932
4e0f21102b Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2 2019-04-25 14:04:12 +03: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
4f31eee5ad
Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
Dean Herbert
67382724f6 Reword and reoganise logic 2019-04-24 16:58:13 +09:00
Dean Herbert
e69963e60e Ensure there is enough time before the first object in osu! (roughly following osu-stable specs) 2019-04-24 15:28:14 +09:00
David Zhao
9890884726 Remove fade in, update comment 2019-04-23 14:23:09 +09:00
smoogipoo
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
smoogipoo
144e6012dc Implement hp increase for osu! 2019-04-22 17:24:42 +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
Dean Herbert
879f6152b0 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-04-17 22:17:10 +08: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
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +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
Dean Herbert
9802d8ab11
Rename setting 2019-04-04 17:18:53 +09:00
Dean Herbert
d54750aa37 Remove incorrect class 2019-04-04 17:10:29 +09:00
Dean Herbert
109f577b59 Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail 2019-04-04 17:09:38 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
smoogipoo
d8af5e1c5a Update in-line with drawnode changes 2019-04-02 11:56:22 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
Dean Herbert
2060bad3bc Try applying minimal inspection fixes for latest Rider EAP 2019-04-01 13:28:14 +09:00