1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 17:52:57 +08:00
Commit Graph

14142 Commits

Author SHA1 Message Date
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
Dean Herbert
64ead0fdf7 Add more tests and fix one remaining issue case 2018-07-20 11:55:17 +09:00
HoutarouOreki
a857999950 Refactor3 2018-07-20 00:52:50 +02:00
HoutarouOreki
a9299423cd Refactor2 2018-07-19 21:49:13 +02:00
HoutarouOreki
bcd132e87f API1 2018-07-19 19:07:24 +02: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
Dan Balasescu
824c217a0d Adjust comment 2018-07-19 19:46:03 +09:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container 2018-07-19 19:38:43 +09:00
smoogipoo
c3c270621b Fix hold note note masks blocking mouse input 2018-07-19 19:32:47 +09:00
smoogipoo
be297ddf76 Fix direction reversal not quite working correctly 2018-07-19 19:30:20 +09:00
Dean Herbert
1502edcdc6 Specify tests directly 2018-07-19 19:23:51 +09:00
Dean Herbert
d7f1766ee2 wip 2018-07-19 18:51:08 +09:00
Dean Herbert
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
Dean Herbert
693ba8e994 Add more ToString output 2018-07-19 18:43:11 +09:00
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
Dean Herbert
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
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
3e738c607a Add more song select tests 2018-07-19 13:39:42 +09:00
HoutarouOreki
11e0732a27 Refactor1, UX1 2018-07-18 19:32:15 +02: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
HoutarouOreki
837747e35f Streams3 2018-07-18 15:17:20 +02: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
6254f4e0f7 Fix tests 2018-07-18 18:00: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
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
Dean Herbert
90840c9384 Fix ArchiveModelManager's model import method not running import logic 2018-07-18 13:18:50 +09:00
Dean Herbert
9611292f4e FilterTask -> PendingFilter 2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644 Improve integrity of song select bind/change logic 2018-07-18 13:18:50 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +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
fb09385f51 Remove net471 targeting 2018-07-18 11:01:08 +09:00
HoutarouOreki
6baa761b9c Streams2 2018-07-18 03:26:08 +02:00