h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 12:43:06 +08:00
Code Issues Releases Wiki Activity
24,383 Commits 5 Branches 664 Tags 362 MiB
8b14090c95
Commit Graph

4233 Commits

Author SHA1 Message Date
Dean Herbert
5110ae82a1 Tidy up implementation 2019-11-12 21:38:08 +09:00
Huo Yaoyuan
42a98c5d87 Use constants. 2019-11-12 20:07:01 +08:00
Huo Yaoyuan
ca52d09e81 Enforce expression body for typical simple ones. 2019-11-12 19:56:37 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
58df6930b2 Get error message from server 2019-11-12 19:34:20 +09:00
Dean Herbert
f04d7f733f Merge remote-tracking branch 'upstream/master' into favourite-beatmap 2019-11-12 19:19:29 +09:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables 2019-11-12 18:59:43 +09:00
Andrei Zavatski
a69a4643c9 Simplify LINQ expressions 2019-11-12 08:45:21 +03:00
Andrei Zavatski
fa01e11a6e Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-12 08:25:42 +03:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow 2019-11-12 11:35:01 +09:00
Andrei Zavatski
0578f91a76 Small logic adjustments 2019-11-11 19:06:46 +03:00
Andrei Zavatski
32cc7b3d4d CI fix 2019-11-11 19:04:50 +03:00
Andrei Zavatski
c5b64e26a3 Layout adjustment 2019-11-11 18:51:29 +03:00
Andrei Zavatski
5f5d130d1a Update mod filter visibility on user change 2019-11-11 18:40:57 +03:00
Andrei Zavatski
31191dadf1 Handle mods change 2019-11-11 18:31:42 +03:00
Andrei Zavatski
2cfd54ca0d Handle scope changing 2019-11-11 18:27:48 +03:00
Andrei Zavatski
00b9229737 Add mod filter to beatmap overlay 2019-11-11 18:21:07 +03:00
Andrei Zavatski
32b2f5e330 Use Bindable for ScoresContainer 2019-11-11 18:10:25 +03:00
Andrei Zavatski
3655f88180 Merge dependency 2019-11-11 17:56:57 +03:00
Andrei Zavatski
4145e25f7b Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-11 17:55:10 +03:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
9db73d33cc
Remove horizontal padding on toolbar ruleset selector (#6780) 
Remove horizontal padding on toolbar ruleset selector
 2019-11-11 10:02:30 +09:00
Andrei Zavatski
93954c8da0 Use BindableList for selected mods 2019-11-10 23:58:07 +03:00
Andrei Zavatski
e3d8e29cdd Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-10 23:38:41 +03:00
Dean Herbert
5c47641608
Reorder conditional 2019-11-09 16:23:22 +09:00
Joehu
b675024161 Remove horizontal padding on toolbar ruleset selector 2019-11-08 20:28:24 -08:00
Andrei Zavatski
423e26a4d1 Fix header text could be sticked together 2019-11-06 13:07:25 +03:00
Andrei Zavatski
0f53725005 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-06 13:03:34 +03:00
Andrei Zavatski
4330507da8 Use api.IsLoggedIn 2019-11-06 12:46:25 +03:00
Andrei Zavatski
1f3b209a6c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:26:41 +03:00
Dean Herbert
09e9ef0e4b
Add background colour to music player ProgressBar (#6741) 
Add background colour to music player ProgressBar
 2019-11-06 17:44:08 +09:00
Ganendra Afrasya
02c21a1379 Make progress bar hoverable 2019-11-06 14:11:47 +07:00
Ganendra Afrasya
d985d04857 Add background colour to music player ProgressBar 2019-11-06 14:07:34 +07:00
smoogipoo
0b09fb293e Fix background being coloured 2019-11-06 15:16:00 +09:00
Dean Herbert
a3d8738cab
Merge branch 'master' into vote-pill-fix 2019-11-06 14:52:06 +09:00
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +09:00
Dean Herbert
44d0791676 Update button usage 2019-11-05 16:26:31 +09:00
unknown
a92b32f6dc add basic tests 2019-11-05 00:56:09 +08:00
unknown
1216d66a4c Merge remote-tracking branch 'origin/customized-mods' into customized-mods 2019-11-04 23:21:45 +08:00
Joehu
fe23b9a262 Fix mod section overflowing mod select overlay at higher ui scale 2019-11-03 07:32:47 -08:00
Andrei Zavatski
48385dbdfe Layout adjustments 2019-11-03 14:31:23 +03:00
Dean Herbert
5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Andrei Zavatski
1e73cf1025 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-01 21:14:09 +03:00
Dean Herbert
898520935e Move link handling code to OsuGame 
This allows for future calls from arguments / associations
 2019-11-01 11:40:51 +09:00
Dan Balasescu
54681a6206
Merge branch 'master' into catch-api-request-exceptions 2019-11-01 11:33:23 +09:00
Dean Herbert
ce19b2ed36 Avoid using CreateChildDependencies with a *child* bindable 
Don't do this.
 2019-10-31 17:16:26 +09:00
Dean Herbert
3e3ff81229 Reorder methods 2019-10-31 17:13:00 +09:00
Dean Herbert
4f04abf282 Fix tabs to match design (should not show pinhair line) 2019-10-31 16:54:28 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
Dean Herbert
bf45fa6309 Use lambda function expression 2019-10-31 16:24:03 +09:00
Dean Herbert
f8187fa301 Don't rely on masking for bar display 2019-10-31 16:23:10 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
Dean Herbert
0cd912fcd3 Cover all non-APIAccess APIRequest calls with exception handling 2019-10-31 15:04:13 +09:00
Andrei Zavatski
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
Andrei Zavatski
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
Andrei Zavatski
2c31492bbe Fix comment can be voted if user is null 2019-10-30 03:27:06 +03:00
Andrei Zavatski
1502a6c631 Cleanups 2019-10-30 03:09:14 +03:00
Andrei Zavatski
092d16bb64 Dont use binding to set disabled value 2019-10-29 23:43:16 +03:00
Andrei Zavatski
30d9b21b86 Condition simplification 2019-10-29 21:57:20 +03:00
Andrei Zavatski
e287dae64b Fix VotePill can be activated by the comment sender 2019-10-29 21:25:48 +03:00
Ganendra Afrasya
5c2917d303 Place sign in button inside ShakeContainer 2019-10-30 00:50:04 +07:00
Dean Herbert
54befb6f8f Remove adjacent day separators 2019-10-29 15:45:41 +09:00
Dean Herbert
b06e70e546 Add failing test showing issue with day separator logic 2019-10-29 15:27:08 +09:00
Dean Herbert
09a6d1184a Tidy up order of scroll changes 2019-10-29 14:33:05 +09:00
Dean Herbert
d1c6e3f620 Add test for scroll to end when max history is exceeded 2019-10-29 14:32:52 +09:00
Andrei Zavatski
85769982a0 Refactor LoadingButton 2019-10-24 17:49:34 +03:00
Andrei Zavatski
b310fd9d44 Adjust naming inside the LoadingButton 2019-10-23 13:39:42 +03:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
smoogipoo
851773a842 Apply adjustments for framework changes 2019-10-23 14:04:06 +09:00
Joehu
7b7a87afa8 Put back mobile conditional 2019-10-22 19:51:29 -07:00
Joehu
8154cc1b16 Fix registration textboxes always focusing after pressing escape 2019-10-22 14:40:56 -07:00
Dean Herbert
e9aa7f3218 Subclass and use yellow for stand-alone chat display 2019-10-23 00:24:19 +09:00
Dean Herbert
3b4823abe7 Use foreach 2019-10-23 00:17:37 +09:00
Dean Herbert
0ba287a7fd Rename variable 2019-10-23 00:14:22 +09:00
Dean Herbert
7084aa7b81
Merge branch 'master' into chat-day-separator 2019-10-22 15:48:42 +09:00
Dean Herbert
001eae2c02 Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable 2019-10-22 15:04:16 +09:00
Andrei Zavatski
09b2f11bd5 Remove unused variable 2019-10-22 03:14:20 +03:00
Andrei Zavatski
b1eac6b400 Apply suggested changes 2019-10-22 03:11:19 +03:00
Andrei Zavatski
e9ae838f46 CI fixes 2019-10-22 02:16:52 +03:00
Joehu
f7924d3bad Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox" 2019-10-21 16:00:09 -07:00
Andrei Zavatski
2896ed90e2 Fix incorrect date comparison 2019-10-22 01:55:26 +03:00
Andrei Zavatski
bb7af1e39c Fix some margin/padding issues 2019-10-22 01:45:04 +03:00
Andrei Zavatski
d19041fa53 Implement DaySeparator class 2019-10-22 01:30:37 +03:00
Andrei Zavatski
75f444e431 Basic implementation 2019-10-22 00:44:58 +03:00
Salman Ahmed
eed6f708a2
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-19 04:06:43 +03:00
Andrei Zavatski
266f9a065f Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill 2019-10-18 19:25:05 +03:00
Dean Herbert
6b0976ff1e Remove a weird unicode charcter from file 2019-10-18 16:55:42 +09:00
Andrei Zavatski
9daafb4636 Simplify hover/unhover logic 2019-10-18 03:06:01 +03:00
Joehu
e5b50b5e1f Fix slider bar regression when using arrows 2019-10-17 13:54:36 -07:00
Andrei Zavatski
22511e41e2 Use received data to set isVoted bindable 2019-10-17 23:20:01 +03:00
Andrei Zavatski
9ee63a8c1a Apply suggested changes 2019-10-17 16:28:32 +03:00
Andrei Zavatski
a858e713f8 Fix multiple spaces 2019-10-17 15:40:09 +03:00
Andrei Zavatski
6b196a6ce7 CI fixes 2019-10-17 15:24:51 +03:00
Andrei Zavatski
42cd4107a0 Implement CommentVoteRequest and adjust UI 2019-10-17 15:04:30 +03:00
Andrei Zavatski
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
Andrei Zavatski
1f28c00594 UI implementation 2019-10-17 13:10:28 +03:00
Andrei Zavatski
38dcd42d08 Parse voted comments 2019-10-17 12:35:12 +03:00
Andrei Zavatski
2dac3a6efe Handle hitting the maximum allowed number of favourited beatmaps 2019-10-16 13:58:29 +03:00
Dean Herbert
4f356f3aeb
Merge branch 'master' into favourite-beatmap 2019-10-16 18:22:09 +09:00
iiSaLMaN
60133ba0c3 Propagate BeatmapSetInfo to tab items with bindable 2019-10-15 23:33:50 +03:00
Andrei Zavatski
2543de22bd Simplify DeletedChildrenPlaceholder behavior 2019-10-15 12:47:35 +03:00
Andrei Zavatski
7ba15df0c0 Convert to method group 2019-10-15 12:27:32 +03:00
Andrei Zavatski
d321794ef5 Make loadedTopLevelComments a local filed 2019-10-15 12:26:16 +03:00
Andrei Zavatski
96e31b9cca Add support for deleted comments with message 2019-10-15 12:07:01 +03:00
Andrei Zavatski
213f00556d Remove onShowDeletedChanged function 2019-10-15 11:30:50 +03:00
Andrei Zavatski
b2885e7b13 Move load() under the ctor 2019-10-15 11:26:58 +03:00
Andrei Zavatski
eb5dad08aa Remove initial filed 2019-10-15 11:25:58 +03:00
Andrei Zavatski
3c714dc013 APICommentsController -> CommentBundle 2019-10-15 11:20:06 +03:00
Andrei Zavatski
75a2e383f2 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-15 11:19:45 +03:00
Joehu
efc201ec85 Make PlaylistOverlay a VisibilityContainer 2019-10-14 16:40:53 -07:00
Joehu
ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Andrei Zavatski
ad32d66365 CI fix 2019-10-15 01:10:23 +03:00
Andrei Zavatski
0fd6b0c852 Use linq expression to count deleted comments 2019-10-15 00:55:33 +03:00
Andrei Zavatski
b84c9dfd84 Use Humanizer.ToQuantity instead of manual parsing 2019-10-15 00:35:44 +03:00
Andrei Zavatski
09621f066e Childs -> Children 2019-10-15 00:32:21 +03:00
Andrei Zavatski
d4843285db CI fixes 2019-10-14 17:33:14 +03:00
Andrei Zavatski
139170cdc8 Fix incorrect padding for nested comments 2019-10-14 17:26:12 +03:00
Andrei Zavatski
b53fb0d228 Remove empty line 2019-10-14 17:07:50 +03:00
Andrei Zavatski
a81d5cd819 Handle links in message 2019-10-14 16:56:07 +03:00
Andrei Zavatski
7cd3f5656d Cleanups 2019-10-14 16:43:43 +03:00
Andrei Zavatski
7ac87494e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-14 16:21:34 +03:00
Dean Herbert
f0e9700349 Inline delegate event 2019-10-14 21:49:02 +09:00
Dean Herbert
b7ddf160b4 OnClick should actually handle the event 2019-10-14 21:48:12 +09:00
Dean Herbert
4e6ab1dad3 Tidy up state management via bindable usage 2019-10-14 21:42:07 +09:00
Dean Herbert
7794457550 Remove more constants 2019-10-14 21:36:10 +09:00
Dean Herbert
4822496c13 Fix more naming 2019-10-14 21:34:16 +09:00
Dean Herbert
89f270a19a SortSelector -> SortTabControl 2019-10-14 21:32:41 +09:00
Dean Herbert
e191c2c50e Tidy up constants and method naming 2019-10-14 21:32:16 +09:00
Andrei Zavatski
328b4d6863 Cancel request on dispose 2019-10-13 16:22:10 +03:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Andrei Zavatski
60954f969d DeletedChildsPlaceholder refactor 2019-10-13 12:38:50 +03:00
Andrei Zavatski
795ce81468 Use async loading for comment pages 2019-10-13 12:10:01 +03:00
Andrei Zavatski
4d971e49ff Colours update 2019-10-13 11:50:27 +03:00
Andrei Zavatski
27e3ffd293 Update dependencies 2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 11:15:43 +03:00
Andrei Zavatski
7ffe5ac539 Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header 2019-10-12 15:02:12 +03:00
Dan Balasescu
bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio 
Fix audio playback position being reset after resuming to song select
 2019-10-11 19:44:00 +09:00
Dean Herbert
475815df04 Update ranking display to handle new osu-web request format 2019-10-11 13:09:21 +09:00
Andrei Zavatski
b45e7246b8 Rename SortCommentsBy to CommentsSortCriteria 2019-10-10 15:56:08 +03:00
Dean Herbert
5eba33e876 Simplify logic and add test coverage for remaining case 2019-10-10 20:12:47 +09:00
Andrei Zavatski
fe7b4037f7 CI fix 2019-10-10 13:24:22 +03:00
Andrei Zavatski
64f62bd2bf Implement CommentsHeader component 2019-10-10 12:06:25 +03:00
Andrei Zavatski
f6b78ad661 Overall cleanups 2019-10-10 11:43:45 +03:00
Dean Herbert
e66f9adb86 Fix user pause not being cancelled when playing audio 2019-10-10 16:53:03 +09:00
Andrei Zavatski
107d39c3e9 Add DeletedChildsPlaceholder to the bottom of the comments container 2019-10-09 14:10:05 +03:00
Andrei Zavatski
c9d5bea0f1 Remove animations 2019-10-09 13:45:14 +03:00
Andrei Zavatski
7e3c97f496 Implement DeletedChildsPlaceholder component 2019-10-09 13:37:07 +03:00
Andrei Zavatski
b2bd78308d Handle deleted comments 2019-10-09 12:18:49 +03:00
Andrei Zavatski
ad99a3236f Handle edited comments 2019-10-09 11:32:17 +03:00
Andrei Zavatski
a0dfbfe148 Handle parent usernames for legacy comments 2019-10-09 11:18:26 +03:00
Andrei Zavatski
0a56b041fd Implement ShowChildsButton 2019-10-09 11:07:56 +03:00
Andrei Zavatski
4462d454e8 Message padding improvements 2019-10-09 10:34:17 +03:00
Andrei Zavatski
29b0eacc82 Implement SortSelector component 2019-10-08 22:46:42 +03:00
Andrei Zavatski
574170124c Implement HeaderButton component 2019-10-08 21:38:19 +03:00
Andrei Zavatski
b9ad079bf8 Move CommentsHeader to it's own file 2019-10-08 20:57:55 +03:00
Andrei Zavatski
9ab309fc0e Use bold font for replies button 2019-10-08 20:44:01 +03:00
Andrei Zavatski
35cfb16c8d Implement VotePill component 2019-10-08 19:56:43 +03:00
Andrei Zavatski
4230b00110 Rename APIComments to APICommentsController 2019-10-08 19:22:23 +03:00
Andrei Zavatski
341702b91d Use Bindable for expansion logic 2019-10-08 19:18:46 +03:00
Andrei Zavatski
000e4a563c Parse parent comments 2019-10-08 19:09:02 +03:00
Andrei Zavatski
3f8fecbc50 Adjust spacing 2019-10-08 16:04:52 +03:00
Andrei Zavatski
9c7e403cf8 Implement replies button 2019-10-08 16:00:34 +03:00
Andrei Zavatski
451a7342ce Parse child comments 2019-10-08 15:39:03 +03:00
Andrei Zavatski
2564214a72 Fix some padding issues with the big comments 2019-10-08 15:01:18 +03:00
Andrei Zavatski
1c89841949 Move all the logic to it's own namespace 2019-10-08 14:51:12 +03:00
LeNitrous
9375ef5eea clear settings controls when changing rulesets 2019-10-08 19:42:15 +08:00
Andrei Zavatski
801b5b474e Add a User property to the comment for easy access 2019-10-08 13:45:13 +03:00
LeNitrous
59b2f02828 initial implementation of customizable mods 2019-10-08 18:34:09 +08:00
Andrei Zavatski
4b1a40daba Implement temp fix to get the actual message 2019-10-08 13:31:49 +03:00
Andrei Zavatski
70e1d731ad Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-08 12:42:59 +03:00
Dean Herbert
7e4f0c01b8
Avoid excess background updates in playlist overlay (#6424) 
Avoid excess background updates in playlist overlay
 2019-10-08 14:11:02 +09:00
Dean Herbert
438408161c
Fix tab controls overflowing right content at max ui scale (#6411) 
Fix tab controls overflowing right content at max ui scale
 2019-10-08 11:16:41 +09:00
Dean Herbert
3ec78388e8 Avoid excess background updates in playlist overlay 2019-10-08 11:03:23 +09:00
Joehu
8e6e90eaec Use fixed numbers for padding instead 2019-10-07 16:11:40 -07:00
Roman Kapustin
e00992dfd8 Remove FollowPlayback setting 2019-10-07 19:44:22 +03:00
Andrei Zavatski
cc6bf2f173 Add IsDeleted property 2019-10-07 18:45:22 +03:00
Andrei Zavatski
aa8df0fa20 Hook up api and implement some visual comments representation 2019-10-07 18:26:07 +03:00
Andrei Zavatski
e772822bd5 Basic implementation 2019-10-07 17:49:20 +03:00
Andrei Zavatski
a7dc9bb582 Add tooltip and remove pink layer 2019-10-07 15:41:05 +03:00
Andrei Zavatski
2d707b2b65 Implement PostBeatmapFavouriteRequest 2019-10-07 15:36:23 +03:00
Joehu
38c1cee5fd Fix tab controls overflowing 2019-10-06 10:22:55 -07:00
Roman Kapustin
eda4a27b45 Move FollowPlayback setting to User Interface subsection 2019-10-06 15:06:25 +03:00
Roman Kapustin
bdea75b995 Autoscroll playlist on song change 2019-10-05 23:53:05 +03:00
iiSaLMaN
ba1a854701 Use IEnumerable.Where<>() rather than List.FindAll() 
Saves a whole list allocation
 2019-10-05 10:30:32 +03:00
iiSaLMaN
6985249d90 Simplify properties 2019-10-04 21:18:03 +03:00
iiSaLMaN
0c4f248259 Fix CI issues 2019-10-04 18:02:13 +03:00
iiSaLMaN
555c82e9c9 Filter beatmap difficulties by current ruleset 2019-10-04 17:56:42 +03:00
iiSaLMaN
7d5f5d2fd9 Add ruleset selector to the beatmap overlay header 2019-10-04 17:55:33 +03:00
iiSaLMaN
7b414092af Implement beatmap ruleset selector 2019-10-04 17:35:41 +03:00
Dean Herbert
0dd12990c4
Fix possible nullref in MusicController (#6379) 
Fix possible nullref in MusicController
 2019-10-03 20:11:52 +08:00
smoogipoo
6c878cb167 Prevent nullrefs 2019-10-03 19:15:37 +09:00
smoogipoo
662a1a9c2c Use current 2019-10-03 18:55:53 +09:00
smoogipoo
bcf0b2752e Fix possible MusicController nullref 2019-10-03 18:48:44 +09:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification 2019-10-02 17:31:34 +02:00
Andrei Zavatski
5274f69872 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-10-02 13:00:29 +03:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens 
Simplify exit logic of screens with textboxes using back button receptor
 2019-10-02 18:38:06 +09:00
Dan Balasescu
b161aa22c3
Merge branch 'master' into simplify-exit-logic-of-screens 2019-10-02 18:13:57 +09:00