1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 12:23:22 +08:00
Commit Graph

62 Commits

Author SHA1 Message Date
smoogipoo
f42be7a6d7 Merge branch 'master' into sorcerer-catch-changes 2020-05-04 15:25:09 +09:00
Salman Ahmed
f841eb7e06
Replace constructing a whole Catcher with static calculation methods 2020-04-22 07:27:15 +03:00
smoogipoo
c5aae9b757 Fix post-merge errors 2020-04-08 12:19:09 +09:00
smoogipoo
4e55212638 Merge branch 'master' into sorcerer-catch-changes 2020-04-08 12:15:24 +09:00
Dean Herbert
03b90fe2db Remove local application of same margin in CatchDifficultyCalculator 2020-03-31 19:01:49 +09:00
Dean Herbert
1523c4c63f Merge branch 'master' into catcher-area-file-cleanup 2020-03-14 15:41:26 +09:00
Dean Herbert
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +09:00
smoogipoo
c8cdc5fda5 Expose half catcher width to movement skill 2020-03-13 12:43:01 +09:00
smoogipoo
cf12ffd27e Merge remote-tracking branch 'origin/master' into sorcerer-catch-changes
# Conflicts:
#	osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
2020-02-13 17:18:32 +09:00
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
HoLLy
cb664dd183 Change OfType<> to Cast<> to be more clear 2019-05-12 22:08:47 +02:00
HoLLy
3981cf55fa Fix order of nested hitobjects on 2B Catch maps 2019-05-12 21:31:16 +02:00
smoogipoo
2824a32db6 Adjust circle-size bonus point 2019-04-03 11:39:13 +09:00
smoogipoo
21e62c37d8 General fixes 2019-04-02 07:28:04 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
smoogipoo
b402981fc6 Buff CS > 5 2019-04-01 10:57:01 +09:00
smoogipoo
839dd7343f Revert "Use fresh mods for each difficulty calculation"
This reverts commit 24fb25f1cd.
2019-03-23 15:57:22 +09:00
smoogipoo
94340608d4 Merge remote-tracking branch 'origin/master' into sorcerer-diffcalc-changes 2019-03-19 17:29:19 +09:00
Dean Herbert
0fbc049f8d
Remove newline 2019-03-19 16:25:34 +09:00
smoogipoo
dd60e3f1c4 Fix halfCatchWidth not being reset between runs 2019-03-19 15:59:04 +09:00
smoogipoo
57727ac184 Remove preprocess until a later point in time 2019-03-19 15:53:27 +09:00
smoogipoo
5d9477e1e4 Fix difficulty calculation using the pre-mod catcher size 2019-03-19 15:35:14 +09:00
smoogipoo
2bf01e876e Merge branch 'reinstantiate-mods' into sorcerer-diffcalc-changes 2019-03-14 23:42:11 +09:00
smoogipoo
24fb25f1cd Use fresh mods for each difficulty calculation 2019-03-14 23:41:52 +09:00
smoogipoo
412a3c0e82 Merge branch 'fix-catch-diffcalc-mods' into sorcerer-diffcalc-changes 2019-03-14 23:07:58 +09:00
smoogipoo
d13423fcdb Fix catch difficulty calculator not providing adjustment mods 2019-03-14 23:06:23 +09:00
smoogipoo
b51a457e5a Implement sorcerer's diffcalc changes 2019-03-06 14:36:30 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
9192f7d717 Merge remote-tracking branch 'origin/master' into ctb-diffcalc
# Conflicts:
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
2019-02-20 12:22:32 +09:00
smoogipoo
ea281e8596 Add beatmap argument 2019-02-19 17:54:00 +09:00
smoogipoo
1a645b5115 Fix mods not being populated 2019-02-19 17:45:52 +09:00
smoogipoo
2765ffa190 Update with PopulateAttributes() removal 2019-02-19 17:42:24 +09:00
smoogipoo
3abb281ad5 Fix post-merge errors 2019-02-19 16:41:53 +09:00
smoogipoo
83cab2ba8a Fix incorrect hitobject being used as the last hitobject 2019-02-18 14:50:47 +09:00
smoogipoo
8eba94e8c9 Implement new difficulty calculator for Rulesets.Catch 2019-02-18 14:50:47 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
HoLLy
f6318d3670 Add comment explaining *= 0.8f 2019-02-01 13:06:36 +01:00
HoLLy
30292f44da Fix Catch diffcalc being off 2019-01-31 17:57:59 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
9f933187e9 Apply review feedback 2018-07-17 16:33:08 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Dean Herbert
34498f7f86 Use var where possible 2018-06-21 17:49:04 +09:00
Dean Herbert
c64f64814f Remove unnecessary AimRating 2018-06-21 17:32:10 +09:00
Dean Herbert
a9cb214aa9 Replace usage of GetEnumerator 2018-06-21 16:31:33 +09:00
smoogipoo
afcf91a4c5 What the... 2018-06-21 13:12:22 +09:00
smoogipoo
9314f49bc3 Expose the catch width from the Catcher 2018-06-21 12:57:59 +09:00
smoogipoo
5d0c847835 Fix post-merge errors 2018-06-21 12:26:21 +09:00
smoogipoo
c9581a2d56 Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
2018-06-21 12:15:25 +09:00