6374 Commits

Author	SHA1	Message	Date
Dean Herbert	338eaad0e5	Merge remote-tracking branch 'upstream/master' into background-blur	2018-01-10 13:38:53 +09:00
Dean Herbert	9ec8f130a6	Ensure changes are only applied when we are the current screen	2018-01-10 13:24:26 +09:00
Dean Herbert	9d099feadc	Merge branch 'master' into fix-catcher-width	2018-01-10 10:04:10 +09:00
Dean Herbert	fcb197f7b6	Simplify logic	2018-01-09 22:21:15 +09:00
Dean Herbert	2518d16a77	Denote unused variable	2018-01-09 21:34:31 +09:00
Dean Herbert	c2fadcfc1f	Merge branch 'master' into background-blur	2018-01-09 21:20:05 +09:00
Dean Herbert	a3f05ca9ec	Avoid unnecessary use of linq	2018-01-09 12:43:10 +09:00
Dean Herbert	b90b1e326e	Merge branch 'master' into fix-randomizer	2018-01-09 12:00:21 +09:00
Dean Herbert	4c0259a040	Merge branch 'master' into fix-storyboard-variables	2018-01-09 11:50:03 +09:00
Aergwyn	f6c168be27	add skip cutscene as "in game" keybinding	2018-01-08 18:22:43 +01:00
Aergwyn	140a09ba3d	fix requests not cancelling properly + formatting	2018-01-05 19:13:54 +01:00
Dean Herbert	d1f03ebf0c	Update in line with framework	2018-01-05 20:29:14 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	01038bd9bb	Merge branch 'master' into mania-rc-cleanup	2018-01-05 10:18:15 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
james58899	0158246ba1	AppVeyor	2018-01-04 19:23:00 +08:00
james58899	dcc4e863ab	move variables to StoryboardDecoder	2018-01-04 19:04:52 +08:00
Dean Herbert	c8ec27c4de	Remove redundant prefix	2018-01-04 16:31:41 +09:00
Dean Herbert	152b846cff	Fix incorrect scaling of hitobjects in catch	2018-01-04 16:29:53 +09:00
Dean Herbert	9bce322682	Merge branch 'master' into wedge-unicode	2018-01-04 15:09:31 +09:00
Endrik Tombak	ce156098f6	Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer	2018-01-03 12:33:43 +02:00
Endrik Tombak	969fa65c42	Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer	2018-01-03 12:31:59 +02:00
Endrik	35af5d1ce6	Merge branch 'master' into fix-randomizer	2018-01-03 12:25:07 +02:00
smoogipoo	6d253fd33c	Add a way to adjust the conversion process with mods	2018-01-03 19:06:20 +09:00
james58899	89fe567496	use FileSafety.PathSanitise	2018-01-03 17:57:24 +08:00
smoogipoo	bd171926d6	Remove AvailableColumns from ManiaRulesetContainer ... Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.	2018-01-03 18:44:25 +09:00
Dean Herbert	532c455f92	Merge branch 'master' into change-audio-settings-icon	2018-01-03 14:34:21 +09:00
Dan Balasescu	7ba59d9d56	Merge branch 'master' into fix-import-context-state	2018-01-03 14:21:04 +09:00
Dan Balasescu	2a6068f8e7	Merge branch 'master' into fix-play-song-select-tests	2018-01-03 14:12:49 +09:00
Dan Balasescu	e6df965da7	Merge branch 'master' into fix-testcase-performance	2018-01-03 14:04:34 +09:00
Dan Balasescu	262a7f7d19	Merge branch 'master' into large-texture-store	2018-01-03 13:56:39 +09:00
Dan Balasescu	d167663340	Merge branch 'master' into large-texture-store	2018-01-03 13:50:49 +09:00
Dean Herbert	b8fa33459a	Merge branch 'master' into disable-unimplemented-mods	2018-01-03 13:39:29 +09:00
Dean Herbert	61c2bf7ebe	Fix TestCasePerformancePoints binding to global beatmap ... and never unbinding	2018-01-03 13:34:27 +09:00
Dan Balasescu	fa6db30d30	Fix broken xmldoc param	2018-01-03 13:12:49 +09:00
Dean Herbert	2291053205	Merge branch 'master' into wedge-unicode	2018-01-03 13:12:42 +09:00
Felix Ang	3e6f0c198c	Remove tab	2018-01-02 18:02:04 +01:00
Felix Ang	dccc134efa	Don't allow auto to fail	2018-01-02 17:53:29 +01:00
Dean Herbert	1c3541f18e	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 16:58:28 +09:00
Dean Herbert	0e1b033008	Improve mod cycling logic further	2018-01-02 16:55:03 +09:00
Dean Herbert	f72239ef7a	Centralise deselect logic and add animation to deselection	2018-01-02 16:09:22 +09:00
Dean Herbert	71bcebe7e1	Fix selections occurring even though buttons aren't selected	2018-01-02 16:08:48 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Dean Herbert	f419518887	Make comment xmldoc	2018-01-02 15:33:00 +09:00
Dean Herbert	4f8a830fbf	Fix potential race condition with score retrieval	2018-01-02 15:30:29 +09:00
Dean Herbert	161e8d44b4	Merge branch 'master' into supporter-leaderboards	2018-01-02 15:09:52 +09:00
Dan Balasescu	5f3dbfef47	Merge branch 'master' into hide-unavailable-functions	2018-01-02 12:59:12 +09:00
Dan Balasescu	91c49913c9	Merge branch 'master' into focused-overlay-improvements	2018-01-02 12:44:09 +09:00
Dean Herbert	7154efa1c6	Refresh import context on import error	2018-01-02 12:31:21 +09:00
Dean Herbert	2354163900	Change icon for audio settings	2018-01-02 12:30:55 +09:00