2826 Commits

Author	SHA1	Message	Date
Andrei Zavatski	5af1260094	Improve testing	2019-12-21 14:30:49 +03:00
Dean Herbert	02d3f0f241	Merge branch 'master' into settings-source-value-changed	2019-12-21 19:40:07 +09:00
Salman Ahmed	55be4478aa	Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours	2019-12-21 12:36:09 +03:00
Willy Tu	8353c893c0	Update BodyText of LocalScoreDeleteDialog	2019-12-20 12:00:10 -08:00
Willy Tu	a55e5c5c43	Removed unnecessary code	2019-12-20 11:16:54 -08:00
Dean Herbert	df14f473c2	Split tests out	2019-12-20 19:52:54 +09:00
Willy Tu	ad41a5cc57	Merge branch 'master' of github.com:ppy/osu into #7146	2019-12-20 02:14:01 -08:00
Willy Tu	ba2cff60ca	Removed Automation Testing steps for delete local scores. Only manual testing now.	2019-12-20 02:13:49 -08:00
Dan Balasescu	e2c7f15ed8	Merge branch 'master' into netcoreapp3.1	2019-12-20 18:41:29 +09:00
Dan Balasescu	f386f88bed	Merge branch 'master' into fix-waveform-cross-thread-access	2019-12-20 18:07:51 +09:00
smoogipoo	0ebdf90dfa	Move methods below ctor	2019-12-20 18:07:39 +09:00
Huo Yaoyuan	351e826120	Upgrade project targets to netcoreapp3.1	2019-12-20 17:03:54 +08:00
smoogipoo	705cdde148	Fix incorrect test	2019-12-20 16:42:45 +09:00
Willy Tu	afc11aa547	Fixed issues caused by renaming variables	2019-12-19 22:37:09 -08:00
Willy Tu	6672cf6059	Update variable name	2019-12-19 22:22:46 -08:00
Willy Tu	6abbd33b51	Fixed CI issues	2019-12-19 21:57:14 -08:00
Willy Tu	e42894cfcf	Fixed error for CodeFactor	2019-12-19 21:32:54 -08:00
Willy Tu	8ab26e8889	Update Tests with dependencies on LeaderboardScore. Added its dependency on DialogOverlay for the tests. Added test for deleting individual local score	2019-12-19 21:29:54 -08:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
Dean Herbert	81e842f6b4	Fix waveform test beatmap accessing zip archive across multiple threads	2019-12-19 19:48:48 +09:00
smoogipoo	4e11fb0fd7	Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text	2019-12-18 19:36:16 +09:00
smoogipoo	39489e2901	Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash	2019-12-18 18:51:56 +09:00
smoogipoo	5664ce3109	Add hitobject container regression test	2019-12-18 18:51:12 +09:00
Dean Herbert	36172cf2bd	Merge pull request #7175 from LeNitrous/update-beatmap-settings ... Display current difficulty statistics with mods applied	2019-12-18 18:43:49 +09:00
Dean Herbert	5cdc7d3b18	Merge pull request #7183 from smoogipoo/legacy-beatmap-saving ... Add initial implementation of a legacy beatmap encoder	2019-12-18 18:43:14 +09:00
Dean Herbert	51a01c7006	Merge pull request #7256 from peppy/remove-ruleset-ctor-param ... Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 18:42:42 +09:00
Dan Balasescu	6683460240	Merge branch 'master' into update-beatmap-settings	2019-12-18 17:59:27 +09:00
smoogipoo	2a128340d0	Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats	2019-12-18 17:58:37 +09:00
Dean Herbert	fa067b8799	Merge branch 'master' into legacy-beatmap-saving	2019-12-18 17:17:03 +09:00
Dean Herbert	54572b6de9	Update selected mdos references	2019-12-18 16:42:18 +09:00
Dean Herbert	7831e6ed33	Implement NewsArticleCover class (#7192) ... Implement NewsArticleCover class	2019-12-18 16:15:23 +09:00
Dean Herbert	6e0802e50c	Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 14:49:09 +09:00
Lucas A	ad7923f9b9	Fix test methods not being renamed.	2019-12-17 19:25:17 +01:00
Lucas A	0a278ef943	Apply review suggestions	2019-12-17 19:23:30 +01:00
Dean Herbert	036efb9947	Merge branch 'master' into fix-effect-points	2019-12-18 01:43:15 +09:00
Dean Herbert	886db8eb22	Merge branch 'master' into fix-local-score-availability	2019-12-18 01:15:20 +09:00
smoogipoo	69da6ed9a1	Fix test re-using the same storage	2019-12-17 23:53:18 +09:00
Dan Balasescu	3d13fe485d	Merge pull request #7238 from huoyaoyuan/fxcop ... Apply FxCop at game side	2019-12-17 21:29:52 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
Andrei Zavatski	8cd96acffc	CounterPill implementation	2019-12-17 12:05:35 +03:00
Huo Yaoyuan	927ba4c113	Update expected exception in test.	2019-12-17 15:20:05 +08:00
smoogipoo	59c3b39ed8	Add test	2019-12-17 15:47:13 +09:00
Dean Herbert	5079feaad1	Remove unnecessary string interpolation	2019-12-17 14:04:03 +09:00
Huo Yaoyuan	d7b3578cc6	CA2201: throw correct exception type.	2019-12-17 13:00:02 +08:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	f8ffa67693	Add test and isolate ignore bindable from EnableUserDim	2019-12-17 13:21:23 +09:00
Dean Herbert	272d7d0ca9	Merge branch 'master' into fallback-to-skin-combo-colours	2019-12-17 12:36:20 +09:00
Dean Herbert	eed2984bef	Update sdk and InspectCode version (#7208) ... Update sdk and InspectCode version	2019-12-16 19:46:12 +09:00
Dean Herbert	7d979e1264	Add finalised test scene	2019-12-16 19:41:04 +09:00
smoogipoo	6cf318c34b	Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding	2019-12-16 18:41:21 +09:00
smoogipoo	8beb6b534f	Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving	2019-12-16 17:09:03 +09:00
Dean Herbert	d7eb4f73f4	Merge branch 'master' into update-beatmap-settings	2019-12-16 14:57:57 +09:00
Ganendra Afrasya	0e658790c1	Add function to assert multiplier value instead of hardcoded string	2019-12-15 22:42:44 +07:00
Huo Yaoyuan	c457571da6	Use index and range expressions	2019-12-15 20:17:35 +08:00
Huo Yaoyuan	cea3a66d4a	Use static local method fixed for roslyn 3.4	2019-12-15 20:07:56 +08:00
Dean Herbert	244eb56455	Fix test ruleset availability	2019-12-15 03:01:37 +09:00
Lucas A	43720fbf45	Fix CI issues	2019-12-13 18:59:40 +01:00
Lucas A	e05c9426ed	Initial implementation of NewsArticleCover class	2019-12-13 18:50:49 +01:00
Dean Herbert	bc31146560	Mods -> SelectedMods	2019-12-13 21:45:38 +09:00
Dean Herbert	76aa4f9fb2	Fix code style issues	2019-12-13 21:36:50 +09:00
Dean Herbert	7fdaf338f3	Fix test logic and add regression test	2019-12-13 21:36:50 +09:00
smoogipoo	0d49bc244e	Fix test beatmap not being retrievable anymore	2019-12-13 21:30:28 +09:00
Dean Herbert	f349e7ff78	Fix non-null ?? usage	2019-12-13 20:35:34 +09:00
Dean Herbert	0bbaf9b7fb	Fix mod select overlay tests not running individually	2019-12-13 20:21:35 +09:00
Dean Herbert	7033974733	Fix test regressions (incorrect from the start)	2019-12-13 20:13:32 +09:00
smoogipoo	abf3f341b7	Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving	2019-12-13 19:01:25 +09:00
smoogipoo	c976427206	Refactor test to be more complete	2019-12-13 19:00:28 +09:00
smoogipoo	36f541d8e5	Fix incorrect asserts	2019-12-13 18:14:06 +09:00
smoogipoo	87a7f340e3	Fix first sample point being treated as redundant	2019-12-13 18:14:01 +09:00
unknown	3945e7403a	improve tests and refactor AdvancedStats	2019-12-13 09:39:54 +08:00
unknown	ec5b506960	apply mod difficulty settings during song select	2019-12-12 23:41:46 +08:00
Dean Herbert	ecc7fdc561	Ensure a clean run on each test method	2019-12-12 21:04:56 +09:00
Dean Herbert	5e634c1183	Move test values to constants	2019-12-12 20:51:58 +09:00
Salman Ahmed	7e1d21fa16	Simplify combo colours lookup tests	2019-12-12 14:08:35 +03:00
Salman Ahmed	4406172eb4	Add missing test attributes	2019-12-12 14:05:37 +03:00
Dean Herbert	7559012fb7	Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks	2019-12-12 19:55:09 +09:00
Salman Ahmed	ebd778da2d	More test splitting	2019-12-12 12:48:07 +03:00
Salman Ahmed	a9125f6544	Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours	2019-12-12 12:37:51 +03:00
smoogipoo	be000e13e4	Implement initial legacy beatmap encoding support	2019-12-12 18:34:40 +09:00
Salman Ahmed	81c8493038	Split combo colour decoding to small test cases	2019-12-12 12:16:19 +03:00
smoogipoo	1807fc9b61	Fix testcase not converting beatmap	2019-12-12 16:48:33 +09:00
Dean Herbert	3ccfee64f6	Add HUDOverlay tests	2019-12-12 16:09:42 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
Salman Ahmed	6a539e307a	Split into small tests and add more cases	2019-12-12 09:22:35 +03:00
Dean Herbert	a93d57b77e	Merge branch 'master' into lighten-playfield-during-breaks	2019-12-12 11:57:21 +09:00
Salman Ahmed	035a53cb9e	Schedule SetUp()	2019-12-12 01:10:43 +03:00
Salman Ahmed	61265ed452	Increase the waiting steps	2019-12-12 00:52:33 +03:00
Salman Ahmed	4f6b85e5ea	Add test ensuring correct break lightening behaviour	2019-12-12 00:32:39 +03:00
Salman Ahmed	bc02cfc2e2	TestSceneUserDimContainer -> TestSceneUserDimBackgrounds	2019-12-12 00:30:16 +03:00
Lucas A	e7a06aeadc	Update NewsOverlay visual tests to expose LoadAndShowChild() for testing purposes	2019-12-11 14:32:43 +01:00
Dan Balasescu	e288706802	Merge branch 'master' into rankings-overlay-refactor	2019-12-11 19:09:29 +09:00
Dan Balasescu	166e957104	Merge pull request #6432 from LeNitrous/customized-mods ... Add per-mod settings	2019-12-11 19:07:29 +09:00
Dean Herbert	a106e2a53f	Refactor distance snap grid to not require hitobjects (#7138) ... Refactor distance snap grid to not require hitobjects	2019-12-11 19:02:29 +09:00
Dean Herbert	274958669c	Add early assert as sanity check	2019-12-11 15:47:41 +09:00
Dean Herbert	6c8f325063	Add failing test	2019-12-11 15:46:07 +09:00
Salman Ahmed	63f66aa5fa	Check by UserDimContainer.DimLevel instead	2019-12-10 15:25:03 +03:00
Dean Herbert	138b83c9ea	Merge branch 'master' into customized-mods	2019-12-10 19:13:32 +09:00
Dean Herbert	f6c0b5c44a	Merge branch 'master' into settings-source	2019-12-10 18:49:41 +09:00
Dan Balasescu	bd6a08a21b	Merge branch 'master' into apply-to-track	2019-12-10 16:15:24 +09:00
smoogipoo	94a298a82d	Refactor distance snap grid to not require hitobjects	2019-12-10 16:00:09 +09:00
Dean Herbert	5f3d163772	Merge branch 'master' into segmented-slider-paths-3	2019-12-10 14:28:20 +09:00
Dean Herbert	cdde5d1d69	Fix song select filters not reapplied if in a child screen ... Closes https://github.com/ppy/osu/issues/6980.	2019-12-10 02:30:23 +09:00
smoogipoo	cd61893814	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 18:25:27 +09:00
Dean Herbert	eb074b7058	Allow mods to apply to track, not clock	2019-12-09 17:44:45 +09:00
smoogipoo	53f7c753fb	General cleanups	2019-12-09 16:44:19 +09:00
smoogipoo	c18f2e6436	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 15:34:49 +09:00
Dan Balasescu	0c9f7a64f1	Merge branch 'master' into improve-dialog-button-visuals	2019-12-09 15:31:48 +09:00
Dan Balasescu	5738ef5fab	Merge branch 'master' into editor-timeline-hitobject-display	2019-12-09 14:34:55 +09:00
Dean Herbert	58db745121	Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals	2019-12-09 14:11:52 +09:00
Dean Herbert	4fbe5b7002	Merge branch 'master' into rankings-overlay-refactor	2019-12-09 11:34:32 +09:00
Dean Herbert	f65866648e	Use Array.Empty	2019-12-06 20:14:56 +09:00
Dean Herbert	347373a3ba	Fix test failures	2019-12-06 19:04:55 +09:00
Dean Herbert	46d055604a	Customize -> Customise	2019-12-06 18:59:45 +09:00
Dean Herbert	680b2653ae	Improve animation of popup dialog buttons	2019-12-06 18:51:30 +09:00
Dean Herbert	cf0413663d	Merge branch 'settings-source' into customized-mods	2019-12-06 18:05:39 +09:00
Dean Herbert	f84705ab96	Add tests	2019-12-06 18:04:46 +09:00
Dean Herbert	a5d5099868	Use SettingsSource for mod cusomisation	2019-12-06 17:09:48 +09:00
Dean Herbert	af35df4077	Add multiple mod testing and update test code style	2019-12-06 15:42:11 +09:00
smoogipoo	2654710d91	Add tests and fix negative expected distances	2019-12-06 15:37:06 +09:00
Dean Herbert	170954bc6e	Merge remote-tracking branch 'upstream/master' into customized-mods	2019-12-06 15:31:20 +09:00
Dean Herbert	12f1c9e088	Fix test failure	2019-12-06 15:29:02 +09:00
Dean Herbert	de23364608	Add failing test	2019-12-06 13:47:34 +09:00
Dean Herbert	28400aa865	Update test scene	2019-12-06 11:27:24 +09:00
Dean Herbert	e76f8bdd64	Fix warnings	2019-12-05 23:31:21 +09:00
Dean Herbert	e225b0032a	Add basic hitobject display to timeline	2019-12-05 19:31:40 +09:00
smoogipoo	2702edfa55	Rename new path, replace existing one	2019-12-05 17:49:32 +09:00
smoogipoo	5e9b739b67	Re-implement slider paths to support multiple segments	2019-12-05 16:45:02 +09:00
Andrei Zavatski	bf7c309d4c	Make field readonly	2019-12-05 10:05:04 +03:00
Andrei Zavatski	33737d3d89	Move tests to TestSceneRankingsOverlay due to refactoring	2019-12-05 09:53:25 +03:00
Andrei Zavatski	22863da360	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor	2019-12-05 09:29:37 +03:00
Dan Balasescu	36c734c4c2	Merge branch 'master' into decouple-api-room-scoreinfo	2019-12-05 12:43:43 +09:00
Andrei Zavatski	0560a6637c	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor	2019-12-05 04:11:45 +03:00
Dean Herbert	36224dca13	Fix multiplayer aggregate score inheriting from ScoreInfo	2019-12-05 01:45:28 +09:00
Dean Herbert	5b8ca8f84a	Remove test ignore rules	2019-12-05 01:17:11 +09:00
Dean Herbert	9ac0ac0944	Merge branch 'master' into fix-pause-testcase	2019-12-05 01:00:27 +09:00
Dean Herbert	ca1f3417a3	Merge pull request #7046 from smoogipoo/fix-replay-button ... Fix replay download button not working	2019-12-04 23:00:40 +09:00
Dan Balasescu	19c5848e73	Merge branch 'master' into decouple-legacy-score-info	2019-12-04 11:47:27 +09:00
Dan Balasescu	242e1b0b2e	Merge branch 'master' into add-missing-long-running	2019-12-04 11:29:25 +09:00
Dean Herbert	a225a35f91	Fix failing tests	2019-12-03 16:18:36 +09:00
Dean Herbert	f0d49d0cdf	Decouple APILegacyScoreInfo from ScoreInfo	2019-12-03 15:31:11 +09:00
smoogipoo	aadbbb1af3	Fix replay download button not working	2019-12-03 13:33:42 +09:00
Andrei Zavatski	c451542915	Rankings overlay basic implementation	2019-11-30 03:01:07 +03:00
Dean Herbert	3fc2afeb26	Fix UserDimContainer test failing on subsequent runs	2019-11-29 15:51:00 +09:00
Andrei Zavatski	36d694ad2d	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables	2019-11-28 20:43:17 +03:00
Andrei Zavatski	83e3ad9e69	Make Rankings a ctor variable	2019-11-28 20:09:05 +03:00
Dean Herbert	e7ef919b0b	Ignore another failing test	2019-11-29 01:47:52 +09:00
Dean Herbert	1c4063677d	Ignore test temporarily	2019-11-29 00:45:35 +09:00
Ganendra Afrasya	af5c5a3000	Apply reviews ... Also rename the class name to match with the others	2019-11-28 20:06:15 +07:00
smoogipoo	f504370867	Make player block exit if pausable	2019-11-28 15:58:26 +09:00
Ganendra Afrasya	6149482b5d	Add test	2019-11-28 12:03:11 +07:00
Andrei Zavatski	44cfe98278	Simplify test scene	2019-11-27 23:40:52 +03:00
Andrei Zavatski	800bda7e81	Refactor tables to avoid code duplication	2019-11-27 23:35:02 +03:00
Dean Herbert	724fcecbc5	Fix test scene not actually covering the class it's testing	2019-11-28 00:32:31 +09:00
Dean Herbert	4221a0126c	Merge branch 'master' into rankings-tables	2019-11-27 23:26:54 +09:00
Dean Herbert	01a37771bc	Merge branch 'master' into customized-mods	2019-11-27 19:44:32 +09:00
Dan Balasescu	c6a85a11bd	Merge branch 'master' into sharpen	2019-11-27 17:09:11 +09:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dean Herbert	77ce9642ba	Add test coverage and simplify break time updating	2019-11-26 15:32:48 +09:00
Dan Balasescu	51eff3d49c	Merge branch 'master' into add-access-to-skin-legacy-version	2019-11-25 12:40:01 +09:00
Dan Balasescu	9f93727a80	Merge branch 'master' into fix-spritetext-usage	2019-11-25 12:15:05 +09:00
Dean Herbert	45514ff660	Apply fixes	2019-11-25 11:30:55 +09:00
iiSaLMaN	2437cfd28c	Add test ensuring correct version lookup	2019-11-24 04:36:16 +03:00
iiSaLMaN	5bf6e57eb0	Remove unnecessary usage	2019-11-24 02:16:43 +03:00
Andrei Zavatski	d6c9387beb	Implement NotSupporterPlaceholder	2019-11-22 21:55:21 +03:00
Dan Balasescu	5d2a608be0	Merge branch 'master' into lead-in-fixes	2019-11-22 13:48:55 +09:00
Dan Balasescu	7c19f7cd7b	Merge branch 'master' into improve-skip-button-feel	2019-11-22 13:36:27 +09:00
Dan Balasescu	ba0ac93f70	Merge branch 'master' into skip-multiple-times	2019-11-22 13:23:50 +09:00
Dean Herbert	5da5abdb05	Merge branch 'master' into prev-button-revamp	2019-11-22 02:57:22 +09:00
Andrei Zavatski	984ec11a78	Make Ruleset a bindable	2019-11-21 18:56:48 +03:00
Andrei Zavatski	458496206c	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-21 18:49:37 +03:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	0d4854ac09	Add News Overlay skeleton and header (#5726) ... Add News Overlay skeleton and header Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-22 00:14:31 +09:00
Dean Herbert	1a6b5e8714	Implement TotalCommentsCounter component for CommentsContainer (#6867) ... Implement TotalCommentsCounter component for CommentsContainer	2019-11-21 23:45:23 +09:00
Dean Herbert	ac2dfffb23	Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation	2019-11-21 22:52:45 +09:00
Dean Herbert	71a64da566	Fix test regressions	2019-11-21 22:07:37 +09:00
Dean Herbert	bd6831624a	Decouple skip button animations from gameplay clock	2019-11-21 19:51:22 +09:00
Dean Herbert	46a94821d4	Add support for consecutive skips	2019-11-21 18:59:55 +09:00
Dean Herbert	8d1b11d4bd	Add storyboard lead-in tests	2019-11-21 18:50:54 +09:00
Dean Herbert	4e53bca8dd	Simplify tests	2019-11-21 18:50:38 +09:00
Dean Herbert	29d2374928	Add back skip button actuation count tests	2019-11-21 17:23:52 +09:00
Dean Herbert	586e31efc2	Update tests	2019-11-21 15:56:08 +09:00
Dean Herbert	8369be90f2	Allow skip button to actuate more than once	2019-11-21 15:19:06 +09:00
Dean Herbert	c0b9bb5a12	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-21 14:22:17 +09:00
Dean Herbert	be62e48296	Fix tests not working if main or audio volume is zero	2019-11-21 10:35:10 +09:00
Dean Herbert	7637e680d7	Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping	2019-11-21 10:27:32 +09:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
iiSaLMaN	0407d2248c	Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version	2019-11-20 01:10:32 +03:00
Andrei Zavatski	509440ea14	TotalCommentsCounter implementation	2019-11-16 18:02:34 +03:00
Dean Herbert	296fff9243	Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter	2019-11-15 18:20:36 +09:00
Andrei Zavatski	e51fd00d58	CI fix	2019-11-15 12:09:31 +03:00
Andrei Zavatski	2592a0489b	Use existing ModNoMod	2019-11-15 11:57:40 +03:00
Andrei Zavatski	b7efc276f1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-15 11:42:32 +03:00
Dean Herbert	dbfec215e7	Improve test quality	2019-11-15 14:47:28 +09:00
Dean Herbert	c7d0b88854	Update test scene	2019-11-15 14:15:09 +09:00
Dean Herbert	eee5902851	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-15 14:05:31 +09:00
Dean Herbert	b8bb97607b	Merge remote-tracking branch 'upstream/master' into fix-mod-retention	2019-11-15 13:46:44 +09:00
unknown	15e85234e4	remove unecessary step	2019-11-15 11:12:51 +08:00
Dean Herbert	e81dfcad4c	Fix remaining cases of pollution	2019-11-15 11:46:32 +09:00
Dean Herbert	22c3be2c6f	Clear count variables on carousel creation	2019-11-15 11:26:01 +09:00
Dan Balasescu	af01d8ca34	Merge branch 'master' into clean-carousel-tests	2019-11-15 10:28:59 +09:00