8218 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	6d56b3c2df	Hide triangles during outro	2017-11-09 17:52:38 +09:00
Dean Herbert	e3a868744e	Merge branch 'master' into intro-v2	2017-11-09 17:48:42 +09:00
Dan Balasescu	10d0032c92	Merge pull request #1452 from peppy/single-osu-logo ... Make the osu! logo shared game-wide	2017-11-09 17:46:46 +09:00
Dean Herbert	a1cee2e61e	Merge remote-tracking branch 'upstream/master' into single-osu-logo	2017-11-09 17:39:14 +09:00
Dean Herbert	4874371dbf	Rename methods back	2017-11-09 17:38:20 +09:00
Dean Herbert	af35a2300e	Merge pull request #1468 from swoolcock/config-precision ... Add precision values to config bindables	2017-11-09 14:03:50 +09:00
Dean Herbert	8c0eee84a2	Merge branch 'master' into config-precision	2017-11-09 13:55:52 +09:00
Dean Herbert	e2005c4431	Add comment explaining necessity of AlwaysPresent for now	2017-11-08 20:36:18 +09:00
Dean Herbert	df6c808d28	Adjust animation to designer-san's liking	2017-11-08 17:04:36 +09:00
Dean Herbert	cabb22b6d1	Merge branch 'single-osu-logo' into intro-v2	2017-11-08 16:43:07 +09:00
Dean Herbert	c2d4a213b1	Rename logo-related methods	2017-11-08 16:34:03 +09:00
Dean Herbert	a8bacd1ed4	Remove unnecessary private method /shrug	2017-11-08 14:46:47 +09:00
Dean Herbert	7ad498cb29	Remove unused puzzle pieces	2017-11-08 14:45:01 +09:00
Dean Herbert	fafca093e8	Update framework	2017-11-08 14:43:15 +09:00
Dean Herbert	90fec5f370	Merge branch 'master' into single-osu-logo	2017-11-08 14:37:20 +09:00
Dean Herbert	41fcecf759	Add intro in to actual game	2017-11-08 14:31:11 +09:00
Dean Herbert	d8d7165164	Add a test case which starts the game	2017-11-08 13:52:44 +09:00
Dean Herbert	713d730d10	Simplify restart process and defaults initialisation	2017-11-08 13:32:03 +09:00
Dean Herbert	1771e003f7	Simplify more	2017-11-08 12:13:30 +09:00
Dean Herbert	419f041291	Fix text alignment	2017-11-08 12:12:27 +09:00
Dean Herbert	f83c095269	Simplify more	2017-11-08 12:10:32 +09:00
Dean Herbert	89426e1c11	Simplify lines	2017-11-08 12:07:52 +09:00
Dean Herbert	7dcdf78608	Make bars and circles better	2017-11-08 12:06:22 +09:00
Dean Herbert	a72e798b85	bar -> line	2017-11-08 11:21:50 +09:00
Dean Herbert	97b238d084	Simplify intro sequence a bit more	2017-11-08 11:20:21 +09:00
Dean Herbert	552a361a24	Merge remote-tracking branch 'upstream/master' into intro-v2	2017-11-08 11:08:42 +09:00
Dean Herbert	3761df249f	Merge pull request #1357 from EVAST9919/song_select_delete ... Fix wrong beatmap selection in song-select when deleting selected beatmap	2017-11-07 23:11:30 +09:00
Dean Herbert	5af2cc29f5	Merge branch 'master' into song_select_delete	2017-11-07 16:42:40 +09:00
Dan Balasescu	09b47db80e	Merge branch 'master' into config-precision	2017-11-06 15:34:19 +09:00
Shane Woolcock	a7c7f7d690	Add precision values to some of the config bindables	2017-11-06 16:58:17 +10:30
Shane Woolcock	8d610cfd43	Update framework	2017-11-06 16:57:51 +10:30
Dan Balasescu	4f52000f5f	Merge pull request #1466 from EVAST9919/auto-deleting-fix ... Fix osu! deleting beatmaps on startup if MenuMusic is disabled	2017-11-06 13:51:54 +09:00
Dan Balasescu	e5aa0db6f7	Merge branch 'master' into auto-deleting-fix	2017-11-06 13:45:55 +09:00
Dan Balasescu	8460b4b2a2	Merge pull request #1441 from swoolcock/settingsitem-getboundcopy ... Change SettingsItem to use GetBoundCopy	2017-11-06 13:07:16 +09:00
smoogipoo	d24cd00a01	Merge remote-tracking branch 'origin/master' into settingsitem-getboundcopy	2017-11-06 12:39:35 +09:00
EVAST9919	1afe2c18be	Fix osu! deleting beatmaps on startup if MenuMusic is disabled	2017-11-04 19:42:28 +03:00
Dean Herbert	3adcfa8c38	Many fixes	2017-11-03 17:54:35 +09:00
Dean Herbert	2f205d1f63	Merge branch 'single-osu-logo' into intro-v2	2017-11-03 15:37:24 +09:00
Dean Herbert	6a206c616b	Update in line with framework changes	2017-11-03 14:34:12 +09:00
Dean Herbert	8f78d84ad6	Make intro resume slower	2017-11-02 21:52:23 +09:00
Dean Herbert	c99ffb4aa3	Fix potential nullref	2017-11-02 21:52:12 +09:00
Dean Herbert	9b2d41f4eb	Fix quick retry looking bad	2017-11-02 21:52:01 +09:00
Dean Herbert	b8b05fe8d2	Make the osu! logo shared game-wide ... There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.	2017-11-02 20:38:02 +09:00
Dan Balasescu	7fa3ac8cf2	Merge pull request #1451 from peppy/fix-endless-auth-loop ... Fix a possible horrendous endless auth loop	2017-11-02 20:37:10 +09:00
Dean Herbert	b0785b2f09	Fix a possible horrendous endless auth loop	2017-11-02 20:26:26 +09:00
Dan Balasescu	718f11f26e	Merge pull request #1450 from peppy/fix-incorrect-guid ... Revert incorrectly changed GUID	2017-11-01 23:44:46 +09:00
Dean Herbert	beb9d621c4	Revert incorrectly changed GUID	2017-11-01 23:38:08 +09:00
Dan Balasescu	0362218700	Merge pull request #1448 from peppy/fix-visualtests-configuration ... Fix VisualTests not working under mono (or windows)	2017-11-01 22:54:28 +09:00
Dean Herbert	f0c0e8c34c	Update framework	2017-11-01 17:34:36 +09:00
Dan Balasescu	05e5e3d279	Merge branch 'master' into fix-visualtests-configuration	2017-11-01 17:33:15 +09:00