11306 Commits

Author	SHA1	Message	Date
Dean Herbert	d6f8dbfd5c	Merge branch 'master' into wedge-fix	2019-03-29 12:23:42 +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	26a73b4a65	Merge branch 'master' into correct-preview-loop	2019-03-29 12:00:58 +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	759c5b3db9	Restore previous resume behaviour for the time being	2019-03-29 10:52:26 +09:00
Dean Herbert	3b1f83da1d	Merge remote-tracking branch 'upstream/master' into correct-preview-loop	2019-03-29 10:31:15 +09:00
Dan Balasescu	4c038e7f67	Merge branch 'master' into testability-improvements	2019-03-29 10:23:12 +09:00
Dan Balasescu	900c00ba59	Merge branch 'master' into drawable-clear-safety	2019-03-29 10:14:41 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	2f5668f4e7	Fix remaining framework changes	2019-03-29 00:29:14 +09:00
Dean Herbert	176b4ecc38	Merge branch 'master' into sprite-icon-compatibility	2019-03-28 23:47:44 +09:00
Dean Herbert	bca8714905	Update framework	2019-03-28 23:25:31 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
Joehu	9a3528ea9d	Fix field modifier	2019-03-27 22:31:40 -07:00
Joehu	2254c572c4	Remove unnecessary newline	2019-03-27 22:21:28 -07:00
Joehu	53f3dacdfb	Fix login overlay behavior	2019-03-27 22:01:06 -07:00
smoogipoo	0066459968	Don't convert 100s/50s for catch	2019-03-28 12:55:56 +09:00
Dean Herbert	467ee12edf	Merge branch 'framed-replay-handler-fixes' into better-player-flags	2019-03-28 12:45:25 +09:00
Dean Herbert	e9eb33a1b1	Merge branch 'fix-slider-ball-positional' into better-player-flags	2019-03-28 12:45:22 +09:00
Dean Herbert	148e26a6d4	Fix FramedReplayInputHandler starting at frame 0 when it shouldn't	2019-03-28 12:42:57 +09:00
Joehu	bdb39a79a9	Fix offset of music controller when toolbar is hidden	2019-03-27 20:27:26 -07:00
Dean Herbert	253b18b92f	Merge remote-tracking branch 'upstream/master' into better-player-flags	2019-03-28 11:18:54 +09:00
Dean Herbert	23b5271ce4	Merge branch 'master' into clean-overlays-code-1	2019-03-28 11:17:29 +09:00
Dean Herbert	d756a5d987	Merge pull request #4532 from peppy/update-framework ... Update framework	2019-03-28 10:50:20 +09:00
Joseph Madamba	cdf79ffe39	Merge branch 'master' into clean-overlays-code-1	2019-03-27 10:32:13 -07:00
Dean Herbert	dfb7d78903	Fix remaining game host regressions	2019-03-28 01:29:06 +09:00
Dean Herbert	61b8fb0366	Allow ScreenTestCase to support content	2019-03-27 22:28:32 +09:00
Dean Herbert	5c4f2cefea	Fix Loader and TestCaseLoaderAnimation	2019-03-27 22:28:25 +09:00
Dean Herbert	1a0d1b238e	Fix storage regression	2019-03-27 20:58:07 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Unknown	fea6adbf54	fix wedge bleeding into other elements (and being misaligned)	2019-03-27 10:12:09 +01:00
smoogipoo	012dcc25c9	Rename APIScoreInfo -> APILegacyScoreInfo	2019-03-27 17:08:40 +09:00
smoogipoo	d2af2cf21d	Set legacy api score statistics directly	2019-03-27 17:08:01 +09:00
smoogipoo	eceecde0f8	Make APIScoreInfo derive LegacyScoreInfo	2019-03-27 17:07:45 +09:00
smoogipoo	977122d05f	Fix ScoreInfo not getting set	2019-03-27 16:59:29 +09:00
smoogipoo	8fcb75809d	Add LegacyScoreInfo for statistics preservation/conversion	2019-03-27 16:55:46 +09:00
smoogipoo	a5d5f469eb	Populate more hit results for catch	2019-03-27 14:52:56 +09:00
smoogipoo	7239ebf5de	Add margin for mods	2019-03-27 13:57:26 +09:00
Dean Herbert	3fcbc2eab3	Fix key counter getting overridden	2019-03-27 10:31:21 +09:00
smoogipoo	adab31fd58	Cleanup + fix up score table layout	2019-03-26 17:38:56 +09:00
Dean Herbert	15821c7511	Fix cursor adding	2019-03-26 17:04:14 +09:00
Dean Herbert	a88f23e555	Convert remaining two flags to ctor parameters	2019-03-26 16:53:44 +09:00
Dean Herbert	92184adef5	Add stable sorting of storyboard elements	2019-03-26 16:37:52 +09:00
Dean Herbert	83076e32c7	Fix TestWorkingBeatmap not running for times below zero	2019-03-26 16:35:34 +09:00