Commit Graph

646 Commits

Author SHA1 Message Date
55663b3576 Nest all UserActivities into UserActivity 2019-05-12 17:38:02 +02:00
5ac6bd8204 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 11:53:30 +02:00
038e49701e Move conditional to within BreakPeriod 2019-05-12 16:25:25 +09:00
1391aa342c Merge branch 'master' into break-pause 2019-05-12 16:15:24 +09:00
6a957ad27f Fix pause triggered when already paused 2019-05-10 15:51:12 +09:00
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
d5d31282e5 Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes 2019-05-05 20:55:42 +02:00
3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
b9a39fb788 Fix instant pausing when game becomes inactive
Resolves #4685.
2019-05-04 14:54:29 +09:00
a4a2ce5ec0 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-02 21:36:28 +02:00
5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02:00
b08fb5136e Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
fe8c705f1b Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-20 09:42:32 +02:00
5a3d6a0258 Fix post-merge errors 2019-04-17 16:11:59 +09:00
bb539af1a0 Merge branch 'master' into player-mod-reinstantiation 2019-04-16 22:35:21 +08:00
5887008fb3 Merge branch 'master' into user-status-wiring 2019-04-15 11:43:53 +02:00
c766631ad6 Check for breaks using GameplayClock time. 2019-04-13 11:39:22 -03:00
361c0ec9f2 Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in 2019-04-13 13:18:44 +02:00
da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
4c571acd67 Reinstantiate mods for every player 2019-04-09 13:33:16 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
e76897d6a7 Fix ResumeContainers appearing when resuming during breaks. 2019-04-07 16:32:55 -03:00
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
256a579de0 Allow player to not pause on focus loss 2019-03-26 13:17:00 +09:00
9e6cdd7bd5 Combine conditionals and clarify comment 2019-03-22 14:42:51 +09:00
5b8fd6822e Move storyboard logic region down 2019-03-22 14:39:20 +09:00
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
67a65b80fc Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
01f795b046 Make restart public rather than reimplementing 2019-03-20 19:45:04 +09:00
f43e7a880c Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 15:27:06 +09:00
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
df37973e84 Move showstoryboard into player 2019-03-19 13:13:19 +09:00
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
f1b2073bf6 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-19 13:01:05 +09:00
4f075f4740 Add more comprehensive testing 2019-03-18 20:33:43 +09:00
9433a97747 Add resume requesting support and fix exit scenarios 2019-03-18 20:33:43 +09:00
536b5e0dab Remove PausableGameplayContainer 2019-03-18 20:33:43 +09:00
f13003c53b Simplify and localise storyboard logic in Player.cs 2019-03-18 20:33:43 +09:00
bcaff9f7b4 Add basic pause tests 2019-03-18 20:33:43 +09:00
465c95e952 Refactor pause logic so GameplayClockContainer is in control 2019-03-18 20:33:43 +09:00
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00