5187 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	f6dc85c2f8	Fix incorrect note count probabilities.	2017-05-18 12:39:51 +09:00
smoogipooo	e9275138e1	Finish up DistanceObjectConversion.	2017-05-18 12:39:37 +09:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
smoogipooo	22128f158c	Fix a few errors.	2017-05-18 12:10:01 +09:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
Dean Herbert	0a60bd2fb3	Merge branch 'master' into auto-fix	2017-05-18 11:33:33 +09:00
Dean Herbert	25385d408c	Merge pull request #783 from peppy/pause-container ... PauseContainer	2017-05-18 09:43:39 +09:00
MrTheMake	58ebb24032	Use the end position of a previous note stack rather than the start position.	2017-05-18 02:17:49 +02:00
MrTheMake	91859042e8	Fix not all cases of the auto replay generator fix being covered.	2017-05-18 02:15:16 +02:00
MrTheMake	817bae3219	Fixes the auto mod not hitting stacks of notes on certain maps.	2017-05-18 01:54:17 +02:00
DrabWeb	b26c8dd1c7	Added temporary difficulties on the panels	2017-05-17 18:42:40 -03:00
Huo Yaoyuan	cd065b8ff3	Add back GetHashCode.	2017-05-18 05:27:20 +08:00
DrabWeb	b3ef8b8fd4	Design updates	2017-05-17 18:10:29 -03:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
Huo Yaoyuan	ffbab6bfeb	Tidy up DrawableChannel.	2017-05-18 04:08:47 +08:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Huo Yaoyuan	88f8619e9a	More missed exceptions.	2017-05-18 02:46:12 +08:00
Huo Yaoyuan	23e2d3ef07	Use GroupBy in ChatOverlay.	2017-05-18 02:40:36 +08:00
Huo Yaoyuan	e2b1fcc088	Use string.Join in GetMessagesRequest.	2017-05-18 02:40:33 +08:00
Huo Yaoyuan	b5d7211cd6	Expire placeholder text.	2017-05-18 02:40:29 +08:00
Huo Yaoyuan	65ff66682a	Merge branch 'master' into generic-interface	2017-05-18 02:40:05 +08:00
Dan Balasescu	32c471d285	Merge branch 'master' into pause-container	2017-05-18 01:22:37 +09:00
Dan Balasescu	55d4d83712	Merge pull request #782 from peppy/fix-fail-pause-conflict ... Fix and simplify pause logic	2017-05-18 01:22:00 +09:00
Dean Herbert	8084c575ef	Merge branch 'master' into fix-fail-pause-conflict	2017-05-17 23:32:41 +09:00
Dean Herbert	0242e37bb3	Merge pull request #778 from peppy/song-select-selection-fixes ... Fix song select reverting to first difficulty of current group on entering	2017-05-17 23:31:24 +09:00
EVAST9919	733ae16489	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 17:28:05 +03:00
EVAST9919	a9f37d3e78	now button can hide content	2017-05-17 17:24:52 +03:00
Javier Flores	f4c7a02a6f	Fix having negative beat when it should be 0	2017-05-17 09:23:04 -05:00
Dean Herbert	d1f85c3f8e	Update framework	2017-05-17 23:21:23 +09:00
Dean Herbert	25f217505e	Merge branch 'master' into song-select-selection-fixes	2017-05-17 23:17:10 +09:00
Dean Herbert	bab8997b43	Merge pull request #780 from peppy/bad-bad-ratio-container ... Fix ratio container being added to a level too high	2017-05-17 23:16:58 +09:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
EVAST9919	eec813ad65	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 17:14:00 +03:00
Dean Herbert	1278d9c53d	Merge branch 'master' into bad-bad-ratio-container	2017-05-17 23:01:56 +09:00
Dean Herbert	3fd9edfcde	Merge pull request #784 from peppy/general-fixes ... Fix CI warning	2017-05-17 22:57:01 +09:00
EVAST9919	60ed7a2372	fixed license header	2017-05-17 16:54:49 +03:00
Dean Herbert	d606b5b3a7	Fix CI warning	2017-05-17 22:13:56 +09:00
EVAST9919	e785f1ddf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 16:12:38 +03:00
EVAST9919	1e029d05a8	Added bindable to adjust playback speed	2017-05-17 16:10:49 +03:00
Dan Balasescu	8bcbc2cc26	Merge pull request #774 from peppy/fix-chat-after-disconnect ... Fix channels being unnecessarily recycled on disconnect	2017-05-17 22:02:25 +09:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	0867ef814c	Visible only in replay	2017-05-17 15:54:12 +03:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
EVAST9919	fd2150aa49	Moved collectionsDropdown to it's own class	2017-05-17 15:32:16 +03:00
smoogipooo	b52ec11260	Add (almost finished) basis of slider hit object conversion...	2017-05-17 20:47:02 +09:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic ... Resolves #770	2017-05-17 20:11:41 +09:00
Huo Yaoyuan	6c9505fa3a	Handle possible nulls.	2017-05-17 18:11:38 +08:00
Huo Yaoyuan	b9b45493e6	Use generic IComparable together with IEqutable for Message.	2017-05-17 18:02:17 +08:00
Dean Herbert	cba7796777	Fix ratio container being added to a level too high ... That's a bad ratio container! How did we not notice this until now?	2017-05-17 18:49:30 +09:00