Commit Graph

13621 Commits

Author SHA1 Message Date
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
717345f260 Use full application name 2018-07-22 20:00:34 +02:00
61a57b8050 Merge pull request #3093 from peppy/update-framework
Update framework
2018-07-23 02:57:46 +09:00
41ffc17fe3 Small clarification about to run dotnet restore 2018-07-21 13:27:45 +03:00
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
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
77da100c0f Merge branch 'master' into fix-model-import 2018-07-20 23:30:41 +09:00
f226e10033 Merge pull request #3042 from peppy/pause-input-fixes
Improve pause logic
2018-07-20 17:28:25 +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
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
56a0cd0789 Merge pull request #3065 from peppy/no-more-memory-sqlite
Remove SingletonContextFactory database testing interface
2018-07-20 16:37:54 +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
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
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
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
ffd3040fe2 Fix GameplayCursor state not restoring correctly after Show/Hide 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
e3fb781a5a Fix ArchiveModelManager's model import method not running import logic 2018-07-18 12:59:22 +09:00
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
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
c6816a6cf3 Fix potential quadratic complexity in taiko autoplay 2018-07-17 17:00:28 +09:00
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
64cde1ebad Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
97e71245e9 Merge branch 'master' into reduce-panel-width 2018-07-17 16:36:05 +09:00
2a6ebb1da4 Merge pull request #3055 from smoogipoo/scrolldirection-cleanup
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 16:35:59 +09:00
9f933187e9 Apply review feedback 2018-07-17 16:33:08 +09:00
569d0f7993 Merge branch 'master' into scrolldirection-cleanup 2018-07-17 15:39:13 +09:00
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
e681bd3244 Merge branch 'master' into fix-incorrect-mods 2018-07-17 15:23:21 +09:00
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
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
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
745d596343 Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
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
7a2dc3c674 Merge branch 'master' into clickable-download-notifications 2018-07-17 13:29:16 +09:00
61f58ed08a Merge branch 'master' into reduce-panel-width 2018-07-17 12:51:16 +09:00
9ee54dabfa Merge pull request #3028 from peppy/fix-drawable-load-regression
Fix regression in drawable rank first display
2018-07-17 12:30:28 +09:00
e4fc3a1c65 Merge branch 'master' into fix-drawable-load-regression 2018-07-17 12:22:12 +09:00
4f1b7c8065 Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00