1466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Drew DeVault	cbbac0565f	Remove unused using statements	2016-11-07 21:28:06 -05:00
Drew DeVault	1ce6a7285a	Rearrange options namespaces	2016-11-07 21:24:41 -05:00
Drew DeVault	b2bbdfa284	Refactor how the sidebar buttons are created/used	2016-11-07 18:04:49 -05:00
Drew DeVault	e6c3fc1091	Implement scrolling to each section	2016-11-07 17:07:55 -05:00
Huo Yaoyuan	ef5968e243	More robust metadata handling.	2016-11-07 23:12:49 +08:00
Huo Yaoyuan	fd977cacb3	Fix corner case when shuffling.	2016-11-07 23:06:14 +08:00
Huo Yaoyuan	02b903f1ea	Shuffle playlist.	2016-11-07 22:12:58 +08:00
Huo Yaoyuan	dc347a74f5	Don't play transition if audio equals.	2016-11-07 21:58:30 +08:00
Huo Yaoyuan	c59cad2478	AudioEquals method for BeatmapInfo.	2016-11-07 21:52:23 +08:00
Huo Yaoyuan	d1f64cfbfc	Make external changes into history.	2016-11-07 21:30:25 +08:00
Huo Yaoyuan	ad1dccf6ce	Use play history for back and forward.	2016-11-07 21:25:37 +08:00
Huo Yaoyuan	644e337cf6	Add a list for play history.	2016-11-07 20:57:33 +08:00
Dean Herbert	d57d5daac9	Support generic FlowContainer.	2016-11-07 21:17:29 +09:00
Dean Herbert	a61fb5ef5d	Initial updates to make generic containers work.	2016-11-07 21:13:56 +09:00
Huo Yaoyuan	c272041f37	Block click and drag at MusicController level.	2016-11-07 20:07:45 +08:00
Huo Yaoyuan	736079a60d	Update FontAwesome usage.	2016-11-07 19:00:20 +08:00
Huo Yaoyuan	8037f1233f	Merge branch 'master'	2016-11-07 18:58:35 +08:00
Dean Herbert	dd57f52744	Merge pull request #145 from peppy/update-font-awesome ... Update FontAwesome definitions.	2016-11-07 19:54:25 +09:00
Dean Herbert	8797b04dc2	Update resources.	2016-11-07 19:44:48 +09:00
Dean Herbert	f14a35d480	Update FontAwesome definitions.	2016-11-07 17:59:00 +09:00
Dean Herbert	6ce9491f00	Merge pull request #142 from Tom94/smooth-wedged-buttons ... Smoothen wedged buttons in main menu and the wedges on song select ba…	2016-11-07 04:03:18 +09:00
Thomas Müller	fa8d668cb6	Update framework.	2016-11-06 19:59:30 +01:00
Thomas Müller	90c889a7ce	Smoothen wedged buttons in main menu and the wedges on song select background.	2016-11-06 19:34:44 +01:00
Dean Herbert	7989090f51	Merge pull request #140 from Tom94/better-clocks ... Better clocks	2016-11-07 02:57:12 +09:00
Thomas Müller	108d32b6d8	Update framework.	2016-11-06 18:50:21 +01:00
Thomas Müller	103176826f	Ensure transformations are never used prior to being added to the Drawable tree.	2016-11-06 11:13:52 +01:00
Thomas Müller	32ee20b843	Merge branch 'master' of github.com:ppy/osu into better-clocks ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs	2016-11-06 10:08:24 +01:00
Thomas Müller	5f2bf165a2	Remove now obsolete clock usages.	2016-11-06 10:06:09 +01:00
Huo Yaoyuan	c8a7bd2ece	Minor implementation changes.	2016-11-06 16:47:37 +08:00
Huo Yaoyuan	000c2218b8	Make background update happens in update thread, and thread-safer.	2016-11-06 16:34:47 +08:00
Thomas Müller	8894e5f73a	Fade the options overlay to prevent unnecessary updates to its content.	2016-11-06 08:54:36 +01:00
Thomas Müller	a6c0fd29f2	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
Dean Herbert	49d170339b	Merge pull request #138 from grafitter/general-fixes ... Working beatmap background scaling fix	2016-11-06 14:41:28 +09:00
Maciej	bcc1d7c669	Background scaling different approach	2016-11-06 04:37:41 +01:00
Maciej	c4132339a6	Working beatmap background scaling fix ... Add a check for the working beatmap background width and assign a proper scaling value to cover the whole box	2016-11-06 04:12:35 +01:00
Huo Yaoyuan	d63e3b6724	Add fallback texture of beatmap when getting null;	2016-11-06 05:37:55 +08:00
Huo Yaoyuan	0c6825bb20	Adjust visual behavior.	2016-11-06 05:35:35 +08:00
Huo Yaoyuan	2bd447ca56	Update framework.	2016-11-06 05:33:44 +08:00
Huo Yaoyuan	c53298a3b1	Update font size (*1.25) to follow the design image.	2016-11-06 01:53:10 +08:00
Huo Yaoyuan	74000f77ad	Set font in music controller.	2016-11-06 01:50:38 +08:00
Huo Yaoyuan	a19bb1270d	Async workflow on music controller.	2016-11-06 00:46:09 +08:00
Huo Yaoyuan	859a59a8ab	Set children in constructor.	2016-11-06 00:24:03 +08:00
Huo Yaoyuan	5eed07db57	Update access of WorkingBeatmap.	2016-11-06 00:13:45 +08:00
Huo Yaoyuan	c470140d64	Merge branch 'master'	2016-11-06 00:11:30 +08:00
Dean Herbert	3c8f94dd0f	Merge pull request #136 from Tom94/general-fixes ... Fix wrong initial state of beatmap panels.	2016-11-05 23:04:37 +09:00
Thomas Müller	945856b559	Merge pull request #133 from peppy/hitcircle-revision-2 ... Hitcircles v2	2016-11-05 14:50:35 +01:00
Dean Herbert	cc140c9634	Fix broken tests.	2016-11-05 22:48:32 +09:00
Thomas Müller	7c7e2160ec	Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2	2016-11-05 14:05:42 +01:00
Thomas Müller	619d97c642	Fix indentation and typo.	2016-11-05 13:51:52 +01:00
Dean Herbert	a859a90b56	Merge pull request #135 from huoyaoyuan/thread-safety ... Add lock on each property of WorkingBeatmap.	2016-11-05 21:35:30 +09:00