miterosan
2726d91594
Remove unessary usings
2018-07-23 16:05:39 +02:00
miterosan
344ec40a27
Readd usings I removed with my merge
2018-07-23 15:48:48 +02:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
Dan Balasescu
9dc55688d2
Merge pull request #3103 from peppy/fix-testing-regression
...
Fix fatal test result on temporary file deletion failures
2018-07-23 19:44:25 +09:00
Dean Herbert
2169a47325
Prevent fatal failures on delete failures
2018-07-23 10:39:43 +02:00
Dean Herbert
82ea4456e4
Fix testing regression
2018-07-23 10:33:10 +02:00
Dean Herbert
9f1d37e052
Merge pull request #3079 from smoogipoo/centralise-judgement-display
...
Centralise method of disabling playfield judgements
2018-07-23 05:34:50 +09:00
Dean Herbert
6fa70ed696
Merge branch 'master' into centralise-judgement-display
2018-07-23 05:23:52 +09:00
Dean Herbert
f285279258
Merge pull request #3076 from smoogipoo/per-object-css
...
Add support for multiple sample banks on a per-hitobject level
2018-07-23 05:07:46 +09:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
Dean Herbert
aa54472600
Merge pull request #3095 from VPeruS/patch-1
...
README clarification about dotnet restore for VScode users
2018-07-23 03:00:45 +09:00
Dean Herbert
717345f260
Use full application name
2018-07-22 20:00:34 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
61a57b8050
Merge pull request #3093 from peppy/update-framework
...
Update framework
2018-07-23 02:57:46 +09:00
VperuS
41ffc17fe3
Small clarification about to run dotnet restore
2018-07-21 13:27:45 +03:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dan Balasescu
1796ffde14
Merge pull request #3063 from peppy/fix-model-import
...
Fix ArchiveModelManager's model import method not running import logic
2018-07-20 23:50:29 +09:00
Dean Herbert
77da100c0f
Merge branch 'master' into fix-model-import
2018-07-20 23:30:41 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
Dean Herbert
f226e10033
Merge pull request #3042 from peppy/pause-input-fixes
...
Improve pause logic
2018-07-20 17:28:25 +09:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
fc6deb6ab5
Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
2018-07-20 16:42:46 +09:00
Dean Herbert
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
Dan Balasescu
56a0cd0789
Merge pull request #3065 from peppy/no-more-memory-sqlite
...
Remove SingletonContextFactory database testing interface
2018-07-20 16:37:54 +09:00
Dean Herbert
92fe996a8b
Merge branch 'master' into fix-model-import
2018-07-20 16:17:39 +09:00
Dean Herbert
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite
2018-07-20 16:17:36 +09:00
Dean Herbert
2af5d795fe
Merge pull request #3072 from davidv273/fix-import-float-coords
...
Fixes parsing of HitObject in case of float coords
2018-07-20 16:08:39 +09:00
smoogipoo
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
smoogipoo
de8d05bb0c
Remove unnecessary setting of sample name to same value
2018-07-20 15:12:21 +09:00
smoogipoo
967d0c3c72
Adjust testcase
2018-07-20 15:12:04 +09:00
David V
9eb69a1e76
Restructure + corrects converting to support all systems
2018-07-19 17:47:55 +02:00
David V
4e72794101
Converts float to int.
2018-07-19 15:55:38 +02:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
Dean Herbert
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
Dean Herbert
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
ffd3040fe2
Fix GameplayCursor state not restoring correctly after Show/Hide
2018-07-18 19:59:04 +09:00
Dean Herbert
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
Dean Herbert
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
Dean Herbert
d0f7bdbcb8
Merge pull request #3056 from ekrctb/fix-potential-quadratic-complexity
...
Fix potential quadratic complexity in taiko autoplay
2018-07-18 11:48:22 +09:00
Dean Herbert
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
ekrctb
c6816a6cf3
Fix potential quadratic complexity in taiko autoplay
2018-07-17 17:00:28 +09:00
Dan Balasescu
fef78abdb3
Merge pull request #3054 from peppy/use-switch-over-if
...
Use switch with type matching in place of if-else where possible
2018-07-17 16:58:59 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width
2018-07-17 16:36:05 +09:00
