13102 Commits

Author	SHA1	Message	Date
iiSaLMaN	32e9547ce9	Trim whitespace	2019-07-22 23:16:54 +03:00
iiSaLMaN	081355e3d1	Use IHasText and simplify properties	2019-07-22 23:12:09 +03:00
Andrei Zavatski	ee6fed5b33	Use fixed height	2019-07-22 18:17:49 +03:00
Dean Herbert	2f111e6cf4	Fix incorrect corner radius	2019-07-22 23:57:26 +09:00
Dean Herbert	4dc9309a7e	Merge branch 'master' into underscored_link	2019-07-22 23:46:57 +09:00
Dean Herbert	ade661236a	Merge branch 'master' into intro-testing-improvements	2019-07-22 23:44:14 +09:00
Dean Herbert	cdf75b4098	Public before private	2019-07-22 22:14:09 +09:00
Andrei Zavatski	075ca3d8ea	CI fix	2019-07-22 14:47:35 +03:00
Andrei Zavatski	3e95cb9145	Use bindable and disable button	2019-07-22 14:35:18 +03:00
Andrei Zavatski	2a17ed5e18	Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap	2019-07-22 14:32:37 +03:00
Dean Herbert	7d3939a838	Merge branch 'master' into fix-triangles-crash	2019-07-22 19:17:51 +09:00
Dean Herbert	07a0df7c4f	Fix bracket precedence	2019-07-22 18:29:04 +09:00
Dean Herbert	a05a6bbb77	Set "Title" as the default grouping/sorting modes in song select (#5396) ... Set "Title" as the default grouping/sorting modes in song select	2019-07-22 18:06:23 +09:00
Dean Herbert	d4d286c988	Add full documentation	2019-07-22 16:08:38 +09:00
Dean Herbert	c3b81bef4a	Flip default to the preferred method going forward	2019-07-22 15:55:38 +09:00
Dean Herbert	be170b4124	Naming and documentation improvements	2019-07-22 15:50:02 +09:00
Dean Herbert	91f86adb66	Move DrawableHitObject state management to base class	2019-07-22 15:07:12 +09:00
smoogipoo	a631aac664	Fix workingbeatmap's disposal potentially null-refing	2019-07-22 15:01:01 +09:00
Dean Herbert	8327452fe1	Make AccentColour a bindable	2019-07-22 14:48:59 +09:00
Dean Herbert	36c557c752	Add null check and simplify scaling conditional logic via switch	2019-07-22 14:43:25 +09:00
Dean Herbert	9d091c96b8	Use cache to ensure correct DrawSize when deciding scaling	2019-07-22 14:43:04 +09:00
Dean Herbert	74c961bcff	Add more flexible skin element confine modes	2019-07-22 14:42:56 +09:00
Andrei Zavatski	de8ac9a428	Simple implementation	2019-07-21 21:41:07 +03:00
iiSaLMaN	affd0b2878	Fix build issues	2019-07-21 12:34:52 +03:00
iiSaLMaN	57fc5cbda8	Fix CI issues	2019-07-21 12:29:06 +03:00
iiSaLMaN	87fb22352c	glowingText -> blurredText	2019-07-21 12:28:55 +03:00
iiSaLMaN	9d7f6abbdd	Remove unnecessary field	2019-07-21 12:18:31 +03:00
iiSaLMaN	ed0ef90613	Separate glowing sprite text into it's own class	2019-07-21 12:14:55 +03:00
Dean Herbert	e76b3e2b40	User property instead of method	2019-07-21 10:42:40 +09:00
iiSaLMaN	842417cf42	Check if selected scope requires API	2019-07-21 03:07:27 +03:00
Dean Herbert	4c592a5e65	Fix TriangleDrawNode crash when aimcount is zero	2019-07-20 22:52:07 +09:00
Dean Herbert	2a94b68ecb	Simplify logic	2019-07-20 22:50:17 +09:00
Dean Herbert	2df279f902	Merge branch 'master' into loading-fix	2019-07-20 22:46:09 +09:00
Dean Herbert	5696d79423	Use TriangleBatch	2019-07-19 23:47:48 +09:00
Dean Herbert	eebfdd8865	Update framework	2019-07-19 23:43:25 +09:00
Dean Herbert	f08d722083	Merge remote-tracking branch 'upstream/master' into triangle-memory-reudction	2019-07-19 23:43:17 +09:00
smoogipoo	066bee3535	Simplify offset calculation	2019-07-19 16:02:33 +09:00
smoogipoo	2a66cf36d5	Merge remote-tracking branch 'Joehuu/master' into requests-limit-usage	2019-07-19 15:33:18 +09:00
smoogipoo	99ab77b926	Add PaginatedWebRequest to handle request pagination	2019-07-19 15:33:09 +09:00
Dean Herbert	024f136d82	Reduce buffer count by one	2019-07-19 14:24:11 +09:00
Dean Herbert	95f36c36c4	Late-initialize vertex batch for safety	2019-07-19 01:52:53 +09:00
Dean Herbert	a23bb3a6b3	Account for headless nulls (but how?)	2019-07-19 01:14:55 +09:00
Dean Herbert	00f1d1b53c	Reduce Triangle drawnode overhead by ~90% ... This was never batching, ever. Pointless memory overhead.	2019-07-19 00:53:00 +09:00
Andrei Zavatski	fa978a47b0	Fix loading animation is no longer present	2019-07-18 15:08:50 +03:00
smoogipoo	f87e9b8017	Remove unnecessary tooltip text	2019-07-18 20:17:19 +09:00
smoogipoo	ca72409dc2	More closely match osu-web styling	2019-07-18 20:16:10 +09:00
Dan Balasescu	85ce44be74	Merge branch 'master' into remove-unnecessary-transforms-1	2019-07-18 18:16:36 +09:00
Dean Herbert	f175f597e7	Update follower count API source	2019-07-18 14:05:57 +09:00
smoogipoo	1ce2b2eace	Set title as default grouping/sorting modes	2019-07-18 13:18:06 +09:00
Dean Herbert	a6ddcd78d4	Fix results screen not showing first tab correctly	2019-07-18 01:08:12 +09:00
Dean Herbert	f1423b8cb5	Add more brackets	2019-07-18 00:03:04 +09:00
Dean Herbert	cc3492f8f2	Update framework	2019-07-18 00:01:38 +09:00
Dean Herbert	3e57fcf5c5	Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies	2019-07-17 22:11:01 +09:00
Dean Herbert	42b1e1772f	Update framework	2019-07-17 22:07:11 +09:00
Dean Herbert	a079b9c921	Merge pull request #5384 from smoogipoo/fix-direct-ruleset-selector ... Fix direct ruleset selector binding in ctor	2019-07-17 22:02:41 +09:00
Dean Herbert	99bd50a48e	Fix judgement disposals causing huge LOH pressure (#5385) ... Fix judgement disposals causing huge LOH pressure	2019-07-17 22:01:47 +09:00
Dean Herbert	98d0713fa9	Merge branch 'master' into fix-background-blur-safety	2019-07-17 22:01:10 +09:00
Dean Herbert	bee30b18d2	Merge pull request #5381 from peppy/fix-leaderboard-display-crash ... Fix potential crash when displaying leaderbaords	2019-07-17 22:00:45 +09:00
Dan Balasescu	883c090248	Fix disabled state potentially not being set	2019-07-17 20:02:20 +09:00
smoogipoo	9f6ff63634	Fix judgement disposals causing huge LOH pressure	2019-07-17 19:25:41 +09:00
smoogipoo	cca472d412	Fix direct ruleset selector binding in ctor	2019-07-17 19:19:45 +09:00
Dean Herbert	1a19cf0739	Fix 0-length sliders not getting correct lengths (#5033) ... Fix 0-length sliders not getting correct lengths	2019-07-17 18:01:57 +09:00
Dean Herbert	66036508b6	Fix potential crash when displaying leaderbaords	2019-07-17 17:39:04 +09:00
smoogipoo	a9286fee07	Recycle slider paths when the parenting slider dies	2019-07-17 16:20:27 +09:00
smoogipoo	7c5a227fc5	Fix crashes when presenting replays	2019-07-17 14:46:25 +09:00
David Zhao	b95a598338	don't check for shift	2019-07-16 15:12:01 +09:00
Dean Herbert	7634e3cc81	Fix song select iterating over all beatmaps in database unnnecessarily	2019-07-16 14:57:11 +09:00
David Zhao	e789bb37c8	Ignore shift-delete in SearchTextBox	2019-07-16 14:55:41 +09:00
smoogipoo	ed203cb0ff	Delay intial hitobject updates	2019-07-16 13:45:59 +09:00
Joehu	83ffb1d542	Remove unnecessary transforms on top score user section	2019-07-15 14:15:03 -07:00
Andrei Zavatski	9458bca58f	Update usage of requests	2019-07-15 13:37:25 +03:00
Andrei Zavatski	111541fe7a	Use limit in requests	2019-07-15 13:31:57 +03:00
Andrei Zavatski	d62e42ba14	Remove custom link container implementation	2019-07-15 13:09:21 +03:00
Andrei Zavatski	cfb1e0683c	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-07-15 12:32:02 +03:00
Dean Herbert	d4c1005c7e	Fix incorrect comparison in line updating logic	2019-07-15 15:53:19 +09:00
Dean Herbert	d0c8aaba4e	Override basic equality function too	2019-07-15 15:50:50 +09:00
Dean Herbert	9c1badd2e3	Fix rulesets not matching in dictionary lookups due to missing GetHashCode implementation	2019-07-15 15:42:54 +09:00
Dean Herbert	d92f6c762b	Fix potential nullref	2019-07-15 11:53:16 +09:00
Dean Herbert	12e7668afc	Fix potential cross-thread talk from bindable updates	2019-07-15 11:48:33 +09:00
Dean Herbert	2186ffda55	Avoid unnecessarily creating buffered container for zero-blur	2019-07-15 11:46:41 +09:00
Dean Herbert	d093eb6660	Mark sprite read-only	2019-07-15 11:45:15 +09:00
Andrei Zavatski	b93b26a036	Fix link formatting	2019-07-14 19:38:46 +03:00
Andrei Zavatski	c8192d6f3a	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-07-14 19:10:47 +03:00
Dan Balasescu	986031e127	Merge branch 'master' into storyboard-clock-di	2019-07-12 23:14:12 +09:30
Dan Balasescu	fc96fbc8a1	Merge branch 'master' into fix-skip-button-clickability	2019-07-12 22:44:20 +09:30
Dean Herbert	44855d8bb2	Ensure any existing background is expired if set more than once	2019-07-12 13:45:34 +09:00
Dean Herbert	671f7f99cd	Use constant for blur amount	2019-07-12 13:44:43 +09:00
Dean Herbert	8b67f88d16	Don't expose dimmable container creation in player	2019-07-12 12:04:45 +09:00
Dean Herbert	46f7bb885b	Move classes to local namespaces ... Also renames test scene to more appropriate name.	2019-07-12 11:50:06 +09:00
Dean Herbert	b5ca7faca4	Move default value for EnableUserDim to base class	2019-07-12 11:40:38 +09:00
Dean Herbert	0d9f978857	Don't expose DimContainer	2019-07-12 11:38:15 +09:00
Dean Herbert	c9599b65eb	Merge remote-tracking branch 'upstream/master' into storyboard-clock-di	2019-07-12 11:20:43 +09:00
Dean Herbert	a1e64106d4	Merge branch 'master' into intro-testing-improvements	2019-07-11 23:46:02 +09:00
Dean Herbert	3be5aff82d	Merge pull request #5205 from UselessToucan/flow_container_insert ... Make FlowContainer insertions cleaner	2019-07-11 23:13:58 +09:00
Dean Herbert	ecbd0f7eff	Merge branch 'master' into fix-skip-button-clickability	2019-07-11 23:10:28 +09:00
Dean Herbert	6c8cf193bd	Disable frame accurate replay playback (#5316) ... Disable frame accurate replay playback	2019-07-11 23:09:54 +09:00
Dean Herbert	19e8198bff	Merge branch 'master' into flow_container_insert	2019-07-11 22:53:57 +09:00
Dean Herbert	9cbd17415c	Force SQLite to multithreading mode (#5269) ... Force SQLite to multithreading mode	2019-07-11 22:53:18 +09:00
Dean Herbert	72da615dde	Fix track transfer not running when beatmap is retrieved from c… (#5296) ... Fix track transfer not running when beatmap is retrieved from cache	2019-07-11 22:53:07 +09:00
Dean Herbert	b6e15fb791	Update framework	2019-07-11 22:33:51 +09:00
David Zhao	932243cfd4	public before private	2019-07-11 14:14:00 +09:00
David Zhao	ac170a6957	add comment and cleanup	2019-07-11 14:00:25 +09:00
Dean Herbert	548008c9ce	Merge pull request #5311 from Joehuu:lb-sign-out-placeholder ... Update beatmap leaderboard to placeholder when signing out	2019-07-11 13:55:18 +09:00
David Zhao	6c0de0b436	Merge remote-tracking branch 'upstream/master' into storyboard-clock-di	2019-07-11 13:33:35 +09:00
David Zhao	321266e96f	Make UserDimContainer abstract	2019-07-11 13:17:28 +09:00
Dean Herbert	c22633967b	Merge remote-tracking branch 'upstream/master' into user-best-score	2019-07-11 11:32:47 +09:00
Dean Herbert	85f2212ebc	Reduce spacing and font for rank position	2019-07-11 11:32:42 +09:00
Dean Herbert	8f9b8ed5a1	Simplify information propagation logic	2019-07-11 11:17:33 +09:00
Dean Herbert	cc9ee472d6	Move score nulling out of loading property	2019-07-11 11:07:30 +09:00
Dean Herbert	a49bde7ed3	Move protected below public	2019-07-11 10:38:32 +09:00
iiSaLMaN	b2f23a10c8	Use the correct property to retrieve the milliseconds	2019-07-10 23:12:18 +03:00
Andrei Zavatski	953d32366c	Move request inside the ScoresContainer again	2019-07-10 19:40:29 +03:00
Andrei Zavatski	a041421e0d	Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score	2019-07-10 19:39:41 +03:00
Dean Herbert	f21e700b7a	Code style cleanup	2019-07-11 00:42:14 +09:00
Dean Herbert	2285c2b1df	Merge branch 'master' into user-best-score	2019-07-11 00:31:26 +09:00
Dean Herbert	3b448b0086	Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master	2019-07-11 00:25:35 +09:00
Dean Herbert	ad873b542a	Simplify editor logic	2019-07-11 00:22:40 +09:00
Dean Herbert	6819c528db	Use canBeNull instead of needlessly caching MusicController for tests	2019-07-11 00:20:01 +09:00
Dean Herbert	b225b2eb39	Rename to IsUserPaused	2019-07-11 00:18:19 +09:00
iiSaLMaN	c3315e805f	Use milliseconds for BasicStats' beatmap length	2019-07-10 16:49:32 +03:00
Salman Ahmed	1eed6955fa	Merge branch 'master' into implement-other-sorting-criteria	2019-07-10 14:33:48 +03:00
Desconocidosmh	100d15e651	Move reseting tempo to Editor	2019-07-10 10:43:02 +02:00
Desconocidosmh	8b8e67fd72	Add accidentally deleted code	2019-07-10 10:41:52 +02:00
David Zhao	7929104b8a	move default into StoryboardContainer, fix load bug, remove comment	2019-07-10 12:24:05 +09:00
Dean Herbert	80ddfc3b1e	Disable frame accurate replay playback ... I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.	2019-07-10 10:27:51 +09:00
David Zhao	41afe89c0b	delete no longer needed bindable	2019-07-10 00:46:34 +09:00
Joehu	b9be4080d3	Update beatmap leaderboard to placeholder when signing out	2019-07-09 07:59:38 -07:00
Andrei Zavatski	a0389c338b	CI fixes	2019-07-09 17:56:08 +03:00
iiSaLMaN	e73f22eff8	Convert length retrieved from online to milliseconds	2019-07-09 17:53:34 +03:00
Andrei Zavatski	9907a58ec4	Revert animations and apply suggested changes	2019-07-09 17:38:17 +03:00
iiSaLMaN	1485c273ab	Describe the xmldoc mo	2019-07-09 17:31:15 +03:00
iiSaLMaN	f3329f4d79	Use a more readable code for calculating length	2019-07-09 17:22:21 +03:00
iiSaLMaN	38bc652bf2	Remove sorting by length for beatmaps	2019-07-09 17:02:51 +03:00
Oskar Solecki	2fb9b5dd69	Merge branch 'master' into master	2019-07-09 13:49:07 +02:00
iiSaLMaN	e0c1fb7818	Compare by milliseconds for length	2019-07-09 14:47:54 +03:00
Oskar Solecki	3472979d0b	Make sure exiting editor doesn't unpause the music	2019-07-09 12:53:40 +02:00
Desconocidosmh	2546f647be	Completely change the way we fix the bug	2019-07-09 11:32:49 +02:00
Andrei Zavatski	e8b9b1b0bf	visibility logic adjustments	2019-07-09 12:16:58 +03:00
Dean Herbert	e835cd0f6f	Improve information flow to Disclaimer	2019-07-09 18:08:44 +09:00
Dean Herbert	0580c32263	Abstract intro screen logic to base class	2019-07-09 18:05:57 +09:00
Dean Herbert	32fb811bc9	Merge branch 'master' into intro-testing-improvements	2019-07-09 18:05:52 +09:00
Andrei Zavatski	8d6af1625a	Visibility improvements	2019-07-09 11:40:51 +03:00
David Zhao	5bb21ecae0	remove storyboard region	2019-07-09 16:50:37 +09:00
David Zhao	1b5fadf93f	move comment to more relevant location	2019-07-09 16:38:12 +09:00
David Zhao	89cb8a0cac	Move storyboard initialization to new StoryboardContainer	2019-07-09 16:23:59 +09:00
Andrei Zavatski	eb4ef8f6ac	CI fixes	2019-07-09 08:25:10 +03:00
Andrei Zavatski	8d46d4a28e	Fix grade layout	2019-07-09 08:09:31 +03:00
Andrei Zavatski	5d81445454	Move api request outside the scores container	2019-07-09 08:05:34 +03:00
Andrei Zavatski	ebff35de66	Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score	2019-07-09 06:42:39 +03:00
Oskar Solecki	8f7476e9cc	Remove unused stuff	2019-07-09 00:26:57 +02:00
Oskar Solecki	a4957909b4	Merge branch 'master' into Fix-music-playing-while-exiting-from-editor	2019-07-09 00:11:29 +02:00
Desconocidosmh	338371c3fc	Fix music playing while exiting from editor	2019-07-09 00:08:18 +02:00
Dean Herbert	8a98aff318	Merge branch 'master' into replay-local-mods	2019-07-08 22:38:02 +09:00
Dean Herbert	54f5e6aedf	Add assertion and comment about lease logic	2019-07-08 22:37:39 +09:00
David Zhao	0cf4bf2352	Manually set clock for storyboard if loading before being given a parent	2019-07-08 18:46:12 +09:00
Desconocidosmh	39f04e497d	Add UserRequestedPause	2019-07-08 11:24:06 +02:00
Andrei Zavatski	1e5639acee	Add forgotten symbol	2019-07-08 12:10:08 +03:00
David Zhao	d489a77fe1	remove new container and comment	2019-07-08 17:57:29 +09:00
iiSaLMaN	11ef65e3e2	Remove unnecessary extension	2019-07-08 11:57:02 +03:00
iiSaLMaN	b62e69d170	Calculate length inside BeatmapManager	2019-07-08 11:56:48 +03:00
iiSaLMaN	5f3f59629e	Use the length field instead of recalculating	2019-07-08 11:55:07 +03:00
Andrei Zavatski	67a6abb96c	Add user top score on selected beatmap	2019-07-08 11:49:33 +03:00
David Zhao	fbd300e664	Move ruleset into ReplayPlayerLoader as well	2019-07-08 17:37:20 +09:00
Andrei Zavatski	a0efd50f62	Extend APILegacyScores request	2019-07-08 11:25:25 +03:00
Dean Herbert	16c993579b	Fix track transfer not running when beatmap is retrieved from cache	2019-07-08 17:12:34 +09:00
David Zhao	e78e326f34	remove unused using	2019-07-08 17:02:42 +09:00
iiSaLMaN	574d9a51b3	Update migrations	2019-07-08 10:44:23 +03:00
iiSaLMaN	129899f419	Add a BPM property in BeatmapInfo	2019-07-08 10:43:35 +03:00
David Zhao	ef22ab9340	remove bindable	2019-07-08 16:32:11 +09:00
David Zhao	6a86f62d17	Get mods from score info	2019-07-08 16:13:03 +09:00
David Zhao	5853a877c2	create base dependencies before caching, create player in playerloader	2019-07-08 15:40:10 +09:00
iiSaLMaN	2d0c924bdf	Add xmldoc for MaxStarDifficulty and MaxLength	2019-07-08 09:35:12 +03:00
iiSaLMaN	79ddb8d5d3	Change to a more convenient xmldoc	2019-07-08 09:23:01 +03:00
iiSaLMaN	90d5484818	Return BPM back to OnlineInfo ... Revert commit of "Move BPM out of OnlineInfo"	2019-07-08 09:10:41 +03:00
David Zhao	2747d7692b	Create ReplayPlayerLoader for local mod caching	2019-07-08 14:55:05 +09:00
iiSaLMaN	d874574612	Add migration	2019-07-07 20:25:59 +03:00
iiSaLMaN	729f0901f7	Move Length out of OnlineInfo	2019-07-07 20:25:36 +03:00
iiSaLMaN	3ea9629daf	Move BPM out of OnlineInfo	2019-07-07 20:11:44 +03:00
iiSaLMaN	6ee10640e3	Remove unnecessary migration + Fix CI issues	2019-07-07 19:26:41 +03:00
iiSaLMaN	28cc797fb6	Add migrations	2019-07-07 18:29:25 +03:00
iiSaLMaN	b4ef64fa61	Add sorting by Length	2019-07-07 18:26:56 +03:00
iiSaLMaN	65c8249c94	Add beatmap extension for calculating length	2019-07-07 18:25:52 +03:00
iiSaLMaN	188c80374e	Add sorting by BPM	2019-07-07 18:14:23 +03:00
Desconocidosmh	84cadc688a	Change method name	2019-07-07 17:11:54 +02:00
Desconocidosmh	1a117d1511	Closes #5277	2019-07-07 17:05:53 +02:00
Dean Herbert	ebc0e50295	Simplify conditions	2019-07-07 13:21:41 +09:00
Dean Herbert	1eec69c6b6	Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder	2019-07-07 13:06:34 +09:00
Salman Ahmed	b10c35b6ab	Update label text ... Co-Authored-By: Aergwyn <aergwyn@t-online.de>	2019-07-07 06:13:27 +03:00
Dean Herbert	8f2ec73626	Move logic inside of HUDOverlay ... Add vertical offset adjust.	2019-07-07 05:30:53 +09:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Joseph Madamba	7c0e3a50b6	Merge branch 'master' into fix-unranked-map-lb-placeholder	2019-07-06 12:09:28 -07:00
Dean Herbert	3f332cca2f	Merge branch 'master' into applicable-to-hud	2019-07-07 01:03:50 +09:00
Salman Ahmed	1f13b94c72	Fix build error	2019-07-06 18:44:55 +03:00
Salman Ahmed	a42c79895d	Remove unnecessary private field	2019-07-06 18:38:41 +03:00
Dean Herbert	be2d0048db	Merge branch 'master' into buttonsystem-entermode	2019-07-07 00:01:41 +09:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
Salman Ahmed	040dbfd2c1	Merge branch 'master' into remove-unnecessary-fading	2019-07-06 15:59:44 +03:00
Dean Herbert	ea911b2fd2	Ensure intro restarts track	2019-07-06 19:05:42 +09:00
iiSaLMaN	6fd3ad5c1d	Remove unnecessary fading	2019-07-06 12:10:30 +03:00
Dean Herbert	2149d639de	Merge branch 'master' into leaderboard-mod-filter	2019-07-06 13:27:49 +09:00