11734 Commits

Author	SHA1	Message	Date
Dean Herbert	e9c3f54307	Share web request between builds and streams	2019-05-13 16:44:43 +09:00
Dean Herbert	37a8d9eb80	Remove chart references for now	2019-05-13 16:27:54 +09:00
Dean Herbert	219c590b8a	Initial pass to make work with real API	2019-05-13 16:24:32 +09:00
Dean Herbert	31b72f168d	Fix deprecated calls and code styling (partly)	2019-05-13 00:46:22 +09:00
Dean Herbert	34f54aa945	Resolve compile-time issues	2019-05-13 00:36:05 +09:00
Dean Herbert	943e1574a4	Merge branch 'master' into changelog-overlay	2019-05-13 00:24:18 +09:00
Dean Herbert	da2338581b	Merge branch 'master' into dev	2019-05-12 23:13:46 +09:00
Dean Herbert	487a56549e	Fix CI issues	2019-05-12 22:53:12 +09:00
Dean Herbert	41e13aef23	Use more standard parsing method	2019-05-12 22:53:03 +09:00
Paul Teng	1c3b768266	Use Precision.AlmostBigger	2019-05-12 09:02:22 -04:00
Dean Herbert	ce0e4c506e	Merge branch 'master' into dev	2019-05-12 21:45:52 +09:00
Paul Teng	1a6c8e91a5	Compare Health with small value	2019-05-12 08:44:20 -04:00
Dean Herbert	82599127fd	Merge branch 'master' into patch-1	2019-05-12 20:30:25 +09:00
Paul Teng	7adaa09263	Move tab channel class into tab item class	2019-05-12 06:31:11 -04:00
Paul Teng	8957ad5a7e	Instantiate channel in tab item	2019-05-12 06:26:03 -04:00
Paul Teng	d53fb9a5c8	Check against type instead of channel name	2019-05-12 06:11:16 -04:00
Paul Teng	496a9dd41d	Create separate type for Join-Channel button	2019-05-12 06:02:21 -04:00
Dean Herbert	038e49701e	Move conditional to within BreakPeriod	2019-05-12 16:25:25 +09:00
Dean Herbert	1391aa342c	Merge branch 'master' into break-pause	2019-05-12 16:15:24 +09:00
Dean Herbert	3566da73cc	Merge branch 'master' into fix-more-pause-cases	2019-05-12 15:57:45 +09:00
Dean Herbert	9add2562f9	Close beatmap options when suspending (#4761) ... Close beatmap options when suspending	2019-05-12 15:50:10 +09:00
Dean Herbert	790700d8bf	Use more correct calculation	2019-05-12 15:40:58 +09:00
Joehu	175daac16a	Close beatmap options when suspending	2019-05-11 21:26:42 -07:00
Joehu	29cec54b3c	Fix beatmap carousel overlapping beatmap info wedge	2019-05-11 20:08:45 -07:00
Paul Teng	c508b8ed6b	Trim whitespace	2019-05-11 19:21:12 -04:00
Paul Teng	3971a49549	Ignore Add-channel button	2019-05-11 19:16:15 -04:00
Paul Teng	6cf1ca288f	Do not try to join the Add-channel button	2019-05-11 19:13:48 -04:00
smoogipoo	bde2d552b6	Merge remote-tracking branch 'origin/master' into fix-more-pause-cases ... # Conflicts: # osu.Game.Tests/Visual/Gameplay/TestCasePause.cs	2019-05-10 22:16:59 +09:00
smoogipoo	01eb1a34a9	Remove unused variable	2019-05-10 22:15:33 +09:00
Dean Herbert	ad93eda399	Allow song progress bar to show current position during a seek (#4746) ... Allow song progress bar to show current position during a seek Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-05-10 21:10:11 +09:00
Dan Balasescu	4abd5c78cd	Merge branch 'master' into fix-score-deletion	2019-05-10 19:09:18 +09:00
smoogipoo	3fe61c4a7e	Trim whitespace	2019-05-10 18:48:39 +09:00
Dan Balasescu	425154c264	Merge branch 'master' into progress-bar-show-seek	2019-05-10 18:24:15 +09:00
Dan Balasescu	fe7ea1e900	Merge branch 'master' into fix-score-deletion	2019-05-10 18:24:04 +09:00
Dean Herbert	af3a75307d	Merge branch 'master' into fix-failing-pause-tests	2019-05-10 18:22:20 +09:00
Dean Herbert	97796a8578	Attempt to fix failing tests by delaying starting of the gameplay clock	2019-05-10 18:10:07 +09:00
smoogipoo	d2479acbf2	Fix incorrect value being clamped	2019-05-10 18:04:58 +09:00
Dan Balasescu	4776fc75b9	Merge branch 'master' into fix-score-deletion	2019-05-10 18:00:43 +09:00
smoogipoo	ad4b4f3422	Use nullable cancellation tokens	2019-05-10 17:42:45 +09:00
Dean Herbert	a44296a6db	Merge branch 'master' into progress-bar-show-seek	2019-05-10 17:27:49 +09:00
Dean Herbert	fdf67aaa11	Clamp values	2019-05-10 17:18:39 +09:00
Dean Herbert	21ab628f41	Merge branch 'master' into player-load-cancellations	2019-05-10 16:58:36 +09:00
smoogipoo	f6dfcc4dcf	Remove unnecessary Storyboard disposal	2019-05-10 16:31:22 +09:00
smoogipoo	d25d39b315	Add cancellation to storyboard/hitobject loading	2019-05-10 16:31:09 +09:00
Dan Balasescu	32808a8a59	Merge branch 'master' into fix-long-skip-performance	2019-05-10 16:10:50 +09:00
smoogipoo	6a957ad27f	Fix pause triggered when already paused	2019-05-10 15:51:12 +09:00
smoogipoo	7c105fd99f	Fix testcase players pausing on window unfocus	2019-05-10 15:39:25 +09:00
David Zhao	9480c74fcc	Merge remote-tracking branch 'upstream/master' into result-count	2019-05-10 11:20:16 +09:00
David Zhao	5c096cbc91	Revert mirroring condition too	2019-05-09 18:59:00 +09:00
David Zhao	9e0af723cc	Split out affectscombo change	2019-05-09 18:56:19 +09:00