15716 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
WebFreak001	3cb91979bd	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-12-06 12:14:48 +01:00
smoogipoo	10b526504a	Move ModOverlay to SongSelect	2018-12-06 19:29:18 +09:00
smoogipoo	c02150a19b	Make match header not fade when beatmap changes	2018-12-06 18:31:12 +09:00
smoogipoo	42817b98f9	Hide max participants box	2018-12-06 18:16:17 +09:00
Ivan Pavluk	8cae549541	Remove unused TaikoScoreProcessor constants	2018-12-06 15:58:03 +07:00
Ivan Pavluk	1b6658f4ee	Move HealthIncreaseFor to Judgement	2018-12-06 15:09:42 +07:00
Ivan Pavluk	881a00f4a8	Merge branch 'master' into master	2018-12-06 14:51:13 +07:00
Ivan Pavluk	b5277de3f4	Remove extra newline	2018-12-06 14:08:32 +07:00
Dan Balasescu	6ffd2190bc	Merge pull request #3824 from peppy/fix-no-internet-crashes ... Fix update code crashing when no internet connection is available	2018-12-06 15:28:13 +09:00
Dean Herbert	67a759122a	Fix update code crashing when no internet connection is available	2018-12-06 14:59:17 +09:00
Dan Balasescu	bebbbaa73c	Merge pull request #3822 from peppy/strongly-typed-statistics ... Change statistics to be int for now	2018-12-06 12:38:00 +09:00
smoogipoo	eadbe4c470	Make beatmap selection work	2018-12-06 12:21:30 +09:00
Dean Herbert	dbc33c45a6	Update nuget packages	2018-12-06 00:14:21 +09:00
smoogipoo	5f0bde581c	Fix OsuBindableBeatmap not being able to be auto-constructed	2018-12-05 20:42:16 +09:00
smoogipoo	1a3c06f2d9	Fix OsuTestCase beatmap not having a correct default beatmap	2018-12-05 20:33:27 +09:00
Dean Herbert	68745b221e	Update projects to target .NET core 2.2	2018-12-05 19:46:07 +09:00
Dean Herbert	94045413ce	Change statistics to be int for now	2018-12-05 19:44:01 +09:00
Ivan Pavluk	6d7e71c003	Fix switch stetement order 2	2018-12-05 16:28:36 +07:00
smoogipoo	e7d7e00516	Better disabling of various controls	2018-12-05 17:01:14 +09:00
Dan Balasescu	466505322e	Merge pull request #3819 from peppy/fix-double-working-beatmap-load ... Fix GetWorkingBeatmap potentially loading same beatmap twice	2018-12-05 16:05:46 +09:00
Dean Herbert	b5ba74a628	Add more specific checks	2018-12-05 02:12:15 +09:00
Dean Herbert	c7c5837ec1	Fix GetWorkingBeatmap potentially loading same beatmap twice ... This could be seen when using the previous/next buttons in the MusicController while at song select.	2018-12-05 01:45:32 +09:00
Ivan Pavluk	6c38db04ee	Fix switch statement order in taiko judgements	2018-12-04 21:48:22 +07:00
Ivan Pavluk	f2b806d303	Remove swell miss HP from TaikoScoreProcessor	2018-12-04 21:36:43 +07:00
Ivan Pavluk	b43966a3e2	Merge branch 'master' of https://github.com/pavlukivan/osu	2018-12-04 21:29:43 +07:00
Ivan Pavluk	1975e11fcc	Yet Another Whitespace Fix	2018-12-04 21:28:36 +07:00
Ivan Pavluk	ab41bbb14b	Merge branch 'master' into master	2018-12-04 21:25:07 +07:00
Ivan Pavluk	7d692939fc	Fixed being able to miss taiko objects by hitting them too early ... Revamped taiko HP system	2018-12-04 21:20:44 +07:00
Dean Herbert	21305ffd71	Merge pull request #3817 from smoogipoo/fix-hudoverlay-presence ... Make hud overlay's content always present to fix input issues	2018-12-04 23:16:48 +09:00
Dean Herbert	4f5028bbc1	Merge branch 'master' into fix-hudoverlay-presence	2018-12-04 22:14:54 +09:00
Dan Balasescu	b2d1c66746	Merge pull request #3816 from peppy/fix-home-button-cancel ... Fix home button being cancelled by mod select	2018-12-04 19:41:03 +09:00
smoogipoo	ca91dfa091	Make hudoverlay always present	2018-12-04 19:20:32 +09:00
smoogipoo	ec83790734	Add timeshift game type	2018-12-04 18:58:45 +09:00
smoogipoo	c469d12d63	Set room host when the room is refreshed	2018-12-04 18:18:17 +09:00
smoogipoo	a7ac544e12	Add interface for the multiplayer screen short title	2018-12-04 17:43:44 +09:00
smoogipoo	b251129c59	Block going into multiplayer while logged out	2018-12-04 17:43:27 +09:00
smoogipoo	f2a57ce270	Fix room host not being set	2018-12-04 17:23:58 +09:00
smoogipoo	6e5716c3f3	Adjust transition	2018-12-04 15:32:12 +09:00
smoogipoo	a02e025f06	Fix selections not working anymore	2018-12-04 15:26:06 +09:00
smoogipoo	d8739d9dee	Fix creating a new room re-using the existing model	2018-12-04 15:25:48 +09:00
Dean Herbert	1913dc7365	Merge branch 'master' into fix-home-button-cancel	2018-12-04 12:53:11 +09:00
Dean Herbert	2d68a6c181	Merge pull request #3815 from smoogipoo/fix-incorrect-samples ... Add 1ms offset to controlpoint lookup times	2018-12-04 12:52:55 +09:00
smoogipoo	e22cefc27d	Immediately select newly-created rooms	2018-12-04 12:49:22 +09:00
Dean Herbert	415349e6ef	Add missing return	2018-12-04 12:14:26 +09:00
smoogipoo	9fdd48ded2	Add 1ms offset to controlpoint lookup times	2018-12-04 12:08:46 +09:00
Dean Herbert	a33865efce	Fix home button being cancelled by mod select	2018-12-04 12:06:05 +09:00
Dean Herbert	b0adab5f96	Merge pull request #3811 from peppy/fix-async-profile-logic ... Fix loading scores on profile pages potentially causing long blocking operations	2018-12-03 22:12:39 +09:00
Dan Balasescu	78d1a1c499	Merge branch 'master' into fix-async-profile-logic	2018-12-03 20:55:23 +09:00
Dean Herbert	2bc3c4cc8b	Merge pull request #3810 from peppy/fix-chat-crash ... Fix hard crash due to out-of-order chat sequencing	2018-12-03 19:27:26 +09:00
Dan Balasescu	f278dff49c	Merge branch 'master' into fix-chat-crash	2018-12-03 19:17:05 +09:00