Commit Graph

8654 Commits

Author SHA1 Message Date
f200cfe40d Add labelled text box files 2018-07-20 13:05:19 +03: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
0e7bb3b548 Merge branch 'master' into no-more-memory-sqlite 2018-07-20 16:17:36 +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
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
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
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
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
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
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
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
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
84c13174d9 Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
40a1f8313e Merge branch 'master' into make-notifications-quieter 2018-07-17 03:24:47 +09:00
f4591c6d0b Merge branch 'master' into fix_color_parsing 2018-07-17 00:25:32 +09:00
da300baff1 Update hide logic 2018-07-17 00:06:51 +09:00
ca7b61367f Merge branch 'master' into correctQuickFade 2018-07-17 00:02:15 +09:00
fc77e01ba9 Fix formatting, make StripComments protected
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
58fe434dd0 Don't use in invalidation logic to avoid incorrect execution 2018-07-16 16:39:52 +09:00
98cddc0c04 Fix some legacy cases 2018-07-16 16:26:37 +09:00
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
a117b323e2 Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
429306aa87 Fix casing, use ordinal string comparison when stripping comments 2018-07-16 01:54:20 +02:00
87a4bf3d92 Remove using directive for regex in LegacyDecoder 2018-07-16 01:08:30 +02:00
6c861a1638 Strip comments from everything except metadata 2018-07-16 01:04:41 +02:00
4829f4f09c Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
453d58bcbd Hide Content instead of particular overlays 2018-07-15 01:10:05 +02:00
c8697e1743 Fix KeyCounter counting clicks when game is paused 2018-07-14 03:08:28 +02:00
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
e0bcd6988a Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
d63611a9b3 Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
6698f320fb Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
4f5578245e Fix regression causing previews to not play 2018-07-13 21:45:49 +09:00