29203 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shivam	181cd67948	Merge remote-tracking branch 'upstream/master' into custom-ipc-location	2020-05-17 12:44:12 +02:00
Dan Balasescu	9003c069bb	Merge pull request #9041 from MiraiSubject/tourney-subscreen-back-button ... Add a back button to sub screens in the Tournament Client	2020-05-17 19:28:03 +09:00
Dean Herbert	11537dd688	Merge branch 'master' into tourney-subscreen-back-button	2020-05-17 17:38:36 +09:00
Dean Herbert	13d4997c91	Remove custom back action logic (use receptor as intended)	2020-05-17 17:35:10 +09:00
Dean Herbert	864c1a73ae	Only add back button if required	2020-05-17 17:27:52 +09:00
Dean Herbert	2c0ac8cc36	Move padding to fill, not scroll container	2020-05-17 17:25:26 +09:00
Dan Balasescu	b4ed03fdd4	Merge pull request #9031 from peppy/avoid-host-disable ... Avoid disabling a host-level bindable from osu! code	2020-05-17 16:40:06 +09:00
Dan Balasescu	533010f168	Merge branch 'master' into avoid-host-disable	2020-05-17 15:59:39 +09:00
Shivam	d1f39b6b00	Merge branch 'master' into tourney-subscreen-back-button	2020-05-16 12:51:30 +02:00
Shivam	358345cee7	Change logic for parentscreen/subscreen relation	2020-05-16 12:50:56 +02:00
Dean Herbert	9ca4fdf95b	Merge pull request #9042 from smoogipoo/remove-requiredtypes ... Remove all RequiredTypes usages	2020-05-16 18:55:12 +09:00
Dean Herbert	0279bcf3c8	Fix missed issues	2020-05-16 18:28:22 +09:00
Dean Herbert	be3a0a3c1d	Merge branch 'master' into remove-requiredtypes	2020-05-16 18:28:14 +09:00
smoogipoo	648999a2de	Remove all RequiredTypes usages	2020-05-16 18:17:12 +09:00
Shivam	b1243d6a87	Add padding to so the back button is not in the way	2020-05-16 04:05:01 +02:00
Dean Herbert	9d3df14179	Remove unused variable	2020-05-16 11:03:27 +09:00
Shivam	bf6ce390ff	Add sub screen implementation to SeedingEditorScreen	2020-05-16 03:07:51 +02:00
Shivam	c931bae70e	Add back button to TournamentScreen and the inputhandler for it	2020-05-16 03:07:27 +02:00
Shivam	3fc888ef95	User interface setup for custom IPC location ... Right now makes use of another ActionableInfo field. Probably a better idea to add an extra button to the Current IPC Storage actionable field.	2020-05-16 03:03:10 +02:00
Shivam	9944a514da	Dependency cache the ipc location file	2020-05-16 03:00:37 +02:00
Shivam	c40b3b9053	Refactored stable path finding and added json config detection. ... This also migrates the values found in the other methods to the configuration file.	2020-05-16 02:59:48 +02:00
Shivam	08bb5cbcbf	Introduce model to store path of stable osu!	2020-05-16 02:57:58 +02:00
Dean Herbert	c47f02c3b7	Update second instance of disabling bindable	2020-05-16 08:24:02 +09:00
Dan Balasescu	43c42cdf31	Merge pull request #9036 from peppy/fix-audio-offsets-rate-adjust ... Fix applied platform/user offsets being incorrect when rate adjust mods are active	2020-05-15 19:33:28 +09:00
Dean Herbert	9b6525bb03	Fix applied platform/user offsets being incorrect when rate adjust mods are active	2020-05-15 18:44:47 +09:00
Dan Balasescu	e33c177018	Merge pull request #9020 from peppy/migration-ui ... Add ability to change data folder path	2020-05-15 18:08:52 +09:00
Dean Herbert	8bbb0c98e0	Merge branch 'master' into migration-ui	2020-05-15 17:39:18 +09:00
Dean Herbert	aec2520ef4	Avoid disabling a host-level bindable from osu! code	2020-05-15 17:31:06 +09:00
Dan Balasescu	edda98b417	Merge pull request #9027 from peppy/fix-nested-folder-migration-endless-copy ... Add more safeties to storage migration	2020-05-15 14:36:55 +09:00
Dan Balasescu	e3025ede6b	Merge branch 'master' into fix-nested-folder-migration-endless-copy	2020-05-15 13:43:47 +09:00
Dean Herbert	6ca102bc3f	Attempt delete operations more than once	2020-05-15 13:19:03 +09:00
Dean Herbert	9ed0e8891b	Merge branch 'fix-nested-folder-migration-endless-copy' into migration-ui	2020-05-15 13:04:16 +09:00
Dean Herbert	aea192080a	Fix incorrect storage name	2020-05-15 13:02:46 +09:00
Dan Balasescu	8872eace3d	Merge pull request #9029 from peppy/fix-mute-button-ui-scaling ... Fix mute button falling off the screen when UI scaling is used	2020-05-15 13:00:44 +09:00
Dean Herbert	94cf99bf97	Fix mute button falling off the screen when UI scaling is used	2020-05-15 12:22:59 +09:00
Dean Herbert	fd2f2dbd42	Merge pull request #9024 from MiraiSubject/small-tourney-updates ... Use unique video in map pool scene of tournament client	2020-05-15 11:36:44 +09:00
Dean Herbert	7641507c90	Ensure test directories are deleted before subsequent run	2020-05-15 10:45:57 +09:00
Dean Herbert	0690d81bbb	Add protection against migrating to a nested folder	2020-05-15 10:40:26 +09:00
Dean Herbert	19f117ae53	Update test logic for new exception type	2020-05-15 10:28:03 +09:00
Dean Herbert	25bbb02999	Throw better exceptions from OsuStorage	2020-05-15 10:28:03 +09:00
Shivam	1768beb690	Rename class SeeingEditorScreen to SeedingEditorScreen	2020-05-14 21:52:10 +02:00
Shivam	6ec55eb400	Give mappool scene its own video	2020-05-14 21:51:39 +02:00
Dan Balasescu	4b0ca87a0a	Merge pull request #9007 from peppy/fix-failure-logic ... Fix mod failure checks executing actual game logic	2020-05-14 23:06:34 +09:00
Dean Herbert	364aa5aa12	Add protection against migrating to a nested folder	2020-05-14 22:45:03 +09:00
Dean Herbert	827d75b152	Revert "Add protection against migrating to a nested folder" ... This reverts commit ef8375b442.	2020-05-14 22:44:27 +09:00
Dean Herbert	ef8375b442	Add protection against migrating to a nested folder	2020-05-14 22:42:42 +09:00
Dean Herbert	75b0ada087	Merge branch 'master' into migration-ui	2020-05-14 21:40:38 +09:00
Dean Herbert	155e918ca3	Remove unused parameter	2020-05-14 21:40:28 +09:00
Dean Herbert	42f446faa9	Fix remaining test failure	2020-05-14 21:10:04 +09:00
Dean Herbert	11b780c97f	Merge branch 'migration-ui' of https://github.com/peppy/osu into migration-ui	2020-05-14 20:19:14 +09:00