1688 Commits

Author	SHA1	Message	Date
EVAST9919	e5a6d920cd	Implement an abstract RulesetSelector class	2019-06-12 23:23:01 +03:00
Dean Herbert	00ee45fe46	Merge remote-tracking branch 'origin/update-visibility-container' into update-framework	2019-06-11 19:36:13 +09:00
Dean Herbert	5c2c4f0ada	Merge pull request #4878 from HoLLy-HaCKeR/expose-skills ... Expose skills in DifficultyAttributes	2019-06-11 18:47:56 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Dan Balasescu	346c4310c3	Merge branch 'master' into fail-animation	2019-06-07 20:48:36 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
HoLLy	2a295545a7	Don't mutate strainPeaks	2019-05-29 11:25:25 +02:00
HoLLy	7e9f5a0939	Add Skills to DifficultyAttributes	2019-05-29 11:22:51 +02:00
Paul Teng	1c3b768266	Use Precision.AlmostBigger	2019-05-12 09:02:22 -04:00
Paul Teng	1a6c8e91a5	Compare Health with small value	2019-05-12 08:44:20 -04:00
smoogipoo	3fe61c4a7e	Trim whitespace	2019-05-10 18:48:39 +09:00
Dan Balasescu	425154c264	Merge branch 'master' into progress-bar-show-seek	2019-05-10 18:24:15 +09:00
smoogipoo	ad4b4f3422	Use nullable cancellation tokens	2019-05-10 17:42:45 +09:00
Dean Herbert	a44296a6db	Merge branch 'master' into progress-bar-show-seek	2019-05-10 17:27:49 +09:00
Dean Herbert	21ab628f41	Merge branch 'master' into player-load-cancellations	2019-05-10 16:58:36 +09:00
smoogipoo	d25d39b315	Add cancellation to storyboard/hitobject loading	2019-05-10 16:31:09 +09:00
Dan Balasescu	32808a8a59	Merge branch 'master' into fix-long-skip-performance	2019-05-10 16:10:50 +09:00
David Zhao	5c096cbc91	Revert mirroring condition too	2019-05-09 18:59:00 +09:00
David Zhao	9e0af723cc	Split out affectscombo change	2019-05-09 18:56:19 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	3bcfc86b9c	Allow custom MaxCatchUpFrames to be specified ... Also adjusts the default to allow for smoother seeking.	2019-05-09 16:39:03 +09:00
Dean Herbert	66594b7a1b	Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start	2019-05-09 16:39:03 +09:00
David Zhao	b0e34d86d5	Subtract a result from count if its been reverted	2019-05-09 16:16:20 +09:00
David Zhao	39fb5712f1	Only combo-incrementing results add to result count	2019-05-09 15:31:37 +09:00
smoogipoo	39efa2d173	Fix possible cross-thread config cache access	2019-05-08 19:05:00 +09:00
smoogipoo	117f8bdd01	Merge remote-tracking branch 'Joehuu/master' into flashlight-dim	2019-05-08 13:25:01 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
David Zhao	abc163fa36	Fix merge	2019-05-07 12:07:45 +09:00
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00
Dean Herbert	6bdaca1e3b	Fix mod equality checks not working as intended	2019-05-03 10:09:47 +09:00
Dean Herbert	6a4dc5e25c	Improve xmldoc slightly	2019-05-02 14:03:58 +09:00
iiSaLMaN	ddd9262384	fix xmldoc	2019-04-30 19:08:31 +03:00
iiSaLMaN	3b03ca802a	Merge branch 'master' into sh-xh-grading-2	2019-04-30 18:55:35 +03:00
iiSaLMaN	148f4c4ce0	Pass Rank.Value instead ... Passing Rank.Value along each iteration instead of calculating.	2019-04-30 18:49:31 +03:00
iiSaLMaN	e0abd0b2c1	fix comment	2019-04-30 18:44:31 +03:00
iiSaLMaN	665558c297	Remove unnecessary comment	2019-04-30 18:44:06 +03:00
iiSaLMaN	5d50316ae7	Add xmldoc	2019-04-30 18:12:27 +03:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
iiSaLMaN	b08fb5136e	Merge branch 'master' into sh-xh-grading-2	2019-04-26 10:38:10 +03:00
David Zhao	9da13cb463	Merge branch 'master' into flashlight-dim	2019-04-25 23:15:15 +09:00
KingLuigi4932	619071b7ee	Unnecessary 'using' directive	2019-04-25 14:23:00 +03:00
KingLuigi4932	4e0f21102b	Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2	2019-04-25 14:04:12 +03:00
KingLuigi4932	c6b3197dd0	Add AdjustRank and use it in Hidden Mod	2019-04-25 13:56:57 +03:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
iiSaLMaN	d3bc443810	Merge branch 'master' into sh-xh-grading-2	2019-04-25 06:11:07 +03:00
Dean Herbert	4f31eee5ad	Merge branch 'master' into flashlight-dim	2019-04-24 17:01:11 +09:00
Dean Herbert	60328cf1fb	Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek	2019-04-24 15:25:53 +09:00
Dean Herbert	80e1568e97	Fix FrameStabilityContainer performing frame-stable seeks	2019-04-24 15:25:52 +09:00
iiSaLMaN	a29c7d81ee	Merge branch 'master' into sh-xh-grading-2	2019-04-23 10:31:17 +03:00
David Zhao	9890884726	Remove fade in, update comment	2019-04-23 14:23:09 +09:00
smoogipoo	6c568d228f	Add comment	2019-04-23 13:45:51 +09:00
smoogipoo	6add395288	Fix gameplay cursor being hidden in tests/replays	2019-04-23 13:32:44 +09:00
iiSaLMaN	a6b60a2fc2	Merge branch 'master' into sh-xh-grading-2	2019-04-22 19:39:20 +03:00
Dean Herbert	5313ba2938	Merge branch 'master' into hp-rewind	2019-04-22 19:02:41 +09:00
Dean Herbert	908eee9942	Fix pause tests	2019-04-22 18:29:51 +09:00
smoogipoo	aeae759fcd	Rename method + add xmldoc	2019-04-22 18:08:15 +09:00
smoogipoo	4edb17a88a	Make hp work + cleanup	2019-04-22 18:02:49 +09:00
smoogipoo	fbb4e9df04	Implement hp at base ScoreProcessor	2019-04-22 16:51:38 +09:00
David Zhao	3fbbb7dcf9	Move intiial fade outside of absolute sequence	2019-04-22 16:39:28 +09:00
iiSaLMaN	cfb3c38c3a	Fix.	2019-04-22 10:14:19 +03:00
iiSaLMaN	9030935030	Fix AppVeyor Errors	2019-04-22 10:07:45 +03:00
iiSaLMaN	64429aa968	Fix AppVeyor Errors	2019-04-22 09:59:51 +03:00
iiSaLMaN	7a385e56ec	Fix AppVeyor Errors	2019-04-22 09:58:29 +03:00
iiSaLMaN	c784bc4418	Remove whitespaces	2019-04-22 06:15:37 +03:00
iiSaLMaN	de542ca202	Remove bindable and use property	2019-04-22 06:14:14 +03:00
iiSaLMaN	26f0b2a4fe	Remove bindable ... Bad usage	2019-04-22 06:12:41 +03:00
iiSaLMaN	cff319e0d8	Fix issue	2019-04-21 18:12:50 +03:00
iiSaLMaN	c5bf01cc5c	Fix issue	2019-04-21 18:05:52 +03:00
iiSaLMaN	b200142afb	Make AdjustRank Bindable and fix issue	2019-04-21 17:55:01 +03:00
iiSaLMaN	77614189c9	Make AdjustRank Bindable	2019-04-21 17:48:50 +03:00
iiSaLMaN	4e07975e7c	Ranks must be adjusted in Hidden Mod	2019-04-21 15:58:40 +03:00
iiSaLMaN	73da423639	Adjust rank	2019-04-21 15:58:19 +03:00
David Zhao	037e23247f	Remove unused using	2019-04-18 14:31:47 +09:00
David Zhao	dfa5beea89	Use the actual scale of Flashlight for FlashlightSize	2019-04-18 14:24:19 +09:00
Dean Herbert	879f6152b0	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-04-17 22:17:10 +08:00
smoogipoo	ac2eabc9bf	Fix replay rewinding not respecting 60fps playback	2019-04-16 17:47:00 +09:00
David Zhao	e25c7fdb9b	Use absolute sequence for flashlight breaks	2019-04-12 17:39:25 +09:00
David Zhao	846a4835ca	Invert flashlight dim	2019-04-12 11:23:40 +09:00
David Zhao	664a4ba540	Implement flashlight dimming on slider slide	2019-04-12 10:47:22 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	7845d542e3	Cache mods as array in DrawableRuleset	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	79b5c2482b	Merge pull request #4562 from peppy/fix-editor-blueprints ... Fix editor blueprints being misplaced	2019-04-01 11:17:17 +09:00
Dean Herbert	6896ec7731	Remove unnecessary method	2019-04-01 10:39:55 +09:00
Dean Herbert	d1a175675d	Use variable	2019-04-01 10:37:02 +09:00
Dean Herbert	5d91c3bcfc	Fix replay handler nullref crashes	2019-03-31 01:33:56 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +09:00
Dean Herbert	3e8952b087	Merge pull request #4521 from peppy/hitobject-drawable-representation ... Fix DrawableRuleset drawable creation method's name	2019-03-29 14:08:23 +09:00
Dean Herbert	c72705217a	Merge branch 'master' into framed-replay-handler-fixes	2019-03-29 12:59:51 +09:00
Dean Herbert	14cef94a53	Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation	2019-03-29 12:59:26 +09:00
Dean Herbert	e7b38cdc75	Remove unnecessary set	2019-03-29 12:38:47 +09:00
Dean Herbert	5b0aa7bf8d	Split out current/next frame conditionals for readability	2019-03-29 12:38:40 +09:00
Dean Herbert	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	ed0bf59e73	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:51:44 +09:00
Dan Balasescu	bab7d78130	Remove redundant cast ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-29 11:36:40 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dan Balasescu	d410054ec8	Merge branch 'master' into key-counter-display	2019-03-29 11:22:59 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dan Balasescu	772f0cac8a	Merge branch 'master' into gameplay-cursor-last-state	2019-03-29 11:01:13 +09:00
Dan Balasescu	7ab24e35f9	Merge branch 'master' into gameplay-paused-no-update	2019-03-29 10:53:32 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
Dean Herbert	148e26a6d4	Fix FramedReplayInputHandler starting at frame 0 when it shouldn't	2019-03-28 12:42:57 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	3fcbc2eab3	Fix key counter getting overridden	2019-03-27 10:31:21 +09:00
Dean Herbert	15821c7511	Fix cursor adding	2019-03-26 17:04:14 +09:00
Dean Herbert	dde7788c44	Merge branch 'universal-playfield-adjust' into resume-cursor-2	2019-03-26 13:58:48 +09:00
Dean Herbert	fb302e7ad8	Remove using	2019-03-26 13:58:07 +09:00
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	27cb4ce0d1	Remove poop	2019-03-26 13:48:35 +09:00
Dean Herbert	fbc97edc55	Add base cursor class to retrieve true visibility state	2019-03-26 13:41:30 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00
Dean Herbert	a642f10131	Remove redundant cast	2019-03-25 21:52:01 +09:00
Dean Herbert	245f463e3f	Don't update gameplay loop while paused	2019-03-25 20:31:55 +09:00
Dean Herbert	a23dfb58ad	Add base cursor class to retrieve true visibility state	2019-03-25 20:31:55 +09:00
Dean Herbert	06d4856e17	Remove unnecessary CursorTargetContainer	2019-03-25 20:31:55 +09:00
Dean Herbert	c79d187a89	Add final osu! resume screen implementation	2019-03-25 20:31:55 +09:00
Dean Herbert	38e481686f	Make PlayfieldAdjustmentContainer universal	2019-03-25 20:31:55 +09:00
Dean Herbert	57b3b7b54b	Add back resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	a694626cc6	Add proper resume request logic	2019-03-25 20:31:55 +09:00
Dean Herbert	c97116c91a	Add safety against DrawableHitObject implementations clearing children	2019-03-25 13:34:22 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
Dean Herbert	15f9a6b9df	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-21 16:04:18 +09:00
Dean Herbert	fe255c54d0	Merge pull request #4496 from smoogipoo/reinstantiate-mods ... Fix mods being reused for difficulty calculation	2019-03-20 19:10:52 +09:00
smoogipoo	c510385aa8	Remove unnecessary allocations	2019-03-20 16:46:16 +09:00
smoogipoo	6df275c83a	Use fresh mods for each difficulty calculation iteration	2019-03-20 16:37:25 +09:00
Dean Herbert	13e2d6a340	Merge branch 'master' into fix-spinner-conversion	2019-03-20 16:32:44 +09:00
Dean Herbert	f43e7a880c	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 15:27:06 +09:00
Dean Herbert	c186629b8a	Reorder class	2019-03-20 14:55:38 +09:00
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +09:00
smoogipoo	6511234804	Fix catch spinners not being allowed for conversion	2019-03-20 13:53:22 +09:00
Dean Herbert	936c3e1ed9	Add safety type check to DrawableScrollingRuleset	2019-03-20 11:34:06 +09:00
Dean Herbert	45b8bfcfd3	Better protect not-generic DrawableRuleset	2019-03-20 11:31:03 +09:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +09:00
Dean Herbert	3b7a76aa4e	Fix typo	2019-03-20 11:22:34 +09:00
Dean Herbert	e0ab40b082	Rename missed files	2019-03-19 23:56:12 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
Dean Herbert	9433a97747	Add resume requesting support and fix exit scenarios	2019-03-18 20:33:43 +09:00
Dean Herbert	9ca4d9d4d1	Remove regions	2019-03-18 10:48:44 +09:00
Dean Herbert	771d676ba1	Split RulesetInputManager out to FrameStabilityContainer	2019-03-17 13:30:52 +09:00
Dean Herbert	14af957599	Merge pull request #4468 from smoogipoo/fix-min-tick-distance ... Fix ticks not being generated at the minimum tick distance	2019-03-15 12:12:48 +09:00
Dan Balasescu	2c80f73a88	Merge branch 'master' into increase-osu-file-validation	2019-03-14 18:47:32 +09:00
smoogipoo	71d79f0a39	Fix ticks not being generated at the minimum tick distance	2019-03-14 15:20:12 +09:00
smoogipoo	2815c3b07c	Remove unused variable	2019-03-14 15:12:26 +09:00
Dean Herbert	0042cc5337	Merge branch 'master' into mod-ramp-hotfix	2019-03-14 13:02:29 +09:00
Dean Herbert	85c518f146	Change logic to better handle external adjustments	2019-03-14 12:29:16 +09:00
Dean Herbert	c40e24739b	Fix weird application logic	2019-03-13 21:37:33 +09:00
Dan Balasescu	5d23a966d7	Fix incorrect application logic for rate fallback ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-13 20:55:33 +09:00
Dean Herbert	3d4a80957f	Improve comment	2019-03-13 18:27:54 +09:00
Dean Herbert	1617e2a729	Merge branch 'master' into mania-judgemetns	2019-03-13 18:17:42 +09:00
Dean Herbert	8f00f2290a	Log issues	2019-03-13 14:56:41 +09:00
Dean Herbert	f8b5cf8c8e	Add extra clamping of endTime to startTime	2019-03-13 13:46:41 +09:00
Dan Balasescu	a35d9ccc09	Apply clamping suggestion ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-13 12:35:05 +09:00
Dean Herbert	93b774104a	Fix NaN handling	2019-03-13 11:30:33 +09:00
Dean Herbert	cc09ecbfcf	Increase validation performed on .osu files to avoid hard crashes	2019-03-12 20:31:15 +09:00
David Zhao	7eb253b687	Fix incorrect scale duration	2019-03-12 19:44:53 +09:00
David Zhao	3b3b1e51ee	Move hit animation logic into virtual method	2019-03-12 19:41:33 +09:00
David Zhao	9850122245	Fix incorrect delay	2019-03-12 19:24:46 +09:00
David Zhao	12f334035f	Create properties for use in DrawableManiaJudgement	2019-03-12 19:23:24 +09:00
Dean Herbert	a10cd2288d	Improve ModRamp's handling of external rate changes	2019-03-12 18:15:18 +09:00
Dean Herbert	6832e384a9	Simplify DT/HT/NC/DC	2019-03-12 18:14:41 +09:00
Dean Herbert	63fea65c0c	Clarify repeat index	2019-03-11 14:53:21 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Dean Herbert	2029cf93fd	Rename and reuse variables	2019-03-11 14:33:21 +09:00
Dean Herbert	c6194d5487	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:40:03 +09:00
Dean Herbert	48e54c84c1	Merge branch 'master' into mod-wind	2019-03-08 20:23:02 +09:00
Dean Herbert	28a1baa07e	Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation	2019-03-08 20:13:58 +09:00
Dean Herbert	93a999396e	LegacyFinalTick -> LegacyLastTick to match existing variable	2019-03-08 20:13:11 +09:00
Dean Herbert	f59b9e933e	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:00:12 +09:00
Dean Herbert	355705f0a5	Fix legacy tick handling	2019-03-08 19:57:30 +09:00
Dean Herbert	973f29b765	Apply review	2019-03-08 15:14:57 +09:00
Dean Herbert	a73e3d9700	Move cursor construction to BDL	2019-03-08 15:01:45 +09:00
Dean Herbert	2c98ba1c0c	Split out consumption and creation into two separate code paths	2019-03-08 14:59:45 +09:00
Dean Herbert	3ccc76e18f	Merge remote-tracking branch 'upstream/master' into cursor-in-playfield	2019-03-08 14:50:46 +09:00
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
Dan Balasescu	101009c92e	Merge branch 'master' into fix-autoplay-tests	2019-03-08 12:14:40 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
Dean Herbert	62716851a1	Revert some unnecessary changes	2019-03-06 17:41:54 +09:00
Dean Herbert	7aa30ca3f6	Change method of cursor creation	2019-03-06 17:41:54 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	2300e59e91	Formatting and simplification	2019-03-06 14:19:00 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00