13419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	cc69f07172	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:52:05 +09:00
Dean Herbert	1cb7d50407	Add and use default size (smaller than before)	2018-05-25 18:51:57 +09:00
Dean Herbert	78ca111d69	Merge pull request #2504 from UselessToucan/player_loader_input_toggles ... Add input toggles to the PlayerLoader screen	2018-05-25 18:50:45 +09:00
Dean Herbert	1b5bb79fe9	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:50:30 +09:00
Dean Herbert	28aa6faef9	Merge branch 'master' into player_loader_input_toggles	2018-05-25 18:38:12 +09:00
Dean Herbert	7d06a08c3a	Fix quit button test occasionally failing	2018-05-25 17:44:56 +09:00
Dean Herbert	f5ab93a712	Make all drawable fruit absolute values easily scalable	2018-05-25 17:37:52 +09:00
Dean Herbert	bf25e81c94	Make drawable bananas testable	2018-05-25 17:37:52 +09:00
Dean Herbert	3fe25fe67d	Fix catcher sizing to (roughly) match stable	2018-05-25 17:33:53 +09:00
Dean Herbert	5e4f83b80b	Add more correct catch playfield sizing	2018-05-25 17:33:27 +09:00
Dean Herbert	e62718f251	Merge pull request #2587 from smoogipoo/diffcalc-double-hr ... Fix double-HR application in OsuDifficultyCalculator	2018-05-25 14:17:25 +09:00
Dean Herbert	67447ef560	Merge branch 'master' into diffcalc-double-hr	2018-05-25 14:03:10 +09:00
ekrctb	7412ac6627	Merge branch 'master' into catch-stable-hyper	2018-05-25 13:08:02 +09:00
Dean Herbert	1c947fd3a7	Merge pull request #2618 from smoogipoo/musiccontroller-nullref ... Fix possible MusicController nullref	2018-05-25 11:25:05 +09:00
Dean Herbert	385c2c5c86	Merge branch 'master' into musiccontroller-nullref	2018-05-25 11:01:09 +09:00
Dean Herbert	568d4882c6	Remove unnecessary null coalesce	2018-05-25 11:00:56 +09:00
Dean Herbert	7961c56239	Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change	2018-05-25 10:55:01 +09:00
Dean Herbert	3d1f0e50ed	Update framework	2018-05-25 10:54:53 +09:00
Roman Kapustin	498244a308	Introduce PreviewTrack class	2018-05-25 00:37:53 +03:00
UselessToucan	d6076eb591	Merge branch 'master' into multiple_previews_different_overlays	2018-05-24 20:51:54 +03:00
ekrctb	be323c7147	Fix InspectCode issues.	2018-05-25 02:14:56 +09:00
ekrctb	99c0e19189	Fix build error	2018-05-25 01:52:15 +09:00
ekrctb	38e5e35743	modify catch hyperdash behavior	2018-05-25 01:20:05 +09:00
smoogipoo	b649025e86	beginUserDrag/endUserDrag	2018-05-24 14:36:48 +09:00
smoogipoo	d4f68e0b67	Fix possible NaN values due to trackvirtual infinite length	2018-05-24 14:31:31 +09:00
smoogipoo	f1ac84d95b	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
smoogipoo	5a517bad63	Move beatmap cleanup to Dispose()	2018-05-24 12:53:32 +09:00
smoogipoo	542eb848b0	Fix GetBoundCopy on IGameBeatmap not working	2018-05-24 12:42:58 +09:00
Dean Herbert	6d6cea19ec	Merge pull request #2624 from Aergwyn/hide-toolbar-after-play ... Fix incorrect default values keeping overlays in wrong state	2018-05-24 09:43:52 +09:00
Aergwyn	0c0f86fe26	fix incorrect default values keeping overlays in wrong state	2018-05-23 16:25:10 +02:00
Jacob	a2527495ff	Merge branch 'master' into ParallaxContainerImprovement	2018-05-23 16:21:31 +02:00
smoogipoo	fb78854485	Fix audio playback getting paused if playlist changes beatmap	2018-05-23 19:41:13 +09:00
HoutarouOreki	6d222a36b2	Merge branch 'unifyDates' of https://github.com/HoutarouOreki/osu into unifyDates	2018-05-23 12:08:16 +02:00
HoutarouOreki	29de8e5e2d	Document parameters more properly	2018-05-23 12:07:28 +02:00
smoogipoo	a5d2d74447	Remove whitespace	2018-05-23 19:01:27 +09:00
smoogipoo	a25462e10f	Fix testcase audio + dependency overrides not working	2018-05-23 18:52:09 +09:00
Jarosław Zgierski	cf5232586e	Trim whitespace that I couldn't remove in VS?	2018-05-23 11:27:11 +02:00
HoutarouOreki	10bc3917b5	Apply suggested changes	2018-05-23 11:17:13 +02:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	6c0c932c48	Reorder OsuGameBase methods	2018-05-23 14:56:40 +09:00
frankhjwx	fda7025ac3	Re-order positionData judgement for correct banana creation	2018-05-23 13:47:33 +08:00
frankhjwx	28ad5398cc	Remove the changes in convert spinner	2018-05-23 13:46:12 +08:00
smoogipoo	f894d73501	Fix possible MusicController nullref	2018-05-23 14:36:09 +09:00
smoogipoo	a30f72b477	Add helper methods for seeking/scrolling	2018-05-23 14:32:00 +09:00
smoogipoo	6b0eeb3436	Rework seeking interactions to support smooth scrolling	2018-05-23 14:14:32 +09:00
smoogipoo	f18677382c	Update framework	2018-05-23 12:00:23 +09:00
smoogipoo	49f893d5e4	Couple the timeline to the audio	2018-05-23 12:00:11 +09:00
Dean Herbert	194710eae4	Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications ... Fix disclaimer allowing notifications	2018-05-23 11:22:49 +09:00
frankhjwx	6ee96c758f	Merge branch 'master' into catch_spinner	2018-05-23 10:02:11 +08:00
HoutarouOreki	8e9dde97ce	Better match join and last seen texts and tooltips with osu-web	2018-05-23 03:24:37 +02:00