2574 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	e008574697	Merge branch 'master' into more-songselect	2017-03-15 11:24:14 +09:00
Huo Yaoyuan	37ff1f3971	Control footer by virtual property.	2017-03-15 10:10:59 +08:00
Dean Herbert	c35977584a	Merge pull request #484 from peppy/general-fixes ... Update framework.	2017-03-15 10:47:56 +09:00
Dean Herbert	b5a8ef07fe	Update framework.	2017-03-15 09:46:03 +09:00
Huo Yaoyuan	8c991eae01	Fix CI issues.	2017-03-14 22:27:24 +08:00
Huo Yaoyuan	a8d15e616b	Remove parameter of OnSelected.	2017-03-14 22:22:23 +08:00
Huo Yaoyuan	b2dd9afcf3	Update editor workflow and make edit button works.	2017-03-14 22:18:40 +08:00
Huo Yaoyuan	f068f7c4bd	No footer in EditSongSelect.	2017-03-14 21:51:26 +08:00
Huo Yaoyuan	259d39c6ad	Stop playing the track in editor ... to avoid unused member warning	2017-03-14 21:28:33 +08:00
Huo Yaoyuan	f97e8ae97f	Fix typo and warnings.	2017-03-14 21:20:38 +08:00
Huo Yaoyuan	c939897a8a	Revert "Auto assign hotkeys for BeatmapOptionsButton." ... This reverts commit beb0a8ff03.	2017-03-14 21:13:57 +08:00
Huo Yaoyuan	e1cc74bb40	Merge branch 'master' into more-songselect	2017-03-14 20:50:53 +08:00
Huo Yaoyuan	beb0a8ff03	Auto assign hotkeys for BeatmapOptionsButton.	2017-03-14 20:50:43 +08:00
smoogipooo	5b58daa23d	Add check for no combo colours.	2017-03-14 21:47:31 +09:00
Huo Yaoyuan	35a60a8f7d	Use depth to arrange buttons.	2017-03-14 20:19:05 +08:00
Huo Yaoyuan	618e8e822b	Implement EditSongSelect and MatchSongSelect.	2017-03-14 19:53:20 +08:00
Huo Yaoyuan	3871a350f8	Move BeatmapOptions buttons to derived class and simplify.	2017-03-14 19:38:21 +08:00
Dean Herbert	10ab015501	Fix typo.	2017-03-14 20:23:58 +09:00
Dean Herbert	864a97fa45	Output StandardError when an error occurs with a command line invocation.	2017-03-14 20:23:53 +09:00
Dean Herbert	1699c9fb1d	Don't download executables when pulling down existing assets.	2017-03-14 20:23:37 +09:00
Dean Herbert	c192de9ebd	Give deploy uploads more time before dying.	2017-03-14 20:23:23 +09:00
Dean Herbert	31c41e3e14	Don't overwrite newer config files (doesn't seem to fix anything buut..).	2017-03-14 20:23:07 +09:00
smoogipooo	72e1612f32	Null-safety in the case where there are no HitObjects.	2017-03-14 19:44:14 +09:00
Huo Yaoyuan	c4e5eac35b	Move footer stuff to derived.	2017-03-14 18:38:06 +08:00
smoogipooo	c2d80936cf	More closely replicate osu!'s parsing code.	2017-03-14 19:25:04 +09:00
smoogipooo	c315c8690b	Fix incorrect hit object type.	2017-03-14 19:24:47 +09:00
Huo Yaoyuan	9a4247f67e	Make Footer handles hotkey.	2017-03-14 18:16:04 +08:00
smoogipooo	069a7a24ce	Fix defaults not being set (keep in mind this will be changed in a later pullrequest).	2017-03-14 19:04:40 +09:00
smoogipooo	785b970125	Add special interface for LegacyHold.	2017-03-14 18:49:22 +09:00
smoogipooo	a1833fd6b0	Whoops, naming.	2017-03-14 18:49:01 +09:00
smoogipooo	4c7f0fcb73	Fix unit tests.	2017-03-14 18:46:34 +09:00
smoogipooo	ad9583a179	Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing	2017-03-14 18:06:50 +09:00
smoogipooo	1f43370886	Fix failing unit test, move legacy hitobjects to Objects/Legacy/.	2017-03-14 18:06:32 +09:00
Huo Yaoyuan	c3a0549cdd	Move player specific stuff to derived PlaySongSelect.	2017-03-14 16:58:34 +08:00
Dean Herbert	5c2bf02c9d	Merge branch 'master' into beatmap_parsing	2017-03-14 17:50:00 +09:00
smoogipooo	d6ccc66b23	Attempt to fix nullref warning.	2017-03-14 17:46:35 +09:00
Huo Yaoyuan	fae6afa9e3	Create basic SongSelect class.	2017-03-14 16:44:35 +08:00
Dan Balasescu	90447b0ba7	Merge pull request #481 from peppy/general-fixes ... Fix KeyCounter showing keys mapped to mouse buttons as mouse button presses.	2017-03-14 17:43:03 +09:00
Dean Herbert	71959b161d	Update framework.	2017-03-14 17:39:32 +09:00
Huo Yaoyuan	0198593697	Make BeatmapInfoWedge:OverlayContainer and unify transforms.	2017-03-14 16:29:20 +08:00
smoogipooo	2b3b3b7255	Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...).	2017-03-14 17:07:38 +09:00
smoogipooo	6cddd95734	Cleanup.	2017-03-14 17:02:20 +09:00
smoogipooo	e52d5181f7	Fix a few visual tests failing.	2017-03-14 17:01:46 +09:00
smoogipooo	7141bc86d3	Rework beatmap post-processing into HitRenderer.	2017-03-14 17:01:21 +09:00
Dean Herbert	14b22445fa	Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs	2017-03-14 16:15:26 +09:00
Dean Herbert	69e1fa98ef	Update framework.	2017-03-14 16:09:05 +09:00
Dean Herbert	1f68731a09	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +09:00
smoogipooo	90ad2e9731	Remove unused interface.	2017-03-14 15:50:36 +09:00
smoogipooo	e42c790df2	Refactorings.	2017-03-14 15:45:27 +09:00
smoogipooo	e8d5cff790	Fix license headers.	2017-03-14 14:53:17 +09:00