4665 Commits

Author	SHA1	Message	Date
Dean Herbert	6fce646369	Merge branch 'master' into placement-blueprint-movement	2019-10-04 19:05:56 +08:00
Dean Herbert	9eab56e2fc	Merge branch 'master' into editor-beatmap-changed-event	2019-10-04 17:58:58 +08:00
Dean Herbert	49fdb4b731	Fix Alt-F4 being blocked during gameplay (#6369) ... Fix Alt-F4 being blocked during gameplay Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-10-04 13:33:00 +08:00
Dean Herbert	47c1f36f9d	Add ValidForResume check	2019-10-04 11:41:53 +08:00
Dean Herbert	71985c7ef1	Update fail logic to match	2019-10-04 11:23:42 +08:00
smoogipoo	a5e1cb8feb	Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge	2019-10-04 11:21:33 +09:00
Joseph Madamba	d87f6d270b	Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays	2019-10-03 08:43:31 -07:00
smoogipoo	636913a4a6	Refactor PlayerLoader changes	2019-10-03 19:22:41 +09:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
smoogipoo	3fb0b0b668	Rename to StartTimeChanged and add xmldocs	2019-10-03 14:37:16 +09:00
smoogipoo	897b3233af	Add start time tracking to EditorBeatmap	2019-10-03 14:23:48 +09:00
Joehu	8017788521	Revert "Fix alt-f4 being blocked in interface" ... This reverts commit 752dd26a4f.	2019-10-02 16:08:24 -07:00
Joehu	148089f160	Revert "Remove unnecessary exitConfirmed condition check" ... This reverts commit 38fe519c91.	2019-10-02 16:08:19 -07:00
Joehu	38fe519c91	Remove unnecessary exitConfirmed condition check	2019-10-02 12:28:48 -07:00
Joehu	752dd26a4f	Fix alt-f4 being blocked in interface	2019-10-02 11:17:43 -07:00
Joehu	a69b9f1148	Fix alt-f4 being blocked during gameplay	2019-10-02 11:16:31 -07:00
Craftplacer	4d4e846296	Merge branch 'master' into muted-notification	2019-10-02 17:31:34 +02:00
Craftplacer	6929847b08	Remove redundant override	2019-10-02 17:22:34 +02:00
Dan Balasescu	2519fd26a9	Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens ... Simplify exit logic of screens with textboxes using back button receptor	2019-10-02 18:38:06 +09:00
HDragonHR	faf8fe132e	Change bindable int to float	2019-10-02 12:26:46 +08:00
Craftplacer	5f399add82	Resolve @iiSaLMaN 's suggested changes	2019-10-01 18:15:40 +02:00
Craftplacer	2ac5e0bfa0	Make use of SessionStatics	2019-10-01 17:39:01 +02:00
Joehu	5f700f2ae9	Simplify exit logic of screens with textboxes using back button receptor	2019-10-01 08:26:34 -07:00
Craftplacer	4e394e0ed5	Merge branch 'master' into muted-notification	2019-10-01 17:26:11 +02:00
Dean Herbert	ce62f3c75b	Simplify and future-proof random retrieval method ... Will support future added intros without further code changes. Also uses RNG instead of `new Random`.	2019-09-29 14:35:35 +08:00
V1ntagezTV	9f1c378733	moved into the switch case	2019-09-29 00:35:47 +05:00
V1ntagezTV	2681e2064a	remove comment	2019-09-29 00:34:09 +05:00
V1ntagezTV	1babd139bc	remove needless blank	2019-09-29 00:22:23 +05:00
V1ntagezTV	52b044b7f6	Add random intro!	2019-09-29 00:10:17 +05:00
Dean Herbert	02c1f490f1	Merge branch 'master' into muted-notification	2019-09-28 20:33:32 +08:00
Dean Herbert	a45f8c968b	Rename and add simple xmldoc	2019-09-28 20:21:51 +08:00
Dean Herbert	d01c30fd52	Merge branch 'master' into introduce-session-statics	2019-09-28 20:16:52 +08:00
iiSaLMaN	fb9f21237e	Reset track adjustments on resuming from another screen	2019-09-28 04:18:16 +03:00
Dean Herbert	f4f5a7e9c8	Fix test regressions	2019-09-27 13:20:17 +08:00
Dean Herbert	b50ef8ffa4	Allow null NotificationManager	2019-09-27 13:15:33 +08:00
iiSaLMaN	2670a23e6f	Assign to field and move to load complete	2019-09-27 08:15:24 +03:00
iiSaLMaN	7904f77cd5	Bind event to activation delay change	2019-09-27 02:59:42 +03:00
iiSaLMaN	911094e790	Replace menu button text with "press for menu" on 0ms activation delay	2019-09-26 01:42:56 +03:00
Salman Ahmed	3aa9a172d8	Merge branch 'master' into introduce-session-statics	2019-09-25 16:14:39 +03:00
iiSaLMaN	8844d567cb	Use bindable setting instead	2019-09-25 15:56:47 +03:00
Dean Herbert	f11156c2dc	Fix tests not working correctly	2019-09-25 19:30:25 +09:00
Dean Herbert	ff9033f9ac	Merge remote-tracking branch 'upstream/master' into muted-notification	2019-09-25 16:47:56 +09:00
Joehu	102dbd85bd	Fix CI errors	2019-09-24 16:48:22 -07:00
Joehu	9861b21440	Remove unnecessary padding/margin	2019-09-24 16:28:40 -07:00
Joehu	7fab1a4337	Truncate long metadata on beatmap info wedge	2019-09-24 16:06:33 -07:00
iiSaLMaN	cde7f49db1	Use direct get and set instead	2019-09-25 01:26:02 +03:00
Dean Herbert	4a59e3351e	Update beatmap carousel tests code style ... Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.	2019-09-25 02:42:12 +09:00
Dean Herbert	f493f1c71d	Move new components to v2 namespace	2019-09-24 19:00:26 +09:00
smoogipoo	6b702eb6de	Update with generic labelledcomponent	2019-09-24 18:25:17 +09:00
smoogipoo	5212c50654	Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements	2019-09-24 18:23:01 +09:00