8855 Commits

Author	SHA1	Message	Date
Dean Herbert	7add4a8cc7	Update framework	2018-08-20 18:26:34 +09:00
Dean Herbert	18aa30fcb0	Unbind song select's ruleset to avoid test failures	2018-08-20 14:27:32 +09:00
Dean Herbert	e982901205	Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework	2018-08-20 13:38:07 +09:00
Dean Herbert	6b0ed4a68d	Update framework	2018-08-20 13:37:59 +09:00
smoogipoo	9a1e92800b	Adjust with framework-side screenchanges	2018-08-17 14:30:44 +09:00
Dan Balasescu	e7e14cc76c	Merge branch 'master' into log-display-fix	2018-08-17 14:15:14 +09:00
Dean Herbert	5ddef1afed	Merge pull request #3245 from smoogipoo/import-output ... Output the currently importing model	2018-08-17 13:57:57 +09:00
smoogipoo	83bda313d1	Output the currently importing model	2018-08-17 13:50:27 +09:00
smoogipoo	16d30f6756	Add explanatory comments	2018-08-17 13:31:12 +09:00
Dean Herbert	7a8aabc402	Fix notifications suggesting automatic reporting in non-deployed builds	2018-08-17 13:18:48 +09:00
Dean Herbert	49f455e55d	Merge branch 'master' into spinner-combo-fix	2018-08-17 12:59:36 +09:00
Dean Herbert	0ae487b9c9	Add back missing statement	2018-08-17 12:27:36 +09:00
Dean Herbert	4aedd252fb	Merge branch 'master' into spinner-combo-fix	2018-08-17 12:07:37 +09:00
Dean Herbert	83dc01d07c	Fix multiple sentry reports arriving for similar exceptions	2018-08-17 12:05:21 +09:00
smoogipoo	eb6f1ae72c	Fix spinners providing one extra combo	2018-08-17 09:16:28 +09:00
Dean Herbert	9f5a6457f2	Don't forward errors to sentry for local builds	2018-08-17 09:08:58 +09:00
Dean Herbert	12b81df2f3	Fix unhandled exception on startup when arguments are present	2018-08-16 22:01:04 +09:00
Dean Herbert	6297ad95aa	Remove test exception	2018-08-16 16:49:06 +09:00
Dean Herbert	9f55afe569	Let user know automatic reporting happened	2018-08-16 16:44:12 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
ekrctb	cf4cb934cf	Merge branch 'master' into fix-combo-colours	2018-08-16 10:45:54 +09:00
smoogipoo	add78508e0	Update framework	2018-08-15 15:54:26 +09:00
smoogipoo	767c284793	Fix import not working	2018-08-15 15:49:55 +09:00
smoogipoo	4dfb63023f	Update with recent changes	2018-08-15 15:49:48 +09:00
smoogipoo	d0c9e2257b	Merge remote-tracking branch 'origin/master' into framework-storage-update	2018-08-15 14:54:09 +09:00
smoogipoo	539dd3134f	Fix beatmap processor not setting combo index on first object	2018-08-15 11:48:50 +09:00
smoogipoo	4c3e551295	Fix first object not receiving new combo ... Note: If a normal catch fruit is the first object, it does not receive a new combo...	2018-08-15 11:48:28 +09:00
smoogipoo	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	da3e2cfee2	Catch/osu! spinners should have combo	2018-08-15 11:13:23 +09:00
smoogipoo	4f0305ffeb	Taiko convert hitobjects should not have combo	2018-08-15 10:58:59 +09:00
smoogipoo	83f75ac896	Mania convert hitobjects should not have combo	2018-08-15 10:57:11 +09:00
smoogipoo	8faf12579a	Fix field not being set correctly	2018-08-15 10:53:25 +09:00
smoogipoo	d2709613bc	Add combo offset to ConvertHitObjectParser	2018-08-15 10:49:45 +09:00
smoogipoo	ce77473910	Simplify usage of ConvertHitObjectParser	2018-08-15 10:24:56 +09:00
Dean Herbert	9cdaefb64b	Merge branch 'master' into extend-modoverlay	2018-08-15 09:23:44 +09:00
smoogipoo	aa3f6337a2	Add comment	2018-08-15 09:14:07 +09:00
Dean Herbert	607769c9ce	Merge branch 'master' into fix-rewinding	2018-08-15 08:45:34 +09:00
smoogipoo	e04b2f4fa9	Fix hitobject results not rewinding	2018-08-14 18:31:32 +09:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	f69bc23ab8	Overflow mod select to account for parallax	2018-08-14 17:26:25 +09:00
Dean Herbert	5112f9b69f	Merge branch 'master' into fix-ruleset-change	2018-08-14 14:48:09 +09:00
smoogipoo	970aa811bd	Fix mods not being reset prior to ruleset changing	2018-08-14 13:19:50 +09:00
Dean Herbert	270dc2d1be	Merge branch 'master' into judgement-rework	2018-08-14 13:16:16 +09:00
smoogipoo	b8824a41b5	Fix certain control points not being replaced	2018-08-14 11:44:53 +09:00
smoogipoo	2a5b9f79ff	Indent	2018-08-08 15:49:27 +09:00
smoogipoo	ee0cefdd5b	Merge remote-tracking branch 'origin/master' into direct-list-view	2018-08-08 15:48:34 +09:00
smoogipoo	bfbe00e6ec	Remove multiple caching	2018-08-08 15:38:09 +09:00
Dean Herbert	4453b5faca	Cache mods at PlaySongSelect	2018-08-08 12:43:08 +09:00
Dean Herbert	70ce9da321	Merge branch 'master' into judgement-rework	2018-08-07 18:09:06 +09:00
Dean Herbert	4cb7063801	Add automated testing of mod preservation/removal	2018-08-07 16:45:18 +09:00