9696 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
FreezyLemon	d93a1fdaae	Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add	2017-12-08 10:30:42 +01:00
FreezyLemon	4b3cf0773d	Various CI adjustments	2017-12-08 09:52:58 +01:00
smoogipoo	5341e79102	Remove SelectionDragger for now	2017-12-08 17:51:15 +09:00
FreezyLemon	9d3d9bcdc8	Corrected the return values for taiko DrawableHit and DrawableHitStrong (OnPressed == true if new Judgement occurs and is a hit)	2017-12-08 09:42:10 +01:00
FreezyLemon	61a6a2919e	Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access	2017-12-08 09:41:13 +01:00
smoogipoo	faa921ba05	Fix up post-merge issues	2017-12-08 17:41:10 +09:00
FreezyLemon	40e750f309	Added sample preloading and playing	2017-12-08 08:32:16 +01:00
FreezyLemon	9e3d439f0a	Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix	2017-12-08 08:30:02 +01:00
Dean Herbert	31884a951a	Remove "redundant" parenthesis	2017-12-08 15:53:59 +09:00
smoogipoo	f41af191ed	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-08 15:13:18 +09:00
Dean Herbert	2e1dfa16a2	Fix checks disallowing import of older beatmaps with no embedded online IDs	2017-12-08 14:59:32 +09:00
Ninjaprawn	a491710fe4	Override IgnoreTooltip in DisplayableModIcon	2017-12-08 14:10:23 +11:00
Ninjaprawn	9b3e666a07	Added IgnoreTooltip to all classes required	2017-12-08 14:10:23 +11:00
Ninjaprawn	f5bea077a0	Subclass ModIcon to remove the tooltip text	2017-12-08 11:26:34 +11:00
FreezyLemon	229c9b5b4e	First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds	2017-12-07 23:11:34 +01:00
FreezyLemon	d2f3d5a807	Added basic SampleInfo.FromSoundPoint and GetChannel methods	2017-12-07 23:09:51 +01:00
Aergwyn	105d01d85b	fix crash when restoring from any non-SongSelect-screen ... removed unwanted refresh	2017-12-07 22:02:53 +01:00
FreezyLemon	43c270ea49	Rolled back the bad earlier implementation	2017-12-07 21:18:51 +01:00
Aergwyn	95955d68ef	rephrased description of local context checking	2017-12-07 14:14:50 +01:00
Aergwyn	1dcbfab18e	removed redundant comment	2017-12-07 13:56:37 +01:00
Aergwyn	76c09ae59e	added comments for local context checking	2017-12-07 13:44:47 +01:00
Dean Herbert	5330ca1fa9	Merge pull request #1635 from awesomecuber/fix-sensitivityslider ... Fix SensitivitySlider keyboard control	2017-12-07 21:16:42 +09:00
Dan Balasescu	9e37a122e1	Merge branch 'master' into fix-sensitivityslider	2017-12-07 21:01:53 +09:00
Dean Herbert	805c61d032	Merge pull request #1603 from santerinogelainen/header-button-should-derive ... Fix beatmap overlay buttons not conforming to design	2017-12-07 20:56:15 +09:00
smoogipoo	d52b84df46	Move KeyboardStep assignment to ctor	2017-12-07 20:53:28 +09:00
smoogipoo	46cd6fdb45	Merge remote-tracking branch 'origin/master' into fix-sensitivityslider	2017-12-07 20:49:48 +09:00
Dean Herbert	24b3b10942	Move drawable assignment to load, remove depth overrides	2017-12-07 20:44:55 +09:00
Dean Herbert	8c89354b36	Remove extra whitespace	2017-12-07 20:44:38 +09:00
Dean Herbert	d36982b1d9	Merge branch 'master' into header-button-should-derive	2017-12-07 20:04:41 +09:00
Dean Herbert	f2eef6621a	Merge branch 'master' into fix-missing-metadata	2017-12-07 19:23:51 +09:00
Dan Balasescu	fe2cc4daad	Merge pull request #1663 from peppy/input-revamp ... Apply changes in line with framework input adjustments	2017-12-07 18:47:40 +09:00
Dean Herbert	13d0524542	Update framework	2017-12-07 18:37:54 +09:00
Dean Herbert	c35c8263b9	Merge remote-tracking branch 'upstream/master' into input-revamp	2017-12-07 18:07:26 +09:00
Dean Herbert	2a0b37e192	Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag ... Fix lagging beatmap carousel because of storyboard-loading	2017-12-07 18:04:38 +09:00
Dean Herbert	2a1a9b9f1f	Fix post-merge issue	2017-12-07 17:26:39 +09:00
smoogipoo	bdf283a4e1	A bit more cleanup	2017-12-07 15:55:38 +09:00
smoogipoo	09f54b06ac	Just don't serialize Author altogether for now	2017-12-07 15:55:22 +09:00
smoogipoo	0ba8988580	Don't serialize Author + add SerializableAttributes	2017-12-07 15:32:39 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
smoogipoo	e573db04d4	Don't serialize HitObject.Kiai	2017-12-07 14:42:36 +09:00
smoogipoo	f5f7658e90	Don't serialize TotalBreakTime	2017-12-07 14:40:28 +09:00
smoogipoo	245b5f759f	Underscore + lowercase all keys	2017-12-07 14:37:12 +09:00
Dean Herbert	a78441bc5a	Apply changes in line with framework input adjustments	2017-12-07 13:16:59 +09:00
smoogipoo	dfc10d42e8	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-07 12:49:27 +09:00
smoogipoo	d026587a91	Add flag to explicitly serialize the type version	2017-12-07 12:49:16 +09:00
smoogipoo	9e51480aa3	Cleanup TypedListConverter a bit	2017-12-07 12:27:30 +09:00
smoogipoo	f1dbcc4f1a	Remove misleading comments	2017-12-07 12:23:53 +09:00
smoogipoo	feef4b1890	Add license header	2017-12-07 12:18:00 +09:00
smoogipoo	fcfdbc8e07	Don't show the migrate button on deployed builds for now	2017-12-07 12:02:48 +09:00
smoogipoo	b0684cb194	Add storyboard test case but disable for now	2017-12-07 12:02:34 +09:00