12120 Commits

Author	SHA1	Message	Date
Dean Herbert	440f4703cb	Fix toolbar offset not being applied	2019-01-08 12:57:31 +09:00
Dean Herbert	dd960e6a89	Remove unused variable	2019-01-08 12:50:42 +09:00
Dean Herbert	647a30279f	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 11:46:08 +09:00
Dean Herbert	8edec10e5f	Merge branch 'master' into fix-replay-import-statistics	2019-01-08 11:26:12 +09:00
Dean Herbert	276014f591	Merge branch 'master' into update-framework	2019-01-08 11:26:10 +09:00
Dean Herbert	2fc3e77be7	Merge branch 'master' into letterboxing	2019-01-08 11:26:09 +09:00
Dean Herbert	11861f4cc9	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 11:26:08 +09:00
Dean Herbert	881b10a18f	Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini	2019-01-08 11:01:04 +09:00
Dean Herbert	7eed3ffe75	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 10:02:06 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
Dean Herbert	8eedef3e86	Move cancellation to safer place	2019-01-07 19:31:05 +09:00
Dean Herbert	d72412d24d	Fix leaderboard not correctly handling cancellation	2019-01-07 19:28:46 +09:00
Dean Herbert	70d644406f	Merge remote-tracking branch 'origin/update-framework' into letterboxing ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs	2019-01-07 18:53:53 +09:00
Dean Herbert	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Dean Herbert	49ba4e5a14	Merge branch 'master' into update-framework	2019-01-07 18:51:54 +09:00
Dean Herbert	ca98caf84b	Merge pull request #4001 from UselessToucan/linq_temp ... Use Find instead of FirstOrDefault	2019-01-07 18:50:59 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Dean Herbert	13b077c83b	Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini	2019-01-07 18:11:17 +09:00
Dean Herbert	73c2fcac08	Remove broken SettingsLabel class	2019-01-07 17:03:59 +09:00
Dean Herbert	e73845172c	Merge branch 'master' into fix-replay-import-statistics	2019-01-07 13:44:01 +09:00
Matthias Coenraerds	562c9e56fb	Fix naming	2019-01-06 13:38:43 +01:00
Matthias Coenraerds	472325b885	Verify leaderboard scope to be local	2019-01-06 13:37:30 +01:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
jorolf	8bab87c072	update resources and remove unused usings	2019-01-04 23:09:21 +01:00
jorolf	52994c7ee8	Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update	2019-01-04 22:52:29 +01:00
jorolf	a33a1458a5	update design and make play styles an enum	2019-01-04 22:52:00 +01:00
Matthias Coenraerds	a93c26ccfd	Filename does not match contained type	2019-01-04 20:40:07 +01:00
Matthias Coenraerds	3879348ee4	Implement clear scores on beatmap	2019-01-04 20:23:06 +01:00
Dean Herbert	01f6199c49	Merge branch 'master' into profile-header-update	2019-01-04 16:38:42 +09:00
Dean Herbert	4a7c6fb19d	Fix PP not display on profile overlay	2019-01-04 16:33:35 +09:00
Dean Herbert	4c2c7bd937	Fix global idle state being entered when overlays are visible	2019-01-04 16:26:10 +09:00
Dean Herbert	7d1163a7d2	Remove unnecessary null check	2019-01-04 15:49:23 +09:00
Dean Herbert	f2ccf70d1b	Backdate license header for now	2019-01-04 15:37:27 +09:00
Dean Herbert	c528a3896d	Formatting and naming	2019-01-04 15:34:32 +09:00
Dean Herbert	4c3310ca80	Remove unnecessary tracked settings (for now)	2019-01-04 15:28:48 +09:00
Dean Herbert	3a10dd47d5	Add preview for gameplay region	2019-01-04 15:28:35 +09:00
Dean Herbert	9c7830d83b	Size -> scale	2019-01-04 14:58:44 +09:00
Dean Herbert	35a6257642	Delay updates when changes would affect mouse position	2019-01-04 14:55:59 +09:00
Dean Herbert	5a807f2143	Add OSD support	2019-01-04 14:18:29 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	b6dc6c4a74	Merge branch 'master' into do_not_use_local_user_for_autoplay_score	2019-01-04 13:11:17 +09:00
Dean Herbert	aec3753863	Fix imported replays having excess statistics	2019-01-03 14:01:20 +09:00
Dean Herbert	8b25e4c9ee	Fix searching for "channel" matching all channels	2019-01-03 12:04:36 +09:00
Dean Herbert	2d405bfc43	Add back options for 3 and 7 day long rooms	2019-01-02 16:33:52 +09:00
FreezyLemon	0047f29ec8	move missing newline to front of "Plays with..."	2018-12-30 22:40:17 +01:00
Roman Kapustin	850a7aa327	Update tab text font on activation/deactivation	2018-12-29 17:43:19 +03:00
Shane Woolcock	32ffcb9865	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-29 20:09:00 +10:30
Shane Woolcock	ff4b41b35f	Add basic visual tests	2018-12-29 18:47:35 +10:30
Dean Herbert	1f2d340914	Merge branch 'master' into fix-room-ordering	2018-12-28 14:07:11 +09:00
Dean Herbert	e6ccf209c7	Merge pull request #3957 from peppy/fix-excessive-cover-loading ... Fix covers being loaded even when off-screen	2018-12-28 14:07:01 +09:00