8197 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Dan Balasescu	012a81a52e	Merge pull request #1449 from peppy/less-internal ... Use internal less	2017-11-01 17:32:52 +09:00
Dean Herbert	ed89f03900	Make ParallaxContainer public	2017-11-01 17:10:59 +09:00
Dean Herbert	6fa02ce9bb	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 17:10:54 +09:00
Dean Herbert	27156aeb93	Fix the shit	2017-11-01 17:07:03 +09:00
Dean Herbert	fd5bc6fe58	Make ParallaxContainer public	2017-11-01 17:06:55 +09:00
Dean Herbert	09e0bd7a78	Remove unused class file	2017-11-01 16:58:12 +09:00
Dean Herbert	15197b9a76	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 16:57:59 +09:00
Dean Herbert	4c54af2fc0	Merge branch 'fix-visualtests-configuration' into intro	2017-11-01 16:05:51 +09:00
Dean Herbert	bcc30fd947	Revert osu-resources	2017-11-01 16:05:06 +09:00
Dean Herbert	d6c86ebcb1	Merge branch 'master' into intro	2017-11-01 15:38:14 +09:00
Dean Herbert	a7c04e9069	Merge branch 'fix-visualtests-configuration'	2017-11-01 15:37:22 +09:00
Dean Herbert	cbf543de73	Apply framework project format revert	2017-11-01 15:31:38 +09:00
Dean Herbert	8138796ee3	Fix VisualTests configuration being completely wrong	2017-11-01 14:53:33 +09:00
Dean Herbert	ca8afc0c80	Merge remote-tracking branch 'upstream/master' into intro	2017-10-31 15:49:28 +09:00
Dan Balasescu	3ed8624015	Merge pull request #1446 from peppy/delayed-load ... Make avatars use a delayed load wrapper	2017-10-30 23:04:59 +09:00
Dean Herbert	ba7c0695c5	Merge branch 'master' into delayed-load	2017-10-30 22:48:33 +09:00
Dean Herbert	757d8be95f	Merge pull request #1444 from smoogipoo/webrequest-updates ... Apply osu!-side WebRequest changes	2017-10-30 22:48:19 +09:00
smoogipoo	40f3cb5db7	Update framework	2017-10-30 22:39:25 +09:00
smoogipoo	7b72c6d811	Merge branch 'master' into webrequest-updates	2017-10-30 22:39:01 +09:00
smoogipoo	cd5324f1d1	Update API code to use the new Add* methods on requests	2017-10-30 21:33:44 +09:00
Dean Herbert	f486ab1f6c	Merge branch 'master' into song_select_delete	2017-10-30 21:07:02 +09:00