4150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	c5afb4b2a0	Merge remote-tracking branch 'upstream/master' into replay-playback-accuracy	2017-04-26 19:53:30 +09:00
Dan Balasescu	df5a95b675	Merge branch 'master' into fix-mouse-button-disable	2017-04-26 19:53:13 +09:00
Dean Herbert	bd71b23699	Update framework again.	2017-04-26 19:52:51 +09:00
Dean Herbert	eee3c9166a	Merge pull request #676 from smoogipooo/taiko-fixes ... Adjust Swell hit speed.	2017-04-26 19:37:13 +09:00
Dean Herbert	4087b638cf	Merge branch 'master' into taiko-fixes	2017-04-26 19:27:05 +09:00
Dean Herbert	e826f17eb0	Fix get-set mismatch.	2017-04-26 19:25:41 +09:00
Dean Herbert	7ef9af92f3	Merge pull request #663 from smoogipooo/fix-drumroll-conversion ... Fix drumroll conversion	2017-04-26 19:22:50 +09:00
Dean Herbert	49c02f5ad6	Merge branch 'master' into fix-drumroll-conversion	2017-04-26 19:16:40 +09:00
Dean Herbert	2d0b428a7a	Merge pull request #675 from smoogipooo/taiko-difficulty-calculation ... Implement Taiko difficulty calculation.	2017-04-26 19:01:01 +09:00
Dean Herbert	f48d497737	Fix disabling mouse buttons causing auto to stop working.	2017-04-26 18:56:20 +09:00
Dean Herbert	c2108b7706	Use object initialiser.	2017-04-26 18:32:47 +09:00
Dean Herbert	b6f838f536	Fix potential nullref.	2017-04-26 18:32:40 +09:00
Dean Herbert	867c16665b	Update framework.	2017-04-26 18:22:09 +09:00
Dean Herbert	4656a7170a	Add very basic lead-in support.	2017-04-26 18:17:25 +09:00
Dean Herbert	9d14b6e1e9	Make SongProgress return the actual time value via OnSeek.	2017-04-26 18:17:17 +09:00
Dean Herbert	01caaf44f3	Add a decoupled clock to allow for lead-in and lead-out time.	2017-04-26 18:16:55 +09:00
smoogipooo	47cd91fa63	CI fixes.	2017-04-26 17:04:57 +09:00
smoogipooo	8df3c3f736	Adjust Swell hit speed.	2017-04-26 16:28:53 +09:00
smoogipooo	d9dec9d444	Implement Taiko difficulty calculation.	2017-04-26 15:50:08 +09:00
Dan Balasescu	22be765323	Update HitObject.cs	2017-04-26 14:45:30 +09:00
smoogipooo	4c2985b6d1	Use CRLF instead of LF.	2017-04-26 14:40:40 +09:00
smoogipooo	28f7e0cdba	Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.	2017-04-26 14:12:21 +09:00
smoogipooo	ac5f70b765	Fix drum roll conversion not generating strong hits.	2017-04-26 13:48:31 +09:00
smoogipooo	324d5c1093	Merge remote-tracking branch 'origin/master' into fix-drumroll-conversion	2017-04-26 13:17:28 +09:00
Dean Herbert	e003d9fc3c	Add basic replay frame accurate "seeking". ... Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.	2017-04-25 22:59:58 +09:00
Dean Herbert	d476482493	Add basic seeking support when a replay is loaded.	2017-04-25 22:59:51 +09:00
Dean Herbert	eb5d334838	Add non-toggle support for showing seek bar in SongProgress.	2017-04-25 22:59:46 +09:00
Dean Herbert	36c649f965	Merge pull request #673 from peppy/general-fixes ... Update framework.	2017-04-25 21:51:03 +09:00
Dean Herbert	aa534ead7d	Update framework.	2017-04-25 20:52:26 +09:00
Dean Herbert	73b8d58944	Merge pull request #658 from Jorolf/slider-stuff ... Slider tooltip and letterboxing/dim changes	2017-04-25 20:03:59 +09:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Dean Herbert	8d1ad1ab8c	Merge pull request #671 from peppy/general-fixes ... Update README.	2017-04-25 19:42:36 +09:00
Dean Herbert	dd7c856228	Merge branch 'master' into general-fixes	2017-04-25 19:36:09 +09:00
Dean Herbert	5dddd49c96	Merge pull request #634 from ColdVolcano/intro-improvements ... Bind MenuMusic and MenuVoice	2017-04-25 13:39:30 +09:00
Dean Herbert	f93adebc52	Minor style fixes.	2017-04-25 13:33:34 +09:00
ColdVolcano	51c577624b	Remove BeatmapInfo field	2017-04-24 22:59:33 -05:00
ColdVolcano	1df50adc3a	Post-merge fixes (and CodeFactor fixes)	2017-04-24 22:48:25 -05:00
ColdVolcano	630c556b80	Merge branch 'master' of https://github.com/ppy/osu into intro-improvements	2017-04-24 22:42:28 -05:00
ColdVolcano	12036cada5	Merge branch 'intro-improvements' of https://github.com/ColdVolcano/osu into intro-improvements	2017-04-24 22:32:23 -05:00
ColdVolcano	e6428dd0c2	Merge branch 'master' of https://github.com/ColdVolcano/osu into intro-improvements	2017-04-24 22:32:10 -05:00
Dean Herbert	b80fa74f47	Update README.	2017-04-25 11:11:57 +09:00
Dean Herbert	fd6f1db316	Merge pull request #670 from peppy/info-wedge-design-update ... Update BeatmapInfoWedge design	2017-04-25 08:56:41 +09:00
Dan Balasescu	91b264da1a	Merge branch 'master' into info-wedge-design-update	2017-04-25 08:14:59 +09:00
Dan Balasescu	39ff081ff9	Merge pull request #668 from peppy/general-fixes ... General fixes	2017-04-25 08:14:44 +09:00
Dan Balasescu	b3e21f6f99	Merge branch 'master' into general-fixes	2017-04-25 08:05:03 +09:00
Dan Balasescu	908f32b221	Merge pull request #669 from peppy/online-metrics ... Retrieve online metrics	2017-04-25 08:02:56 +09:00
Dan Balasescu	f329587bd4	Fix mismatched braces.	2017-04-25 08:02:09 +09:00
Jorolf	a6ea6738e5	add some spaces after commas	2017-04-24 17:10:00 +02:00
Jorolf	7ef90e6597	Merge branch 'master' of git://github.com/ppy/osu into slider-stuff	2017-04-24 17:05:32 +02:00
Dean Herbert	b8bf942860	Don't use parallel compiling on non-windows platforms. ... This currently triggers a unhandled exception in msbuild.	2017-04-24 22:14:19 +09:00