3651 Commits

Author	SHA1	Message	Date
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
Dan Balasescu	7783c33398	Merge branch 'master' into fix-mp-chat-in-own-room	2019-03-07 15:59:53 +09:00
Jamie Taylor	ee076bbbe3	Fix chat channel ids not being updated on room creation	2019-03-07 15:35:57 +09:00
Jamie Taylor	e13516c2ba	Only attempt to restore CurrentItem state if present	2019-03-07 14:09:28 +09:00
Dean Herbert	b94d080b1c	Merge branch 'master' into LobbyList	2019-03-06 12:34:36 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00
Dean Herbert	8a6fa0915e	Merge branch 'master' into simplify-gameplay-clock	2019-03-05 20:22:46 +09:00
Dean Herbert	76ce3954a0	Rename PauseContainer	2019-03-05 19:30:55 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fafc80818c	Fix typo ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-05 18:50:46 +09:00
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
smoogipoo	c06dac5b1a	Remove null check (beatmap cannot be null)	2019-03-05 17:58:30 +09:00
smoogipoo	2fee7276ae	Combine creation + assignment	2019-03-05 17:58:05 +09:00
Dan Balasescu	bb6c83ab25	Merge branch 'master' into show-mods-on-loader	2019-03-05 17:46:35 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
David Zhao	166a8c8bbb	Add back fallback behavior for match creation	2019-03-05 16:41:59 +09:00
Dean Herbert	93c79023dc	Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock	2019-03-05 16:41:01 +09:00
David Zhao	11e353c152	Use local class instead of having a separate file	2019-03-05 15:55:37 +09:00
Dean Herbert	4e33a98dbc	Move gameplay clock to own class	2019-03-05 13:53:47 +09:00
Dean Herbert	c5cd9972c4	Make restart private	2019-03-05 13:37:51 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +09:00
Dean Herbert	5bb0511f0a	Fix SquareGraph not correctly filling columns when loaded with a non-zero time	2019-03-05 13:37:28 +09:00
David Zhao	aecbc31ffa	Use BeatmapSetCoverType.List for lobby listing	2019-03-05 12:08:14 +09:00
Dean Herbert	08e153208d	Unbinds are automatic	2019-03-03 20:03:22 +09:00
Dean Herbert	6ffa139ea8	Adjust transition length slightly	2019-03-03 20:02:56 +09:00
jorolf	e8d568470d	use a bindable instead	2019-03-02 19:13:38 +01:00
jorolf	176cbc7f2e	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-03-02 19:04:48 +01:00
Dean Herbert	687d5d5ff1	Merge pull request #4387 from smoogipoo/fix-fonts ... Fix a few incorrect fonts	2019-03-02 20:07:26 +09:00
Dean Herbert	5487b011d6	Fix some inspections rider isn't able to deal with automatically	2019-03-02 14:34:56 +09:00
smoogipoo	83a02d32f7	Fix a few incorrect fonts	2019-03-02 13:25:59 +09:00
Nitrous	0be9f81310	Merge branch 'master' into show-mods-on-loader	2019-03-02 06:40:45 +08:00
Dean Herbert	1871e8bb2c	Merge branch 'master' into master	2019-03-01 21:22:34 +09:00
Dean Herbert	c01990d005	Fix callback potentially not getting fired	2019-03-01 20:52:34 +09:00
LeNitrous	cf51c8aa31	attempt to comply with appveyor	2019-03-01 19:10:32 +08:00
LeNitrous	4e081fe1fc	Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader	2019-03-01 18:41:41 +08:00
smoogipoo	bf8360636a	Adjust drawnodes to use the new shared data structure	2019-03-01 17:25:15 +09:00
Dean Herbert	19ce1f2869	Remove second conditional	2019-03-01 13:43:16 +09:00
David Zhao	f6303a2855	Fix songselect blur potentially never being applied	2019-03-01 11:52:51 +09:00
Dean Herbert	49cbaecf4c	Update licence header	2019-03-01 10:52:53 +09:00
Dean Herbert	acc2113027	Make operation run asynchronously	2019-03-01 10:09:03 +09:00
Dean Herbert	798bc1306b	Merge remote-tracking branch 'upstream/master' into m2307-master ... # Conflicts: # osu.Game/Screens/Select/SongSelect.cs	2019-03-01 10:08:35 +09:00
Dean Herbert	80b5f1c523	Fix code formatting issues	2019-03-01 09:49:36 +09:00
Dean Herbert	67928ac1fe	Remove pointless check	2019-03-01 09:49:11 +09:00
Dean Herbert	09e1e3bab6	Merge branch 'master' into UserDimLogic	2019-02-28 20:38:09 +09:00
Dean Herbert	30e820d107	Fix storyboard potentially being loaded many times	2019-02-28 20:36:00 +09:00
Dean Herbert	53eb0e7e4e	More formatting fixes	2019-02-28 20:30:23 +09:00
Dean Herbert	6861163226	Remove pointless method	2019-02-28 20:21:27 +09:00