14745 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	2ed7785cfc	Merge remote-tracking branch 'upstream/master' into update-framework	2018-09-26 19:50:48 +09:00
Dean Herbert	80179d9095	Merge pull request #3479 from qwewqa/judgement-size-fix ... Fix judgements not scaling with circle size	2018-09-26 19:50:41 +09:00
Dean Herbert	1b77d9fd05	Merge branch 'update-chat-api' into update-framework	2018-09-26 19:50:23 +09:00
Dean Herbert	a77a55d71d	Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework	2018-09-26 19:49:41 +09:00
Dean Herbert	b8f19f8640	Merge branch 'master' into judgement-size-fix	2018-09-26 19:42:09 +09:00
Dean Herbert	5197bf77e4	Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions ... Fix files with upper-case extensions failing to import correctly	2018-09-26 19:40:00 +09:00
Dean Herbert	1fd2782dd4	Fix loading spinner not disappearing on empty channels	2018-09-26 19:15:02 +09:00
Dean Herbert	2436ee589d	Remove incorrect API response	2018-09-26 19:13:38 +09:00
smoogipoo	e259911875	Use invariant tolower	2018-09-26 18:44:03 +09:00
Dan Balasescu	e71e871d1f	Remove unnecessary comment	2018-09-26 18:41:55 +09:00
Dan Balasescu	3a5e380e46	Merge branch 'master' into judgement-size-fix	2018-09-26 18:36:12 +09:00
Dan Balasescu	901a7445fa	Merge pull request #3488 from plankp/dnd-osr-files ... Handle external files with File instead	2018-09-26 18:21:27 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	7cd547a760	Update chat to work with new API version	2018-09-25 20:53:24 +09:00
smoogipoo	5f61faa2d9	Fix multiple hits in the same frame pressing multiple hitobjects	2018-09-25 18:37:25 +09:00
smoogipoo	cb500e80e4	Make BeatmapInfoWedge present until info is not null	2018-09-25 14:45:26 +09:00
Paul Teng	319ed1bf0f	Reorder if statement	2018-09-24 21:35:13 -04:00
Kyle Chang	2069467434	Use HitObject scale to determine judgement size	2018-09-24 21:18:55 -04:00
Paul Teng	dd36b6a381	Remove unused field storage	2018-09-24 21:08:58 -04:00
Paul Teng	b95cc798b2	Remove unused fallback	2018-09-24 20:56:18 -04:00
Paul Teng	62df0ec7d4	Handle external files with File instead	2018-09-24 07:16:19 -04:00
Kyle Chang	7a43677849	Make judgements scale with cs	2018-09-22 22:54:38 -04:00
Dean Herbert	6efecc4b35	Fix files with upper-case extensions failing to import correctly	2018-09-23 05:23:49 +09:00
ekrctb	5e51a50658	Merge pull request #3469 from peppy/fix-import-buttons ... Fix import buttons having incorrect mappings when setting disabled states	2018-09-21 21:18:26 +09:00
Dean Herbert	dafbabec31	Fix import buttons having incorrect mappings when setting disabled states	2018-09-21 21:08:21 +09:00
Paul Teng	ed0ea3ad41	Merge branch 'master' into patch-1	2018-09-21 06:31:15 -04:00
Dean Herbert	1eb0277ba3	Merge pull request #3461 from peppy/background-brightness ... Fix global background brightness being unexpectedly dim	2018-09-21 17:26:39 +09:00
smoogipoo	4380ef15bf	Fix potential exception during async load callback	2018-09-21 16:31:09 +09:00
Dan Balasescu	c1604145df	Merge branch 'master' into background-brightness	2018-09-21 16:20:32 +09:00
smoogipoo	cdeb4913c4	Adjust catcher size to match stable	2018-09-21 15:53:15 +09:00
smoogipoo	c3fa7f167f	Move aspect adjustments out of CatchPlayfield	2018-09-21 15:53:06 +09:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	26094ea325	Simplify + rename playfield layers in Osu/Catch	2018-09-21 15:01:58 +09:00
smoogipoo	a166d03ede	Remove duplicate implementation of the Osu playfield layer	2018-09-21 14:43:38 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
smoogipoo	826dc6ceb7	Make Playfield not a ScalableContainer	2018-09-21 14:02:32 +09:00
Paul Teng	f01dfc2860	Merge branch 'master' into patch-1	2018-09-20 23:45:44 -04:00
Paul Teng	eaf7697b85	Add boolean return value	2018-09-20 23:21:27 -04:00
Dean Herbert	7a58343201	Merge pull request #3436 from plankp/patch-2 ... Handle lack of skins directory when importing from osu!stable	2018-09-21 12:16:43 +09:00
Dean Herbert	293a5dd099	Use string interpolation	2018-09-21 11:50:36 +09:00
Paul Teng	654345f380	Remove duplicate condition test	2018-09-20 22:32:24 -04:00
Paul Teng	1644719893	Update SongSelect.cs	2018-09-20 22:29:37 -04:00
Paul Teng	49fbe8443a	Test if there are beatmaps when click on delete btn	2018-09-20 22:00:20 -04:00
Paul Teng	52877eca83	Update ArchiveModelManager.cs	2018-09-20 20:01:04 -04:00
Dean Herbert	83bf38f4bc	Make menu background blurrable ... Not actually blurring yet, needs further testing.	2018-09-21 03:13:34 +09:00
Dean Herbert	78d78b5510	Fade menu background a bit when menu is active	2018-09-21 03:13:15 +09:00
Dean Herbert	07a1c39fe5	Use random default background on starting the game	2018-09-21 03:12:20 +09:00
Dean Herbert	fa33e0bd6b	Fix background brightness being adjusted globally	2018-09-21 02:51:14 +09:00
Paul Teng	199d76217e	Merge branch 'master' into patch-2	2018-09-20 06:47:42 -04:00
Dean Herbert	7efaaceba5	Merge pull request #3456 from peppy/update-framework ... Update framework	2018-09-20 19:41:39 +09:00