Commit Graph

11260 Commits

Author SHA1 Message Date
86658e357b Override add instead 2019-03-20 14:55:52 +09:00
c186629b8a Reorder class 2019-03-20 14:55:38 +09:00
5f288650bf Fix misses/typos 2019-03-20 14:49:33 +09:00
9964644683 Fix merge 2019-03-20 14:37:32 +09:00
aca99c2c42 Merge branch 'master' into player-test-flexibility 2019-03-20 14:31:33 +09:00
2646126d86 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-20 14:29:20 +09:00
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
6511234804 Fix catch spinners not being allowed for conversion 2019-03-20 13:53:22 +09:00
1f95abf7c7 Fix regressions caused by removing specified depths
- urgentOverlayContent is added so toolbar can be loaded first
2019-03-19 21:30:24 -07:00
a39648edbc Normalize format of single line curly brackets 2019-03-19 20:51:43 -07:00
44e0291737 Remove specified depths of overlays 2019-03-19 20:47:12 -07:00
936c3e1ed9 Add safety type check to DrawableScrollingRuleset 2019-03-20 11:34:06 +09:00
45b8bfcfd3 Better protect not-generic DrawableRuleset 2019-03-20 11:31:03 +09:00
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
e5db0c973e Merge branch 'master' into fix-background-loading 2019-03-20 11:25:23 +09:00
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
e59917ed03 Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-20 10:58:15 +09:00
7b65d3437f Merge branch 'master' into fix-background-loading 2019-03-20 10:33:53 +09:00
5b6ac7abdc Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 10:31:42 +09:00
461a0a5038 Merge branch 'master' into remove-unnecessary-code 2019-03-20 10:22:24 +09:00
e0ab40b082 Rename missed files 2019-03-19 23:56:12 +09:00
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
9ca6699c64 Merge remote-tracking branch 'upstream/master' into player-test-flexibility 2019-03-19 20:33:39 +09:00
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
a1000524ee Merge branch 'master' into visual-settings-container 2019-03-19 20:17:12 +09:00
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
def15645f7 Update framework 2019-03-19 17:32:36 +09:00
025a266112 Update framework 2019-03-19 17:02:03 +09:00
e36ad3eb6b Add initial alpha in case 2019-03-19 16:11:22 +09:00
d2007cfb38 Fix weird transition 2019-03-19 16:10:28 +09:00
83f3d3abde Merge remote-tracking branch 'upstream/master' into disclaimer-support-text 2019-03-19 16:02:34 +09:00
3327e2841a Merge branch 'master' into fix-background-loading 2019-03-19 16:00:09 +09:00
dc26e90a8d Remove unused usings 2019-03-19 13:16:06 +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
4390e163fc Merge branch 'master' into storyboard-clock 2019-03-18 21:11:41 +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
15dd132c92 Use SetUpSteps attribute 2019-03-18 20:32:36 +09:00
a81461ba12 Add ability to test without nofail enabled 2019-03-18 20:32:28 +09:00
acc133896b Correct null check 2019-03-18 18:19:59 +09:00
8df47bc23e Increase flexibility of player test cases 2019-03-18 17:09:48 +09:00
05147768d3 Permit nulls 2019-03-18 15:50:34 +09:00
6a26972284 DI gameplay clock for Storyboards 2019-03-18 15:25:54 +09:00
14df9f94e2 Merge branch 'master' into fix-background-loading 2019-03-18 14:59:35 +09:00