1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 10:12:54 +08:00
Commit Graph

577 Commits

Author SHA1 Message Date
Dean Herbert
2c76a039ca
Remove unnecessary folder reference 2019-02-20 10:46:25 +09:00
smoogipoo
5ff890434c Add beatmap argument 2019-02-19 17:57:29 +09:00
smoogipoo
c264a9cc74 Fix mods not being populated 2019-02-19 17:46:40 +09:00
smoogipoo
0ef15f5bd5 Update with PopulateAttributes() removal 2019-02-19 17:45:16 +09:00
smoogipoo
7ba0d090fc Fix post-merge errors 2019-02-19 16:40:52 +09:00
smoogipoo
7f4643a83d Adjust naming 2019-02-18 14:55:39 +09:00
smoogipoo
46b979a412 Fix colour changes not being reset 2019-02-18 14:55:20 +09:00
smoogipoo
cb17cbcdc4 Fix taiko nullrefing 2019-02-18 14:54:35 +09:00
smoogipoo
25d85b6eb4 Implement new difficulty calculator for Rulesets.Taiko 2019-02-18 14:54:21 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo
aa0bb7ca11 Add taiko difficulty calculator tests 2019-02-15 14:44:26 +09:00
tangalbert919
7349a6c527 Merge remote-tracking branch 'upstream/master' into android 2019-02-12 20:41:54 -06:00
HoLLy
ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
tangalbert919
80006109a2 Merge remote-tracking branch 'upstream/master' into android 2019-01-29 18:13:43 -06:00
LeNitrous
03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
LeNitrous
0f8c5bcbd7 actually the last whitespace 2019-01-26 13:50:27 +08:00
LeNitrous
73dbf5712d add license headers 2019-01-26 13:43:27 +08:00
LeNitrous
1427c9f576 trim whitespaces 2019-01-26 13:11:08 +08:00
LeNitrous
c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
Dean Herbert
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
tangalbert919
5835ccc04c Merge changes up to 2019.108.0 2019-01-08 17:53:57 -06:00
Shane Woolcock
a267a1a085 Merge branch 'master' into samah-ios 2019-01-08 17:09:26 +10:30
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics 2019-01-08 11:26:12 +09:00
tangalbert919
47268898be Expose internals for Android test projects 2019-01-06 00:04:25 -06:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
aec3753863 Fix imported replays having excess statistics 2019-01-03 14:01:20 +09:00
Shane Woolcock
32ffcb9865 Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
a83bee9461 Add ruleset visual tests 2018-12-29 20:05:37 +10:30
smoogipoo
b64932f6db Implement hit windows 2018-12-27 22:39:15 +09:00
Ivan Pavluk
d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07:00
Ivan Pavluk
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07:00
Ivan Pavluk
77e0d7ed8e
Fix formatting 2018-12-12 07:57:37 +00:00
Ivan Pavluk
e49e2fda9e Rename SuccessfulHitResult->LowestSuccessfulHitResult 2018-12-12 13:24:58 +07:00
Ivan Pavluk
a2d1c2c096
Fix formatting 2018-12-10 05:05:03 +00:00
Ivan Pavluk
839e177d2a
Docstring change 2018-12-10 04:59:35 +00:00
Ivan Pavluk
8457324044 SuccessfulHitWindow->SuccessfulHitResult 2018-12-10 09:04:12 +07:00
Ivan Pavluk
94f01b6678 Remove unused using directives 2018-12-06 20:05:03 +07:00
Ivan Pavluk
394c038c33 Removed unnecessary JudgementResult casts 2018-12-06 19:52:16 +07:00
Ivan Pavluk
407f9d2e78 Comment cleanup 2018-12-06 19:33:42 +07:00
Ivan Pavluk
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
Ivan Pavluk
8cae549541 Remove unused TaikoScoreProcessor constants 2018-12-06 15:58:03 +07:00
Ivan Pavluk
1b6658f4ee Move HealthIncreaseFor to Judgement 2018-12-06 15:09:42 +07:00
Ivan Pavluk
b5277de3f4
Remove extra newline 2018-12-06 14:08:32 +07:00
Ivan Pavluk
6d7e71c003 Fix switch stetement order 2 2018-12-05 16:28:36 +07:00
Ivan Pavluk
6c38db04ee Fix switch statement order in taiko judgements 2018-12-04 21:48:22 +07:00
Ivan Pavluk
f2b806d303 Remove swell miss HP from TaikoScoreProcessor 2018-12-04 21:36:43 +07:00
Ivan Pavluk
1975e11fcc Yet Another Whitespace Fix 2018-12-04 21:28:36 +07:00
Ivan Pavluk
7d692939fc Fixed being able to miss taiko objects by hitting them too early
Revamped taiko HP system
2018-12-04 21:20:44 +07:00
Ivan Pavluk
fbb7dc4507
Merge branch 'master' into master 2018-12-01 00:38:24 +07:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Ivan Pavluk
743598a1ac Decrease taiko swell HP drain 2018-11-30 01:33:04 +07:00
Ivan Pavluk
6b07d4581a Fixed too strong HP drain 2018-11-30 01:07:15 +07:00
Ivan Pavluk
4184f17709 ...Revert AffectsHP->AffectsHp, add HP abbrev 2018-11-29 23:12:02 +07:00
Ivan Pavluk
13a166a645 rename TaikoJudgement.AffectsHP to AffectsHp 2018-11-29 22:26:23 +07:00
Ivan Pavluk
d30ab4f77c fixed whitespace 2018-11-29 22:12:01 +07:00
Ivan Pavluk
2ca9864301 Fixed taiko swell hp and scoring 2018-11-29 22:05:13 +07:00
Ivan Pavluk
a378c50544
Fix TaikoDrumRollJudgement visibilityy 2018-11-29 09:47:12 +07:00
Ivan Pavluk
ce1e6d93e4
Update TaikoScoreProcessor.cs 2018-11-29 09:45:57 +07:00
Ivan Pavluk
00a243f7f2 Add license header 2018-11-29 09:19:41 +07:00
Ivan Pavluk
17337e05a1
Fixed whitespace 2018-11-29 09:06:40 +07:00
Ivan Pavluk
36b458bdee Fixed 2018-11-29 08:56:19 +07: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
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
08ffa18936 Fix nullref 2018-11-19 17:05:51 +09:00
Dean Herbert
a57f98ed4d
Merge branch 'master' into fix-taiko-lifetimes 2018-11-19 08:41:19 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
smoogipoo
e207dd728b Fix taiko proxies not receiving the correct lifetimes 2018-11-15 20:26:12 +09:00
jorolf
f0f7b15edc
remove unused using 2018-11-15 00:45:27 +01: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
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +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
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/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
2018-11-05 16:38:28 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
smoogipoo
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup 2018-10-02 09:37:04 +09:00
smoogipoo
08bd363827 Adjust taiko scrolling speed 2018-10-01 18:15:55 +09:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
smoogipoo
3479bfa409 Rename variable 2018-09-28 17:18:34 +09:00
smoogipoo
5f61faa2d9 Fix multiple hits in the same frame pressing multiple hitobjects 2018-09-25 18:37:25 +09:00
smoogipoo
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00