13829 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	0f649cd231	Merge remote-tracking branch 'origin/master' into fix-beatmap-links	2018-07-10 16:01:56 +09:00
Dan Balasescu	8cc042bd5a	Merge branch 'master' into fix-beatmap-id-conflicts	2018-07-10 15:49:30 +09:00
Dan Balasescu	b3c9af3553	Merge pull request #2976 from peppy/fix-right-mouse-absolute ... Fix right mouse activated absolute scroll not working	2018-07-10 15:49:24 +09:00
Dean Herbert	6dffb1147c	Merge branch 'master' into fix-right-mouse-absolute	2018-07-10 15:34:03 +09:00
Dan Balasescu	ede95b6954	Merge branch 'master' into fix-hitsound-fallback	2018-07-10 15:31:15 +09:00
Dan Balasescu	5ad45b2d42	Merge pull request #2984 from peppy/fix-toolbar-ruleset-selector ... Fix toolbar ruleset selector breaking at main menu	2018-07-10 15:31:03 +09:00
Dean Herbert	14c3cc70b1	Prefer namespace lookups first	2018-07-10 15:23:47 +09:00
Dean Herbert	7f315d79c2	Fix pixel gap in user profile when scrolling	2018-07-10 13:06:03 +09:00
Dean Herbert	ba258b8a05	Fix lack of fallback logic for custom bank samples ... Closes #2966. --- Was causing some beatmaps to not play all of their hitsounds	2018-07-10 02:56:22 +09:00
Dean Herbert	9e59b4a8e2	Fix SongSelect binding to ruleset too early ... Causes music to stop playing while at main menu.	2018-07-10 01:29:24 +09:00
Dean Herbert	974c4f5185	ToolbarMode* -> ToolbarRuleset*	2018-07-10 01:20:21 +09:00
Dean Herbert	abfebbddd9	Update framework	2018-07-09 23:50:45 +09:00
Dean Herbert	472aed8c91	Merge pull request #2979 from peppy/fix-osd-fade-in ... Fix OSD fade-in not correctly debouncing	2018-07-09 19:19:09 +09:00
Dean Herbert	1670f4fe31	Merge branch 'master' into fix-osd-fade-in	2018-07-09 19:10:57 +09:00
Dean Herbert	37f0095ae5	Merge pull request #2980 from peppy/fix-exit-race-condition ... Fix pressing escape too fast causing multiple exit attempts at song select	2018-07-09 19:10:41 +09:00
Dan Balasescu	ee4607c86e	Merge branch 'master' into fix-exit-race-condition	2018-07-09 19:02:37 +09:00
Dan Balasescu	34db414672	Merge pull request #2981 from peppy/fix-early-player-entry ... Fix being able to trigger player before carousel is ready	2018-07-09 19:02:09 +09:00
Dean Herbert	49e94850b6	Fix being able to trigger player before carousel is ready ... Causes an eventual crash.	2018-07-09 18:43:20 +09:00
Dean Herbert	ce0a7d7760	Merge pull request #2978 from HoutarouOreki/removeAge ... Remove unused age display code	2018-07-09 18:17:12 +09:00
Dean Herbert	09b3375a9d	Fix pressing escape too fast causing multiple exit attempts at song select	2018-07-09 18:12:23 +09:00
Dean Herbert	df67c0498d	Fix OSD fade-in not correctly debouncing ... It could potentially never fade in on quick presses.	2018-07-09 17:53:39 +09:00
Dean Herbert	6ced51bb67	Merge branch 'master' into removeAge	2018-07-09 17:43:23 +09:00
Dean Herbert	10cc95427d	Merge pull request #2977 from smoogipoo/fix-nullrefs ... Fix some possible null reference exceptions	2018-07-09 17:43:01 +09:00
HoutarouOreki	10aae3b0ee	Remove age from User class	2018-07-09 10:33:46 +02:00
HoutarouOreki	930667d0f9	Remove unused age display code	2018-07-09 10:12:10 +02:00
smoogipoo	0a67e5a274	Fix some possible null reference exceptions	2018-07-09 17:09:17 +09:00
Jarosław Zgierski	1444715641	Merge pull request #1 from ppy/master ... Sync to upstream repo	2018-07-09 09:07:59 +02:00
Dean Herbert	b20afb915d	Fix right mouse activated absolute scroll not working	2018-07-09 15:26:22 +09:00
Ethan Yang	157ca8b2a4	Change osu key bindings	2018-07-08 11:47:39 -07:00
Dean Herbert	e223074876	Fix import failures if single set has multiple conflicting OnlineBeatmapIDs ... Resolves #2970.	2018-07-09 00:24:55 +09:00
Dean Herbert	91777b04d8	Merge branch 'master' into download-button-state	2018-07-08 14:15:47 +09:00
Dean Herbert	27311ce1fc	Update nuget restore instructions	2018-07-08 11:21:18 +09:00
Dean Herbert	f92a90c098	Update README.md	2018-07-08 02:03:42 +09:00
Dean Herbert	c194618df3	Merge pull request #2876 from smoogipoo/more-mania-conversion-fixes ... Fix more instances of osu!mania beatmap conversion failing	2018-07-08 01:54:59 +09:00
Dean Herbert	ad51d95c1a	Merge branch 'master' into more-mania-conversion-fixes	2018-07-08 01:44:06 +09:00
Dean Herbert	f872c56deb	Merge branch 'master' into improve-button-system	2018-07-06 18:25:34 +09:00
Dean Herbert	d1846e6128	Merge pull request #2933 from ekrctb/fix-menu-cursor-animation ... Fix menu cursor not highlighting when pressing multiple buttons	2018-07-06 17:56:38 +09:00
Dean Herbert	0b30e6eb6a	Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system	2018-07-06 17:55:02 +09:00
Dean Herbert	c025158735	Give VisibleState a default rather than nullable	2018-07-06 17:53:06 +09:00
Dean Herbert	c4952569cc	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 17:46:29 +09:00
Dean Herbert	54db287791	Remove casting	2018-07-06 17:45:39 +09:00
Dean Herbert	a300b5c924	Merge pull request #2946 from peppy/go-forward ... Add "Select" action	2018-07-06 16:48:37 +09:00
Dean Herbert	7120408a63	Add fallback "updater", which prompts the user to update	2018-07-06 16:46:22 +09:00
Dean Herbert	b8d314a809	Tidy up updater namespace	2018-07-06 16:39:27 +09:00
Dan Balasescu	8f3f872182	Merge branch 'master' into go-forward	2018-07-06 14:29:26 +09:00
Dan Balasescu	a1d2092cc9	Fix incorrect default drain time	2018-07-06 13:29:40 +09:00
Dan Balasescu	290812cf65	Merge branch 'master' into more-mania-conversion-fixes	2018-07-06 13:29:16 +09:00
Dean Herbert	7da5a2fec9	Merge pull request #2964 from johnneijzen/JSON-format-fix ... Remove extra commas in vscode build configuration	2018-07-06 13:20:38 +09:00
Dean Herbert	56196885e6	Merge branch 'master' into JSON-format-fix	2018-07-06 11:41:28 +09:00
Dean Herbert	dffe6af5d9	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 11:29:53 +09:00