1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Commit Graph

13794 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dean Herbert
2a6ebb1da4
Merge pull request #3055 from smoogipoo/scrolldirection-cleanup
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 16:35:59 +09:00
Dean Herbert
9f933187e9 Apply review feedback 2018-07-17 16:33:08 +09:00
Dean Herbert
569d0f7993
Merge branch 'master' into scrolldirection-cleanup 2018-07-17 15:39:13 +09:00
Dean Herbert
15516a499d
Merge pull request #2959 from peppy/fix-incorrect-mods
Fix mods not correctly resetting when changing ruleset at song select
2018-07-17 15:39:02 +09:00
Dean Herbert
e681bd3244
Merge branch 'master' into fix-incorrect-mods 2018-07-17 15:23:21 +09:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
Dan Balasescu
bac577ca24
Merge pull request #3053 from peppy/fix-incorrect-leadin
Fix lead-in time not being long enough in many cases
2018-07-17 15:11:36 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
Dan Balasescu
b69f61886c
Merge pull request #2991 from peppy/clickable-download-notifications
Add the ability to click completed download notifications to select beatmap
2018-07-17 13:40:54 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications 2018-07-17 13:29:16 +09:00