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

16577 Commits

Author SHA1 Message Date
smoogipoo
8459cf6ed0 Missed argument 2019-02-19 17:43:12 +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
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
659ec267b6 Fix spinners increasing strain 2019-02-18 14:58:33 +09:00
smoogipoo
c930cc5fb5 Fix incorrect OsuDifficultyHitObject instantiation 2019-02-18 14:58:13 +09:00
smoogipoo
fd70269021 Implement new difficulty calculator for Rulesets.Osu 2019-02-18 14:58:03 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
Dean Herbert
66a5abe9bb
Merge pull request #4266 from miterosan/CakeBuildImprovements
Improve the build script (and move to a better location)
2019-02-18 10:12:14 +09:00
Dean Herbert
d0c603e8e4
Merge branch 'master' into CakeBuildImprovements 2019-02-18 01:38:55 +09:00
miterosan
107e9550bc Merge branch 'CakeBuildImprovements' of https://github.com/miterosan/osu into CakeBuildImprovements 2019-02-17 13:57:47 +01:00
miterosan
9708634232 Correct the path to the cakebuild.csproj. 2019-02-17 13:57:14 +01:00
Dean Herbert
8ab39efe3e
Merge pull request #4256 from smoogipoo/diffcalc-testcases
Add difficulty calculator tests
2019-02-17 21:26:25 +09:00
Dean Herbert
42dc7644f2
Merge branch 'master' into diffcalc-testcases 2019-02-17 21:06:42 +09:00
miterosan
b61f929087
Merge branch 'master' into CakeBuildImprovements 2019-02-16 15:15:27 +01:00
miterosan
c09346080f Remove the unused desktop project variable 2019-02-16 14:51:20 +01:00
Dean Herbert
bab29b94a6
Fix nullref when entering multiplayer (#4268)
Fix nullref when entering multiplayer
2019-02-16 11:25:26 +09:00
smoogipoo
134840f118 Fix nullref 2019-02-16 11:18:17 +09:00
miterosan
ed67b580fa Also apply the changes to build.sh 2019-02-16 00:02:08 +01:00
miterosan
57fcdf9a0b Improve the buildscript 2019-02-15 23:47:22 +01:00
Dean Herbert
3372a0e5a2
Merge pull request #4265 from peppy/fix-screen-tests
Fix screen tests
2019-02-15 22:26:22 +09:00
Dean Herbert
aceb8c4cb0 Fix TestCasePlaySongSelect 2019-02-15 21:50:40 +09:00
Dean Herbert
4777fd1334 Merge remote-tracking branch 'upstream/master' into fix-screen-tests 2019-02-15 21:29:44 +09:00
Dean Herbert
c607b8c979 Update framework 2019-02-15 21:28:59 +09:00
Dean Herbert
bd4e8e132b
Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support
Add support for the HitCircleOverlap property of legacy skins
2019-02-15 21:27:56 +09:00
Dean Herbert
dfb4e82125
Merge pull request #4259 from nekodex/fix-cursor-on-startup
Fix mouse cursor appearing prematurely during startup
2019-02-15 21:27:37 +09:00
Dean Herbert
90e462309f
Add newline 2019-02-15 21:16:54 +09:00
Dean Herbert
89981c02a2
Merge branch 'master' into fix-cursor-on-startup 2019-02-15 21:15:23 +09:00
Jamie Taylor
1c8212d510
Add a TestCase for looong combos 2019-02-15 21:03:55 +09:00