1b456fd716
Fix a potential InvalidOperationException when entering song select
...
Closes #3052 .
2018-07-23 13:11:06 +02:00
2169a47325
Prevent fatal failures on delete failures
2018-07-23 10:39:43 +02:00
44a2ae5f9a
Fix incorrect variable usage
2018-07-23 08:33:47 +02:00
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
479fe98335
Add more prominent sound when skipping
2018-07-22 22:57:55 +02:00
6fa70ed696
Merge branch 'master' into centralise-judgement-display
2018-07-23 05:23:52 +09:00
3c59ccadd0
Fix gameplay always skipping to first hitobject time
...
Regresssed with previous build
2018-07-22 22:19:58 +02:00
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
77da100c0f
Merge branch 'master' into fix-model-import
2018-07-20 23:30:41 +09:00
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
fc6deb6ab5
Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
2018-07-20 16:42:46 +09:00
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
92fe996a8b
Merge branch 'master' into fix-model-import
2018-07-20 16:17:39 +09:00
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite
2018-07-20 16:17:36 +09:00
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
de8d05bb0c
Remove unnecessary setting of sample name to same value
2018-07-20 15:12:21 +09:00
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
9eb69a1e76
Restructure + corrects converting to support all systems
2018-07-19 17:47:55 +02:00
4e72794101
Converts float to int.
2018-07-19 15:55:38 +02:00
5dba048c46
Merge branch 'master' into mania-mask-container
2018-07-19 19:38:43 +09:00
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
693ba8e994
Add more ToString output
2018-07-19 18:43:11 +09:00
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
332c62f110
Merge branch 'fix-model-import' into open-downloaded-beatmas
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
# osu.Game/Database/SingletonContextFactory.cs
2018-07-19 14:11:31 +09:00
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
1d52231d4f
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
90840c9384
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 13:18:50 +09:00
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
5fe634a3b6
Click download button to load beatmap
2018-07-18 13:18:50 +09:00
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
...
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
9b7d01397b
Add ruleset config to HitObjectComposer
2018-07-17 16:53:32 +09:00
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
