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

16610 Commits

Author SHA1 Message Date
Dean Herbert
8ccc935b6b
Merge pull request #4278 from smoogipoo/new-diffcalc-mania
Migrate mania to use the new difficulty calculator structure
2019-02-20 10:45:37 +09:00
Dean Herbert
43470da4ef
Merge branch 'master' into new-diffcalc-mania 2019-02-20 10:30:48 +09:00
Dean Herbert
fd442372ce
Merge pull request #4279 from smoogipoo/new-diffcalc-catch
Migrate catch to use the new difficulty calculator structure
2019-02-20 10:30:24 +09:00
Dean Herbert
d6a2fe6891
Remove excess newline 2019-02-20 10:29:08 +09:00
Dean Herbert
ebb3fd8200
Merge branch 'master' into new-diffcalc-mania 2019-02-20 10:20:49 +09:00
Dean Herbert
cf3e13c984
Merge branch 'master' into new-diffcalc-catch 2019-02-20 10:20:43 +09:00
Dean Herbert
9cbd3f43f3
Merge pull request #4281 from smoogipoo/new-diffcalc-osu
Migrate osu to use the new difficulty calculator structure
2019-02-20 09:45:17 +09:00
smoogipoo
0380293098 Add beatmap argument 2019-02-19 17:58:02 +09:00
smoogipoo
19f2593ef6 Merge branch 'remove-populateattributes' into new-diffcalc-osu 2019-02-19 17:57:47 +09:00
smoogipoo
4efc03cdf0 Add beatmap argument + fix crashes 2019-02-19 17:56:38 +09:00
smoogipoo
b7b1f0ef0c Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:55:56 +09:00
smoogipoo
ea281e8596 Add beatmap argument 2019-02-19 17:54:00 +09:00
smoogipoo
dac3c4564e Merge branch 'remove-populateattributes' into new-diffcalc-catch 2019-02-19 17:53:35 +09:00
smoogipoo
4dcf39846d Pass beatmap to CreateSkills() 2019-02-19 17:52:59 +09:00
smoogipoo
5457097342 Update with PopulateAttributes() removal 2019-02-19 17:48:00 +09:00
smoogipoo
1efc5179aa Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:46:52 +09:00
smoogipoo
21f9c813b2 Fix mods not being populated 2019-02-19 17:46:18 +09:00
smoogipoo
1a645b5115 Fix mods not being populated 2019-02-19 17:45:52 +09:00
smoogipoo
8459cf6ed0 Missed argument 2019-02-19 17:43:12 +09:00
smoogipoo
2765ffa190 Update with PopulateAttributes() removal 2019-02-19 17:42:24 +09:00
smoogipoo
419f541ab5 Merge branch 'remove-populateattributes' into new-diffcalc-catch 2019-02-19 17:40:56 +09:00
smoogipoo
f19a52b960 Rename argument 2019-02-19 17:40:35 +09:00
smoogipoo
37f9ac6eca Populate mods too 2019-02-19 17:39:30 +09:00
smoogipoo
847f7d8658 Adjust with PopulateAttributes() removal 2019-02-19 17:38:33 +09:00
smoogipoo
08422912c1 Merge branch 'remove-populateattributes' into new-diffcalc-osu 2019-02-19 17:36:54 +09:00
smoogipoo
ca8b7f24b4 Remove PopulateAttributes() 2019-02-19 17:36:33 +09:00
smoogipoo
e298b174d6 Merge remote-tracking branch 'origin/master' into new-diffcalc-osu 2019-02-19 17:24:53 +09:00
Dean Herbert
2bf5534bf1
Merge pull request #4292 from peppy/fix-multi-screen-test
Fix TestCaseMultiScreen intermittent failures
2019-02-19 17:08:59 +09:00
Dean Herbert
4504aee089 Unnecessary using 2019-02-19 16:50:56 +09:00
Dean Herbert
618455f7ba Remove exit step (needs login to show properly) 2019-02-19 16:47:59 +09:00
smoogipoo
3abb281ad5 Fix post-merge errors 2019-02-19 16:41:53 +09:00
smoogipoo
86b1a06b3d Merge remote-tracking branch 'origin/master' into new-diffcalc-catch
# Conflicts:
#	osu.Game.Rulesets.Catch/Difficulty/CatchLegacyDifficultyCalculator.cs
2019-02-19 16:41:31 +09:00
smoogipoo
bf17826363 Fix post-merge errors 2019-02-19 16:30:29 +09:00
smoogipoo
8104c45c25 Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
# Conflicts:
#	osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
2019-02-19 16:30:05 +09:00
Dean Herbert
9a60f3b0de
Merge branch 'master' into new-diffcalc-osu 2019-02-19 15:56:12 +09:00
Dean Herbert
b9c9c9ea21
Merge pull request #4277 from smoogipoo/diffcalc-merging-2
Implement new difficulty calculator structure
2019-02-19 15:55:29 +09:00
Dean Herbert
0609fcf7d4 Fix TestCaseMultiScreen intermittent failures 2019-02-19 15:52:53 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2 2019-02-19 15:42:15 +09:00
smoogipoo
ade5763160 Fix post-merge errors 2019-02-19 14:34:02 +09:00
smoogipoo
0001b6204b Merge branch 'diffcalc-merging-2' into new-diffcalc-osu
# Conflicts:
#	osu.Game.Rulesets.Osu/Difficulty/OsuLegacyDifficultyCalculator.cs
2019-02-19 14:33:34 +09:00
smoogipoo
7ed461aa8c XMLDoc DifficultyHitObject 2019-02-19 14:30:59 +09:00
smoogipoo
93b7b51d0a timeRate -> clockRate 2019-02-19 14:29:23 +09:00
smoogipoo
9d8ba4073c Add tests for LimitedCapacityStack 2019-02-19 14:18:49 +09:00
smoogipoo
3784b673ae History -> LimitedCapacityStack + re-xmldoc 2019-02-19 13:51:19 +09:00
smoogipoo
af0bb4d5e8 Remove mods from constructor 2019-02-19 13:40:39 +09:00
Dan Balasescu
805805020d
Merge pull request #4289 from peppy/fix-ruleset-loading
Fix test dlls being loaded as actual rulesets (and failing)
2019-02-19 12:25:11 +09:00
Dean Herbert
133c002d02 Fix test dlls being loaded as actual rulesets (and failing) 2019-02-19 12:13:55 +09:00
Dean Herbert
a5a1d9d1cc
Merge pull request #4187 from LeNitrous/mod-grow
Add "Grow" mod
2019-02-18 16:54:53 +09:00
Dan Balasescu
b1bdab8c36
Merge branch 'master' into mod-grow 2019-02-18 16:47:16 +09:00
smoogipoo
20f91106d9 Fix failing test 2019-02-18 15:02:46 +09:00