9990 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	ab762045d6	Move back to using load(), fix testcase	2018-01-11 16:51:46 +09:00
smoogipoo	d998936e9e	Fix testcase errors	2018-01-11 15:50:44 +09:00
smoogipoo	9ae67b519b	Optimise nested hitobject position computations	2018-01-11 15:25:15 +09:00
smoogipoo	428f8b6670	Fix up license header	2018-01-11 15:08:56 +09:00
smoogipoo	9d00e5bb7d	Make ScrollingHitObjectContainer handle nested hitobjects	2018-01-11 15:08:30 +09:00
james58899	4fa038aa27	if not storyboard file	2018-01-11 13:53:41 +08:00
smoogipoo	a6d8b28221	Add OSD + config value for scroll speed	2018-01-11 13:40:46 +09:00
smoogipoo	3a869edf36	Add a flag to disable user scroll speed adjustments	2018-01-11 12:44:39 +09:00
smoogipoo	6a5a3b01b2	Fix license headers	2018-01-11 12:39:06 +09:00
Aergwyn	312f52072b	enable query ... change Avatar animation too add forgotten usings	2018-01-10 16:46:55 +01:00
ANDY840119-PC\andy840119	118e0b63eb	fix CI error	2018-01-11 00:07:27 +09:00
ANDY840119-PC\andy840119	cc0520d722	1. because set stage's width doesn't help, so use margin instead ... 2. adjust spacing when has different number of stages	2018-01-10 23:47:38 +09:00
james58899	fbffc8bb89	fix load storyboard in osu file	2018-01-10 18:55:04 +08:00
smoogipoo	6255aaab68	Per-hitobject lifetime management	2018-01-10 19:17:43 +09:00
為什麼	fb857c5e37	Merge branch 'master' into master	2018-01-10 18:48:00 +09:00
smoogipoo	9036ea92eb	Run child updates for nested hitobjects when parent hitobjects are masked	2018-01-10 18:29:46 +09:00
smoogipoo	f71d086a41	Fix post-merge issues	2018-01-10 18:08:43 +09:00
smoogipoo	1c412e233a	Update submodules	2018-01-10 18:04:12 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +09:00
smoogipoo	d147683361	Cleanup	2018-01-10 17:39:15 +09:00
Dean Herbert	5b6ddb984f	Merge pull request #1873 from peppy/rulesetinfo-refactor ... Allow rulesets to create their own instantiation info	2018-01-10 17:34:01 +09:00
smoogipoo	c010b48b29	Remove number format specified from OsuSliderBar, override ToolTipText ... Better/cleaner solution.	2018-01-10 17:29:16 +09:00
為什麼	97a3ad775c	Merge branch 'master' into master	2018-01-10 17:05:36 +09:00
Dean Herbert	58626e3b30	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +09:00
smoogipoo	17e7f75aca	More osu!-side bindable fixes	2018-01-10 15:41:13 +09:00
Dean Herbert	fe7ce26b84	Merge pull request #1754 from ColdVolcano/background-blur ... Add setting to adjust background blur level during gameplay	2018-01-10 13:50:08 +09:00
Dean Herbert	338eaad0e5	Merge remote-tracking branch 'upstream/master' into background-blur	2018-01-10 13:38:53 +09:00
Dan Balasescu	4f8ce272ae	Merge pull request #1853 from peppy/drop-fruit ... Drop fruit when last in combo is not caught	2018-01-10 13:35:18 +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	1c20fba6bc	Merge branch 'master' into drop-fruit	2018-01-10 12:29:53 +09:00
Dan Balasescu	632e6fcdd3	Merge pull request #1852 from peppy/fix-catcher-width ... Fix catcher width and playfield scaling	2018-01-10 12:19:37 +09:00
Dean Herbert	1a37812d1f	Merge branch 'master' into expand-social-tab	2018-01-10 11:52:08 +09:00
Dean Herbert	32e237d138	Merge branch 'master' into drop-fruit	2018-01-10 11:39:46 +09:00
Dean Herbert	9d099feadc	Merge branch 'master' into fix-catcher-width	2018-01-10 10:04:10 +09:00
Dean Herbert	77276e3e8e	Merge pull request #1864 from peppy/fix-dotsettings-file ... FIx incorrect licence header template	2018-01-10 09:45:15 +09:00
Dan Balasescu	9afd823d6e	Merge branch 'master' into fix-dotsettings-file	2018-01-10 09:35:49 +09:00
Dan Balasescu	d0fd7fe1f4	Merge pull request #1848 from peppy/drawable-fruit-improvements ... Improvements to osu!catch visuals	2018-01-10 09:34:49 +09:00
Aergwyn	4ce125478a	remove unnecessary Schedules ... one was bugging out when rapidly switching display styles and the other was... unnecessary	2018-01-09 19:03:23 +01:00
Aergwyn	44d821172a	tidying up	2018-01-09 16:29:12 +01:00
Dean Herbert	c4490b5fe8	Fix incorrect licence header	2018-01-09 22:24:12 +09:00
Dean Herbert	fcb197f7b6	Simplify logic	2018-01-09 22:21:15 +09:00
ANDY840119-PC\andy840119	4060583b10	Merge branch 'master' of https://github.com/ppy/osu ... # Conflicts: # osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs	2018-01-09 22:09:25 +09:00
Dan Balasescu	9c602f8770	Merge branch 'master' into drawable-fruit-improvements	2018-01-09 22:06:16 +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	1c9e9cb8af	Merge branch 'master' into expand-social-tab	2018-01-09 21:08:26 +09:00
Dean Herbert	51513b45eb	Merge branch 'master' into fix-dotsettings-file	2018-01-09 14:32:40 +09:00
Dan Balasescu	96226e1f27	Merge pull request #1870 from peppy/mod-per-file ... Move mod implementations to individual files	2018-01-09 14:30:51 +09:00
Dean Herbert	b8bb0a52e3	Move mod implementations to individual files	2018-01-09 14:08:18 +09:00
Dean Herbert	bb57d33239	Merge pull request #1819 from LittleEndu/fix-randomizer ... Don't allow randomizer to select invisible maps	2018-01-09 12:52:25 +09:00