6103 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	a3329fef37	Merge pull request #937 from MrTheMake/intro-track-start-fix ... Don't start a beatmap's track until the intro is done playing	2017-07-20 09:05:15 +09:00
MrTheMake	fd518e2294	Don't start a beatmap's track until the intro is done playing	2017-07-20 01:57:46 +02:00
Jorolf	bac8693c81	Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes	2017-07-20 01:08:42 +02:00
Jorolf	e0fb2563b5	remove using	2017-07-20 01:08:26 +02:00
jorolf	c2a2f77210	Merge branch 'master' into user-profile-fixes	2017-07-20 01:06:36 +02:00
Jorolf	b016103894	add link to user page	2017-07-20 01:03:00 +02:00
smoogipooo	d75e439f94	Fix Player crashing due to null BeatmapInfo (now unused).	2017-07-20 01:27:27 +09:30
Dan Balasescu	a7d4a3d473	Merge pull request #1027 from peppy/non-null-beatmap ... Make Beatmap non-nullable	2017-07-19 22:05:24 +09:30
Dean Herbert	38431f8555	Fix remaining test case issues	2017-07-19 19:10:04 +09:00
Dean Herbert	8ce71ef235	Fix broken test case	2017-07-19 18:48:27 +09:00
Dean Herbert	da92fccdb0	Merge branch 'master' into non-null-beatmap	2017-07-19 18:32:42 +09:00
Dean Herbert	d7dddec328	Set zero-difficulty values local to the dummy beatmap	2017-07-19 18:32:11 +09:00
Dean Herbert	8764d88f0f	Update framework	2017-07-19 18:24:03 +09:00
Dean Herbert	2c5019ff7c	Forward action in saner way	2017-07-19 18:22:46 +09:00
Dean Herbert	b6b7ae47db	Merge branch 'master' into user-profile-fixes	2017-07-19 18:15:38 +09:00
Dean Herbert	0b53f1a7e3	Reference system	2017-07-19 18:09:59 +09:00
Dean Herbert	a01209cfe0	Simplify comparator	2017-07-19 18:09:59 +09:00
Dean Herbert	35157ca6b8	Make DefaultBeatmap private get.	2017-07-19 18:09:59 +09:00
Dean Herbert	2eccb3822a	Make link text not suck	2017-07-19 17:54:04 +09:00
Dan Balasescu	285790bae0	Merge pull request #1026 from peppy/beatmap-delete-fixes ... Fix crashes related to deleting/importing beatmaps	2017-07-19 17:46:49 +09:30
Dan Balasescu	42af26a5a5	Merge branch 'master' into beatmap-delete-fixes	2017-07-19 17:34:12 +09:30
Dan Balasescu	11eecdd281	Merge pull request #1028 from peppy/fix-flashy-sides ... Fix main menu flashy sides moving too much	2017-07-19 17:26:26 +09:30
Dean Herbert	c34856922c	Gratify CI	2017-07-19 16:34:18 +09:00
Dean Herbert	2a2f4e2a8b	Ensure side flashes are not visible during moving transitions	2017-07-19 16:13:01 +09:00
Dean Herbert	2b1e19814c	Side flashes should not be affected by parallax	2017-07-19 16:07:11 +09:00
Dean Herbert	c8593a38c8	Remove incorrect looping reset behaviour ... Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.	2017-07-19 15:55:16 +09:00
Dean Herbert	64ebc01a3b	Remove many now unnecessary null-checks	2017-07-19 15:45:23 +09:00
Dean Herbert	21d07428fe	Fix some test regressions	2017-07-19 15:16:59 +09:00
Dean Herbert	8e8767cd37	Give song select a better default background whecn the beatmap's can't be loaded	2017-07-19 15:16:55 +09:00
Dean Herbert	d0dea33faa	Make Beatmap (bindable) non-nullable.	2017-07-19 15:16:53 +09:00
Dean Herbert	0846414c5b	Simplify state changes	2017-07-19 15:16:51 +09:00
Dean Herbert	632d2e8ba5	Dummy beatmap has dummy ruleset	2017-07-19 15:16:48 +09:00
Dean Herbert	f168ee660c	Move dummy to BeatmapDatabase	2017-07-19 15:16:43 +09:00
Dean Herbert	3289d93f22	Give the dummy beatmap a background	2017-07-19 15:16:42 +09:00
Dean Herbert	007b343854	Fix incorrect equality check when TimingPointAt returns a default T	2017-07-19 15:16:40 +09:00
Dean Herbert	21984ba764	Move DummyWorkingBeatmap to a more global level (OsuScreen)	2017-07-19 15:16:39 +09:00
Dean Herbert	6016310b09	Use a better default for difficulty values	2017-07-19 15:16:37 +09:00
Dean Herbert	df60fc0f0a	Stop playing previous beatmap even if new beatmap has no track	2017-07-19 15:16:36 +09:00
Dean Herbert	59416584c1	Don't show theme song in playlist	2017-07-19 15:16:35 +09:00
Dean Herbert	e47faf4e85	Add a dummy beatmap provider for use in BeatmapInfoWedge	2017-07-19 15:16:33 +09:00
Dean Herbert	6f59e5feec	Add null check on stream	2017-07-19 14:56:27 +09:00
Dean Herbert	f00140f0a4	Avoid crashes on attempting to import the same path twice in quick succession	2017-07-19 14:56:24 +09:00
Dean Herbert	5761eb30a0	Fix nullref error on re-importing a DeletePending beatmap ... Callback was expecting the beatmap to be populated where it wasn't being.	2017-07-19 14:56:20 +09:00
Dean Herbert	11ddded6fc	Merge pull request #1023 from Tom94/custom-chat-colours ... Use a background for custom-coloured users	2017-07-19 09:09:56 +09:00
Thomas Müller	6d8bdadf2d	Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours	2017-07-18 12:35:48 +03:00
Thomas Müller	a225b542d5	Sender is always non-null	2017-07-18 12:35:36 +03:00
Thomas Müller	fce5a191f1	Migrate padding into the scroll content to not cut off effects	2017-07-18 12:26:27 +03:00
Thomas Müller	e58ea97604	Improve design as requested	2017-07-18 12:26:05 +03:00
Dean Herbert	b33c8226c1	Merge pull request #1024 from Tom94/fix-broken-tooltip ... Fix OsuTooltipContainer.PopIn not overriding PopOut transforms	2017-07-18 18:11:26 +09:00
Thomas Müller	b2dd43075f	Update framework	2017-07-18 11:57:41 +03:00