67639 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	f1395b8408	Merge pull request #147 from peppy/options-fixes ... Options: Fix paddings, transitions, const variable names.	2016-11-09 12:20:15 +09:00
Dean Herbert	b2291ed615	Update framework.	2016-11-09 12:15:15 +09:00
Dean Herbert	d41d7b8e9a	Don't derive ScrollContainer unnecessarily.	2016-11-09 12:10:22 +09:00
Dean Herbert	d70e8806b4	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes	2016-11-09 11:41:36 +09:00
Dean Herbert	fe843edc4e	Merge pull request #148 from peppy/generic-container ... Generic containers.	2016-11-09 11:33:58 +09:00
Dean Herbert	2cbb74a2b8	Update framework.	2016-11-09 08:00:44 +09:00
Dean Herbert	28a94e2df1	Remove unused constant.	2016-11-08 20:35:21 +09:00
Dean Herbert	3ef26a6bf0	Fix paddings, transitions, const variable names.	2016-11-08 20:23:18 +09:00
Dean Herbert	97f3023cd9	Ctrl+O for options.	2016-11-08 19:27:37 +09:00
Dean Herbert	4426a683ed	Move OptionsOverlay to OsuGame.	2016-11-08 19:26:12 +09:00
Dean Herbert	89b11ed099	Handle sidebar buttons onClick not onMouseDown.	2016-11-08 19:18:31 +09:00
Dean Herbert	8c68f9ba93	OptionsSideNav -> OptionsSidebar.	2016-11-08 19:17:09 +09:00
Dean Herbert	3b0114671e	Max sidebar draggable.	2016-11-08 19:16:39 +09:00
Dean Herbert	30323876a8	Use preload for options (fix icons).	2016-11-08 18:49:20 +09:00
Dean Herbert	a851d7b44f	Updates.	2016-11-08 18:33:31 +09:00
Dean Herbert	c36b54b35a	Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container	2016-11-08 18:29:21 +09:00
Dean Herbert	53d1798dee	Merge pull request #146 from SirCmpwn/options-wired-up ... Wire up one of the settings to the config	2016-11-08 12:39:47 +09:00
Drew DeVault	743c1bde58	Wire up alternative chat font	2016-11-07 22:37:21 -05:00
Drew DeVault	1bca78f4b6	Wire up one of the settings to the config ... One step at a time, right	2016-11-07 22:36:24 -05:00
Dean Herbert	42102f7378	Merge pull request #131 from SirCmpwn/options ... Implement scrolling to each section of options	2016-11-08 12:33:25 +09:00
Drew DeVault	fbbd05e606	Remove unnecessary TODO	2016-11-07 22:28:02 -05:00
Drew DeVault	a6593505b3	Say NO to RelativeSizeAxes = Both	2016-11-07 22:19:02 -05:00
Drew DeVault	4d04eb6fb1	Rearrange some options a bit, update framework	2016-11-07 22:15:48 -05:00
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