Commit Graph

2663 Commits

Author SHA1 Message Date
aa97487f8e Merge branch 'master' into hp-drain 2019-12-27 14:58:22 +09:00
fd8c5d7706 Improve notification overlay test robustness
Stress testing one of the notification overlay tests by running it 10000
times on repeat has shown that it is susceptible to intermittent
failures due to races between delays and asserts checking the number of
currently progressing notifications and the actual progress update,
which contains a random generation factor.

Replace step sequences checking for notification completion by waiting
and asserting with explicit until steps that don't terminate unless
there are zero progressing notifications.
2019-12-26 23:01:31 +01:00
cac011edc1 Merge branch 'master' into hp-drain 2019-12-26 23:51:12 +09:00
00a36c388c Fix tests 2019-12-26 19:18:39 +09:00
7ee0370d23 Add some tests 2019-12-26 17:48:46 +09:00
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
9702cc9809 Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
504a55e803 Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
a265a0c7c5 Merge branch 'master' into settings-source-value-changed 2019-12-25 17:23:08 +09:00
0677f746aa Provide the ruleset to converter classes 2019-12-24 16:02:16 +09:00
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
69227d6179 Add asserts 2019-12-22 06:37:18 +09:00
725008286f Move test and remove pointless duplicate tests 2019-12-22 06:09:16 +09:00
02d3f0f241 Merge branch 'master' into settings-source-value-changed 2019-12-21 19:40:07 +09:00
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
df14f473c2 Split tests out 2019-12-20 19:52:54 +09:00
e2c7f15ed8 Merge branch 'master' into netcoreapp3.1 2019-12-20 18:41:29 +09:00
f386f88bed Merge branch 'master' into fix-waveform-cross-thread-access 2019-12-20 18:07:51 +09:00
0ebdf90dfa Move methods below ctor 2019-12-20 18:07:39 +09:00
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
705cdde148 Fix incorrect test 2019-12-20 16:42:45 +09:00
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
81e842f6b4 Fix waveform test beatmap accessing zip archive across multiple threads 2019-12-19 19:48:48 +09:00
4e11fb0fd7 Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text 2019-12-18 19:36:16 +09:00
39489e2901 Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash 2019-12-18 18:51:56 +09:00
5664ce3109 Add hitobject container regression test 2019-12-18 18:51:12 +09:00
36172cf2bd Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
5cdc7d3b18 Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
Add initial implementation of a legacy beatmap encoder
2019-12-18 18:43:14 +09:00
51a01c7006 Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
6683460240 Merge branch 'master' into update-beatmap-settings 2019-12-18 17:59:27 +09:00
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
fa067b8799 Merge branch 'master' into legacy-beatmap-saving 2019-12-18 17:17:03 +09:00
54572b6de9 Update selected mdos references 2019-12-18 16:42:18 +09:00
7831e6ed33 Implement NewsArticleCover class (#7192)
Implement NewsArticleCover class
2019-12-18 16:15:23 +09:00
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +09:00
ad7923f9b9 Fix test methods not being renamed. 2019-12-17 19:25:17 +01:00
0a278ef943 Apply review suggestions 2019-12-17 19:23:30 +01:00
036efb9947 Merge branch 'master' into fix-effect-points 2019-12-18 01:43:15 +09:00
886db8eb22 Merge branch 'master' into fix-local-score-availability 2019-12-18 01:15:20 +09:00
69da6ed9a1 Fix test re-using the same storage 2019-12-17 23:53:18 +09:00
3d13fe485d Merge pull request #7238 from huoyaoyuan/fxcop
Apply FxCop at game side
2019-12-17 21:29:52 +09:00
fd2785bab3 Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
8cd96acffc CounterPill implementation 2019-12-17 12:05:35 +03:00
927ba4c113 Update expected exception in test. 2019-12-17 15:20:05 +08:00
59c3b39ed8 Add test 2019-12-17 15:47:13 +09:00
5079feaad1 Remove unnecessary string interpolation 2019-12-17 14:04:03 +09:00
d7b3578cc6 CA2201: throw correct exception type. 2019-12-17 13:00:02 +08:00
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09:00
272d7d0ca9 Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-17 12:36:20 +09:00