4663 Commits

Author	SHA1	Message	Date
Dean Herbert	986ac08397	Fix pause menu keyboard navigation being affected by initial cu… (#6002) ... Fix pause menu keyboard navigation being affected by initial cursor hover	2019-09-05 17:27:48 +09:00
Dan Balasescu	f729282c73	Merge branch 'master' into skin-configuration-refactor	2019-09-05 16:56:05 +09:00
Dean Herbert	a1d7291ffa	Fix pause menu keyboard navigation being affected by initial cursor hover	2019-09-05 16:31:10 +09:00
iiSaLMaN	1b0123a60c	Set beatmap of leaderboard to null if NoBeatmapsAvailable is selected	2019-09-05 05:56:52 +03:00
iiSaLMaN	a1c580f27e	Create "none selected" placeholder state	2019-09-05 05:56:21 +03:00
smoogipoo	a87a1e6031	Don't redraw certain buffered containers on scale change	2019-09-04 19:38:12 +09:00
Dean Herbert	2983918f71	Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor	2019-09-04 13:40:41 +09:00
Dean Herbert	1802d2efaf	Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani	2019-09-04 10:35:14 +09:00
Dean Herbert	bebc3309ce	Refactor skin configuration to be infinitely extensible	2019-09-03 17:57:34 +09:00
Dean Herbert	4cad55cee6	Move hit windows lookup to DrawableRuleset	2019-09-03 13:05:03 +09:00
Dean Herbert	1e7528c2b3	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-02 19:13:00 +09:00
smoogipoo	0c73c5acf3	Expose full hitobject rather than hit windows	2019-09-02 17:14:40 +09:00
smoogipoo	f2bdf94a1d	Add HitWindows to JudgementResult to indicate timing errors	2019-09-02 16:28:14 +09:00
smoogipoo	0a89603e79	Fix hit error potentially not displaying with null hitwindows	2019-09-02 16:07:16 +09:00
Dan Balasescu	daa2007b41	Merge branch 'master' into fix-switching-ruleset-unpauses-beatmap	2019-09-02 15:24:01 +09:00
Dean Herbert	e479be3fba	Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours ... Move beat divisor colour retrieval to BindableBeatDivisor	2019-09-02 12:41:19 +09:00
Dean Herbert	7ca51d3866	Fix resume overlay being drawn below cursor ... Closes #5905.	2019-09-02 11:20:55 +09:00
iiSaLMaN	aff4dab9aa	Ensure playing track of beatmap selected only if a track change occurred	2019-09-01 03:17:55 +03:00
pi1024e	5695bb670e	change back to queuing	2019-08-31 10:55:05 -04:00
pi1024e	1b4ae5a4a4	Spelling fixes	2019-08-31 10:55:05 -04:00
Andrei Zavatski	94512fea8e	Apply naming suggestions	2019-08-31 16:20:33 +03:00
Andrei Zavatski	d2f7a653a8	Fix nullref	2019-08-31 16:10:07 +03:00
Andrei Zavatski	28b19e8d54	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video	2019-08-31 15:49:21 +03:00
smoogipoo	cbbc6aad6e	Make method static	2019-08-31 21:32:02 +09:00
Dean Herbert	1ddf292ad6	Fix vertical alignment of hit error display ticks ... Wasn't correctly centered before.	2019-08-31 12:20:50 +09:00
Andrei Zavatski	d4291556ee	Remove unused using	2019-08-31 02:57:14 +03:00
Andrei Zavatski	fd958ec1ab	Remove unused property accessor	2019-08-31 02:56:41 +03:00
Andrei Zavatski	fa3591e5ec	Add setting to turn on/off the video	2019-08-31 00:42:20 +03:00
Andrei Zavatski	5dd688a51b	Fix video doesn't use gameplay clock	2019-08-31 00:09:23 +03:00
Andrei Zavatski	d55be4d59c	Implement DimmableVideo component	2019-08-30 23:48:38 +03:00
Andrei Zavatski	58a0b4e19b	Add basic layout for player	2019-08-30 23:19:55 +03:00
Andrei Zavatski	6e5cb8a318	implement video parsing	2019-08-30 23:19:34 +03:00
Dean Herbert	8f5dc06d55	Merge remote-tracking branch 'upstream/master' into accuracy-bar	2019-08-30 20:18:25 +09:00
Dean Herbert	f1db6c7039	Fix likely nullref	2019-08-30 20:18:21 +09:00
smoogipoo	fc813347ac	Make JudgementLine private	2019-08-30 19:54:36 +09:00
smoogipoo	dfccc60361	Reorder HitErrorDisplay	2019-08-30 19:53:38 +09:00
smoogipoo	fab12fa9cd	Centre align the icons ... Seems to look better this way.	2019-08-30 19:53:38 +09:00
Dean Herbert	665fc95d49	Handle no hitobjects / no hitwindows (osu!catch)	2019-08-30 19:37:20 +09:00
Dean Herbert	80671cefd7	Final visual polish	2019-08-30 19:14:07 +09:00
Dean Herbert	c3abf0ccb7	Improve visuals	2019-08-30 18:50:38 +09:00
Dean Herbert	8fc177b743	Fix namespacing and hitwindow source	2019-08-30 18:46:42 +09:00
Dean Herbert	741bd0a5cf	Fix incorrect colour sizes and simplify alignment specification	2019-08-30 18:35:17 +09:00
smoogipoo	40729356fa	Move beat divisor colour retrieval to BindableBeatDivisor	2019-08-30 17:34:58 +09:00
Dean Herbert	54696eef39	Reverse display, add animation and reduce width	2019-08-30 17:06:23 +09:00
Dean Herbert	a73d672c2f	Tidy up judgement line logic (and fix it displaying at the wrong place)	2019-08-30 16:40:39 +09:00
Dean Herbert	6640161bc1	Simplify event propagation	2019-08-30 15:51:36 +09:00
Dean Herbert	bdbfa7bd2f	Fix class naming	2019-08-30 15:32:47 +09:00
Dean Herbert	835ee0aa2f	Code quality fixes	2019-08-30 15:29:13 +09:00
Dean Herbert	1d77e3764d	Merge branch 'master' into accuracy-bar	2019-08-30 15:21:32 +09:00
Dean Herbert	84e4748268	Remove duplicate getAnimation function and improve namespacing	2019-08-30 12:59:58 +09:00
Dean Herbert	dc1046bf0c	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-30 12:53:05 +09:00
Dean Herbert	3f500131d4	Add basic xmldoc	2019-08-30 11:33:50 +09:00
smoogipoo	6641811125	Add EditorWorkingBeatmap for reuse of the playable beatmap	2019-08-29 19:41:12 +09:00
smoogipoo	b04a8ae856	Add xmldocs	2019-08-29 16:31:43 +09:00
smoogipoo	5db813b7a4	Add secondary interface for further abstraction	2019-08-29 16:26:39 +09:00
smoogipoo	7927b684d3	Hook up + use editor beatmap	2019-08-29 16:06:40 +09:00
smoogipoo	840f224619	Remove typed events to reduce complexity	2019-08-29 16:05:44 +09:00
smoogipoo	6949c96aaa	Add initial EditorBeatmap structure	2019-08-29 15:17:27 +09:00
Joehu	73fd3cf03c	Fix gameplay menu button initial hover animation	2019-08-28 19:00:01 -07:00
Dean Herbert	7ccc409df7	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-27 18:27:26 +09:00
Dean Herbert	7aeeb65ae7	Tidy up Player's container loading logic ... Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).	2019-08-27 18:27:21 +09:00
Dean Herbert	7885c79467	Make bindables private	2019-08-27 14:31:34 +09:00
Dean Herbert	69145eb83a	Merge branch 'master' into select-filters-persistence	2019-08-27 14:12:59 +09:00
smoogipoo	6368189d46	Refactor	2019-08-27 11:59:25 +09:00
Andrei Zavatski	9321f20884	Move arrow to the first line	2019-08-26 14:32:27 +03:00
Andrei Zavatski	fd0f42eee4	Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load	2019-08-26 14:11:24 +03:00
Dean Herbert	5e362d10b1	Add ruleset-specific legacy skin providers ... This moves implementation of osu! skinnables to OsuLegacySkin.	2019-08-26 12:21:49 +09:00
Dean Herbert	9881d3677d	Simplify icon creation	2019-08-25 12:05:46 +09:00
Dean Herbert	ef397434f6	use GroupBy instead of Distinct+FindAll	2019-08-25 12:00:06 +09:00
Dean Herbert	a19a9b90ed	Simplify group filter display	2019-08-25 11:39:26 +09:00
Lucas A	b204e4419a	Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode	2019-08-24 10:34:54 +02:00
iiSaLMaN	8ccbe84f67	Loop on distinct rulesets of beatmap instead of all	2019-08-24 01:30:33 +03:00
iiSaLMaN	87340061e1	Add logic to create grouped difficulty icons in carousel beatmap set	2019-08-24 00:06:28 +03:00
Lucas A	ce5ee095b9	Fetch config bindables in BDL.	2019-08-23 14:03:56 +02:00
Lucas A	6bf31e8f91	Make song select grouping & sorting filters persistent	2019-08-23 13:15:38 +02:00
Dean Herbert	900df5d72f	Fix crash on closing game	2019-08-23 13:02:50 +09:00
Shane Woolcock	f19b5ba570	Merge branch 'master' into fix-decoding-loop	2019-08-22 17:02:13 +09:30
Dean Herbert	db1ff6d211	Fix video decoding loop running permanently in the background	2019-08-22 13:48:27 +09:00
Dean Herbert	7bf430afd5	Add padding back to difficulty icons on carousel	2019-08-21 21:16:06 +09:00
Andrei Zavatski	0ccfaeb8d9	Simplify moving average	2019-08-21 10:13:59 +03:00
Andrei Zavatski	a5acc913ea	CI fixes	2019-08-21 09:58:47 +03:00
Andrei Zavatski	a994ad9c84	Use moving average to calculate arrow position	2019-08-21 09:40:15 +03:00
Andrei Zavatski	336f979480	Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar	2019-08-21 09:39:28 +03:00
Andrei Zavatski	71cbc3525d	Add/remove displays only if necessary	2019-08-21 09:16:09 +03:00
Andrei Zavatski	ab1586ff33	Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar	2019-08-21 08:56:34 +03:00
Dean Herbert	6a48819055	Merge branch 'master' into update-framework-blending	2019-08-21 14:27:57 +09:00
Dean Herbert	724365c6d1	Minor tidying	2019-08-21 14:01:07 +09:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Lucas A	33946f0458	Fix CI issues and update comments.	2019-08-20 11:18:41 +02:00
Andrei Zavatski	f72edb8bf8	Add missing blank line	2019-08-20 09:03:31 +03:00
Andrei Zavatski	596ee150c6	Add xmldoc for not obvious const	2019-08-20 08:51:41 +03:00
Andrei Zavatski	9f64e09625	Move HitErrorDisplayOverlay back to the HUD	2019-08-20 08:45:51 +03:00
Andrei Zavatski	d337f9b482	DefaultHitErrorDisplay -> BarHitErrorDisplay	2019-08-20 08:03:17 +03:00
Andrei Zavatski	c4251d512e	Simplify bar building	2019-08-20 08:00:09 +03:00
Dean Herbert	caf8354f50	Merge branch 'master' into music-playback-improvements	2019-08-20 11:49:39 +09:00
Andrei Zavatski	415f180261	Delete extra semicolon	2019-08-19 22:53:28 +03:00
Andrei Zavatski	50c47568e4	Don't present Meh hit windows if it has no value	2019-08-19 22:45:27 +03:00
Andrei Zavatski	f1c3a60660	Add ability to select side	2019-08-19 22:04:27 +03:00
Andrei Zavatski	1bff103d32	CI fixes	2019-08-19 21:25:14 +03:00
Andrei Zavatski	6d3aa0520b	Make HitErrorDisplay an abstract class	2019-08-19 20:44:06 +03:00
Andrei Zavatski	70084b5553	Move HitErrorDisplay outside of the HUD	2019-08-19 20:28:03 +03:00
Andrei Zavatski	f70a7abea3	Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar	2019-08-19 19:36:28 +03:00
Dean Herbert	9ea4921e2b	Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip ... Add tooltips to difficulty icons with extra details	2019-08-19 17:23:13 +09:00
Dan Balasescu	9c069f6f22	Merge branch 'master' into unpause-on-selection-change	2019-08-19 13:15:46 +09:00
Dean Herbert	1f00793891	Unpause music when changing selection at song select	2019-08-19 11:30:04 +09:00
Lucas A	3fcd786198	Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control.	2019-08-18 19:32:56 +02:00
Andrei Zavatski	4c817b18b7	Use direct cast	2019-08-18 17:03:11 +03:00
Andrei Zavatski	dd6351b8ca	Apply suggested changes	2019-08-18 16:51:16 +03:00
Andrei Zavatski	6c60db550f	Fix crash if ruleset has no Meh hit windows	2019-08-18 16:24:13 +03:00
Andrei Zavatski	55cd1cecdf	Add missing blank line	2019-08-18 15:53:42 +03:00
Andrei Zavatski	8740ebd13f	Simplify layout	2019-08-18 15:45:18 +03:00
Andrei Zavatski	a59a14c9e6	Add setting to enable/disable hit error visibility	2019-08-18 15:01:04 +03:00
Andrei Zavatski	ee5568e596	Use Queue instead of List for stored Judgements	2019-08-18 14:43:34 +03:00
Andrei Zavatski	50133ba863	naming adjustments	2019-08-18 02:57:12 +03:00
Andrei Zavatski	906984ad95	Fix the math	2019-08-18 02:49:07 +03:00
Andrei Zavatski	f7024b513e	Visual improvements	2019-08-18 01:43:43 +03:00
Andrei Zavatski	94dbd6386f	Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar	2019-08-18 01:14:27 +03:00
Dean Herbert	3dc81bdad5	Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip	2019-08-17 15:19:46 +09:00
Dean Herbert	4fa9abeece	Replace DifficultyColouredContainer with a more scalable solution	2019-08-17 15:16:24 +09:00
Dean Herbert	f552de6ebc	Merge branch 'master' into difficulty-icon-tooltip	2019-08-17 13:45:20 +09:00
Dean Herbert	b57298406f	Fix right click blocking not resetting correctly	2019-08-15 19:25:33 +09:00
Dean Herbert	0f4bada21e	Fix right click absolute scrolling interfering with context menus	2019-08-15 18:27:45 +09:00
Dean Herbert	e73a9c2748	Fix song select context menus displaying off-screen	2019-08-15 14:06:29 +09:00
Dean Herbert	f355cff8bc	Apply reviews	2019-08-15 12:11:54 +09:00
Dean Herbert	7e74953784	Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip	2019-08-15 11:54:59 +09:00
smoogipoo	e356cc8d9e	Refactor MatchBeatmapPanel for thread safety	2019-08-13 17:57:16 +09:00
smoogipoo	7c9c9f1ce1	Simplify caching	2019-08-13 17:38:21 +09:00
smoogipoo	92c2dafa12	Tighten accessibility	2019-08-13 17:34:16 +09:00
smoogipoo	6b57c9801d	Cull some unnecessary whitespace	2019-08-13 17:32:43 +09:00
smoogipoo	2b155e5407	Merge remote-tracking branch 'origin/master' into multi-room-update	2019-08-13 17:03:44 +09:00
Dan Balasescu	f6e1df8952	Merge branch 'master' into triangles	2019-08-13 16:34:08 +09:00
Andrei Zavatski	982066dfdf	Convert to method group	2019-08-12 10:38:34 +03:00
Dean Herbert	75cb0d093b	Use description correctly ... Required for localisation	2019-08-12 16:10:48 +09:00
Andrei Zavatski	cb910a6518	Replace if/else statement	2019-08-12 10:02:45 +03:00
Andrei Zavatski	5b68a2f34a	Rename trackManager to previewTrackManager	2019-08-12 09:50:49 +03:00
Andrei Zavatski	520924b440	Don't create a new request if onlineId is null	2019-08-12 09:45:21 +03:00
Andrei Zavatski	6095480a54	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-12 09:36:15 +03:00
Dean Herbert	d0f2d22995	Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim	2019-08-12 05:46:15 +09:00
Dean Herbert	9ac4870a21	Merge branch 'master' into triangles	2019-08-12 02:24:45 +09:00
Dean Herbert	359261d4a4	Fix game not starting if intro music is disabled	2019-08-12 02:04:06 +09:00
Andrei Zavatski	e7964c165f	Make judgement lines alive for a bit longer	2019-08-11 19:09:50 +03:00
Andrei Zavatski	3136d46c7f	Do not generate new judgement line on miss	2019-08-11 19:04:56 +03:00
Andrei Zavatski	5e0ac28ca8	Add basic colours	2019-08-11 18:30:03 +03:00
Andrei Zavatski	177a317a48	rename AccuracyBar to HitErrorDisplay	2019-08-11 18:11:49 +03:00
Andrei Zavatski	2a35c3c3e2	Calculate real position for judgement lines	2019-08-11 18:04:54 +03:00
Andrei Zavatski	0a255fe4d1	Add moving arrow	2019-08-11 16:38:03 +03:00
Andrei Zavatski	ed409d113b	Add judgement lines generator	2019-08-11 15:53:15 +03:00
Andrei Zavatski	fd334e0319	Implement basic layout for AccuracyBar	2019-08-11 14:57:21 +03:00
Dean Herbert	cb0cd7ed58	Add triangles intro	2019-08-09 20:05:28 +09:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
iiSaLMaN	0fcc6c1676	Add DimLevel property	2019-08-08 22:13:48 +03:00
iiSaLMaN	bedb744a2e	Add parentheses	2019-08-08 17:11:26 +03:00
iiSaLMaN	88b9942b2a	Move EnableUserDim check to defualt value of ShowDimContent	2019-08-08 17:07:06 +03:00
Andrei Zavatski	9ab132520c	Testcase improvements	2019-08-08 12:25:46 +03:00
Andrei Zavatski	e9b5c91690	Fade out existing panel on beatmap change	2019-08-08 12:08:51 +03:00
Andrei Zavatski	08a92c38d7	adjust naming	2019-08-08 12:04:44 +03:00
Andrei Zavatski	1b559c1585	Use async loading	2019-08-08 12:01:33 +03:00
Dean Herbert	a3dbaef4ca	Adjust background gradient	2019-08-08 17:29:50 +09:00
Andrei Zavatski	8668bce25d	Fix preview can be played on start	2019-08-08 09:52:42 +03:00
Andrei Zavatski	cbcdc28900	Fix hard crash when clicking on a preview button	2019-08-08 09:04:24 +03:00
Andrei Zavatski	f5cd0eae48	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-08 09:04:06 +03:00
Dean Herbert	2172c5a52b	Merge branch 'master' into use-bindable-break-time-in-player	2019-08-08 14:24:52 +09:00
Andrei Zavatski	4a38c4f9d1	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-08 07:36:53 +03:00
Dean Herbert	f774c46f57	Remove linq usage in BreakOverlay update (#5641) ... Remove linq usage in BreakOverlay update	2019-08-08 13:33:23 +09:00
Joehu	77df6a0cb7	Remove unused direct placeholder screen	2019-08-07 21:16:36 -07:00
Andrei Zavatski	a4459972b6	Remove ViewBeatmapButton	2019-08-08 07:15:30 +03:00
Andrei Zavatski	ffed642929	Implement MatchBeatmapPanel	2019-08-08 07:08:51 +03:00
Dean Herbert	7d42561da9	Remove linq usage in BreakOverlay update	2019-08-08 12:58:20 +09:00
Salman Ahmed	3f9f9e7bc9	Merge branch 'master' into use-bindable-break-time-in-player	2019-08-08 05:36:45 +03:00
Dean Herbert	99f5ca07ce	Remove redundant comment	2019-08-08 10:42:54 +09:00
Dean Herbert	40a33b3382	Move IsLoaded check to more correct place	2019-08-08 10:41:23 +09:00
Dean Herbert	a2e3ab6463	Merge branch 'master' into add-bindable-for-break-times	2019-08-08 10:13:14 +09:00
iiSaLMaN	ba269a49ee	Expose break fade duration and add it in the calculation	2019-08-07 16:59:35 +03:00
iiSaLMaN	d3657d82cd	Simplify final check for break time	2019-08-07 16:28:16 +03:00
iiSaLMaN	c2b3c28c79	Use IsBreakTime for checking if currently in a break ... Rather than iterating over all breaks to find which is in current time	2019-08-07 16:15:53 +03:00
Dean Herbert	616de1830a	Less sheep	2019-08-07 12:20:49 +09:00
Dean Herbert	9033327923	Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds	2019-08-07 12:19:25 +09:00
Dean Herbert	dda078277a	Minor variable name changes	2019-08-06 23:05:12 +09:00
iiSaLMaN	2a68bb2749	onCompletionEvent -> pushResults	2019-08-06 14:11:43 +03:00
iiSaLMaN	dd701eaa62	Safely cancel the completion task on restart or immediate exit	2019-08-06 14:10:03 +03:00
Joehu	1fc7ddf621	Fix text depth regression	2019-08-05 18:14:41 -07:00
Joehu	a7ac411c25	Fix footer button hover sounds playing in unclickable area	2019-08-05 17:57:04 -07:00
Dan Balasescu	cd27e1eb70	Merge branch 'master' into update-direct-categories-sorting	2019-08-05 17:11:48 +09:00
Andrei Zavatski	fd44ca3233	Rename Animation to Layer	2019-08-04 13:54:23 +03:00
Andrei Zavatski	a30d7912b1	Move DimmedLoadingAnimation to it's own file	2019-08-04 11:09:12 +03:00
Joehu	0082695cd8	Choose default category sorting instead of being always first	2019-08-02 13:22:58 -07:00
Dean Herbert	4c6cccb3a3	Update settings in line with framework changes	2019-07-30 23:31:21 +09:00
iiSaLMaN	e6e315e07b	Expose current break index	2019-07-30 13:29:41 +03:00
Salman Ahmed	c8b7cf8672	Merge branch 'master' into add-bindable-for-break-times	2019-07-30 06:23:47 +03:00
Dean Herbert	2d03c849bf	Improve testability of intro sequence (#5275) ... Improve testability of intro sequence	2019-07-29 18:56:38 +09:00
Dan Balasescu	0dc25d7a35	Merge branch 'master' into exit-multi-from-null	2019-07-29 13:52:26 +09:00
David Zhao	26fc782de9	Don't exit if screenstack is null	2019-07-29 10:35:51 +09:00
Dean Herbert	088c04a20f	Revert "Fix BackButton handling escape before all other elements (#5440)" ... This reverts commit 17a6563f4c.	2019-07-28 23:38:55 +09:00
iiSaLMaN	5bf0277fd4	Remove unnecessary quick check ... Not saving for anything	2019-07-28 09:17:13 +03:00
iiSaLMaN	1dd3a66300	Remove unnecessary index resets	2019-07-28 09:16:19 +03:00
Dean Herbert	872822035a	Merge branch 'master' into back-button-priority	2019-07-28 12:50:18 +09:00
iiSaLMaN	95b568eb46	Remove unnecessary condition	2019-07-27 15:52:30 +03:00
iiSaLMaN	6c580ac9d5	Use while loops instead	2019-07-27 15:52:01 +03:00
Dean Herbert	3571cb96b0	Fix broken merge	2019-07-27 12:56:55 +09:00
David Zhao	57e6c388a1	Merge branch 'master' into carousel-sizing	2019-07-27 11:40:07 +09:00