5525 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Huo Yaoyuan	ff5854d6bf	Merge branch 'master' into generic-interface	2017-05-18 19:19:40 +08:00
Dean Herbert	ae676b48b2	Fix whitespace	2017-05-18 19:51:45 +09:00
Dan Balasescu	e52b87bc58	Fix incorrect comment.	2017-05-18 19:47:16 +09:00
Dean Herbert	9cd41c0e87	Spinner design refresh	2017-05-18 19:42:20 +09:00
Dean Herbert	f112546085	Don't load a mode when opening TestCaseHitObjects	2017-05-18 19:42:20 +09:00
Dan Balasescu	b5674c8f30	Update DistanceObjectPatternGenerator.cs	2017-05-18 19:33:02 +09:00
smoogipooo	1f6939f57b	Add IHasEndTime object pattern generation.	2017-05-18 19:31:56 +09:00
smoogipooo	a239411808	Fix warnings/errors.	2017-05-18 19:10:32 +09:00
smoogipooo	78453c7ce3	Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs	2017-05-18 19:06:27 +09:00
smoogipooo	4e8ead9cf4	Fix possible nullref.	2017-05-18 19:05:03 +09:00
smoogipooo	c80e2e8f0a	Attempt to solve warnings...	2017-05-18 18:46:50 +09:00
smoogipooo	35bd608a4a	Simplify method parameters, make conversion work again.	2017-05-18 18:41:44 +09:00
smoogipooo	a30e49d21b	Add hold end samples.	2017-05-18 18:19:29 +09:00
smoogipooo	53a2f34f8b	Set siblings, removing warning.	2017-05-18 18:15:09 +09:00
smoogipooo	2c97313a20	Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion	2017-05-18 18:14:11 +09:00
smoogipooo	af129b3eab	Add siblings, will be used in generator branches.	2017-05-18 18:13:08 +09:00
smoogipooo	eae4f8b412	Fix compilation due to previously-removed function.	2017-05-18 18:11:09 +09:00
smoogipooo	2af025e630	Add IHasDistance object pattern generation.	2017-05-18 18:09:13 +09:00
smoogipooo	afd3eb4b8d	Implement things a bit more to remove warnings.	2017-05-18 18:04:32 +09:00
EVAST9919	640c940fce	Make field readonly	2017-05-18 11:50:15 +03:00
EVAST9919	1d80555d3b	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 11:47:52 +03:00
smoogipooo	873ff34487	This function can't be used for all pattern generations. So let's not use it.	2017-05-18 17:43:59 +09:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
smoogipooo	af34777f44	Trim whitespace.	2017-05-18 17:00:11 +09:00
Dan Balasescu	f7a1b21e77	Merge branch 'master' into mania-beatmap-conversion	2017-05-18 15:44:32 +09:00
smoogipooo	164a1bb743	Remove distance object pattern generator for now (next PR).	2017-05-18 15:38:15 +09:00
Dean Herbert	dc5a9eb740	Merge pull request #775 from smoogipooo/fast-random ... Add FastRandom class for use in beatmap conversion.	2017-05-18 15:38:14 +09:00
Dean Herbert	521a0d8d04	Merge branch 'master' into fast-random	2017-05-18 15:33:00 +09:00
smoogipooo	1fa1897d71	Define the concept of patterns + additional comments.	2017-05-18 15:05:45 +09:00
smoogipooo	618c162535	Move more functions to ObjectConversion + resharper cleanup.	2017-05-18 14:17:23 +09:00
smoogipooo	de8271ad6b	Fix out of range exceptions due to out-of-order hitobjects.	2017-05-18 14:08:48 +09:00
smoogipooo	6dae5cbacf	Fix distance object conversion not calculating end time.	2017-05-18 14:08:32 +09:00
smoogipooo	6010243736	Fix incorrect uint_to_real factor.	2017-05-18 14:07:57 +09:00
smoogipooo	7c48fb2b92	General fixes.	2017-05-18 13:37:22 +09:00
smoogipooo	c1a44ea6b4	Renaming + commenting.	2017-05-18 13:25:55 +09:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
smoogipooo	16eda2467f	Make compile.	2017-05-18 12:50:12 +09:00
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