2654 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipooo	072eea82ea	Fix up combo colours + a few nullrefs.	2017-03-14 14:50:12 +09:00
smoogipooo	854212a7aa	Merge branch 'master' into beatmap_parsing ... Conflicts: osu.Desktop.VisualTests/app.config osu.Game.Modes.Catch/CatchRuleset.cs osu.Game.Modes.Mania/ManiaRuleset.cs osu.Game.Modes.Mania/app.config osu.Game.Modes.Osu/OsuRuleset.cs osu.Game.Modes.Osu/app.config osu.Game.Modes.Taiko/TaikoRuleset.cs osu.Game/Modes/Ruleset.cs osu.Game/app.config osu.Game/osu.Game.csproj	2017-03-14 13:39:19 +09:00
smoogipooo	b82185a667	Rename to not use acronyms.	2017-03-14 13:24:07 +09:00
smoogipooo	876469faa1	Remove a few more things that aren't required yet.	2017-03-14 13:17:11 +09:00
smoogipooo	5a47fd659c	Fix up warnings, convert back to float position.	2017-03-14 13:11:07 +09:00
smoogipooo	bbd81dbc47	Add license headers.	2017-03-14 13:02:42 +09:00
Dean Herbert	66d1e7c732	Merge pull request #469 from smoogipooo/mod_application ... Mod application	2017-03-14 12:59:33 +09:00
smoogipooo	34ab708cb6	Fix using statement before license.	2017-03-14 12:58:31 +09:00
smoogipooo	99c23d8715	I don't like this renaming.	2017-03-14 12:54:09 +09:00
smoogipooo	db8cbba8d5	Okay resharper u da boss.	2017-03-14 12:52:12 +09:00
smoogipooo	a502ff2c87	Fix post-merge issues.	2017-03-14 12:47:29 +09:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
smoogipooo	6ebd88060a	Simplify foreach.	2017-03-14 12:38:30 +09:00
smoogipooo	bc5912eab5	Applyable -> Applicable.	2017-03-14 12:32:31 +09:00
Dean Herbert	0da950beac	Fix KeyCounter M1 M2 display.	2017-03-14 12:31:09 +09:00
Dean Herbert	98f13be7ca	Merge pull request #472 from peppy/general-fixes ... Update framework.	2017-03-14 12:12:02 +09:00
Dean Herbert	1eacafc7b4	Merge branch 'master' into general-fixes	2017-03-14 12:02:24 +09:00
Dean Herbert	9eaec6945f	Update resources.	2017-03-14 12:02:06 +09:00
Dean Herbert	4fa037c0b2	Update framework.	2017-03-14 12:01:58 +09:00
Dean Herbert	ba10c3a8db	Revert "Merge pull request #441 from tacchinotacchi/archive-reader" ... This reverts commit 6f20473e65, reversing changes made to c76a495d3d.	2017-03-14 11:46:34 +09:00