2441 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DrabWeb	2e8b1ad390	Woops	2017-03-14 10:09:58 -03:00
Seth	21a9996225	Merge branch 'master' into leaderboards	2017-03-14 10:07:33 -03:00
DrabWeb	d53f219051	Adjusted score rank size	2017-03-14 10:04:42 -03: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
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
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
Dean Herbert	66d1e7c732	Merge pull request #469 from smoogipooo/mod_application ... Mod application	2017-03-14 12:59:33 +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
Dean Herbert	29eeebefb0	Merge pull request #474 from huoyaoyuan/fixes ... Fixes	2017-03-14 09:40:02 +09:00
Huo Yaoyuan	e1bd168c16	Remaining GameMode -> Screen.	2017-03-14 07:22:46 +08:00
Huo Yaoyuan	3913a0a9ee	Fix removal of the last one beatmap.	2017-03-14 05:35:58 +08:00
DrabWeb	6bd9e3cac1	+Score ranks	2017-03-13 18:34:43 -03:00
Huo Yaoyuan	14a22f032f	Fix beatmap panel removal.	2017-03-14 04:35:43 +08:00
Huo Yaoyuan	db104d04d3	Use AutoGenerateBindingRedirects instead of explicit app.config.	2017-03-14 03:20:33 +08:00
DrabWeb	74eddc768a	Random diff	2017-03-13 13:02:56 -03:00
DrabWeb	8e90e05f23	Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static	2017-03-13 12:31:46 -03:00
Dean Herbert	2756d5f09f	Merge branch 'master' into mod_application	2017-03-13 23:00:11 +09:00
Dean Herbert	980807d91e	Fix post-merge issues.	2017-03-13 22:33:41 +09:00
Dean Herbert	c51e97e8cc	Merge pull request #471 from smoogipooo/beatmap_conversion ... Beatmap conversion	2017-03-13 22:17:22 +09:00
Dean Herbert	b2981fb729	Merge branch 'master' into mod_application	2017-03-13 22:15:26 +09:00
DrabWeb	442a2c97db	Merge conflicts	2017-03-13 09:44:22 -03:00
DrabWeb	dbc8d513f9	Merge https://github.com/ppy/osu into leaderboards	2017-03-13 09:36:16 -03:00
DrabWeb	9912f5f9e1	Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore	2017-03-13 09:33:25 -03:00
smoogipooo	842f938439	General fixes.	2017-03-13 21:05:34 +09:00
Dean Herbert	6f20473e65	Merge pull request #441 from tacchinotacchi/archive-reader ... Refactor ArchiveReader	2017-03-13 19:46:01 +09:00
Alex Amadori	c84a9d56f5	Fix namespace, comply with naming rules	2017-03-13 11:36:21 +01:00
Alex Amadori	caa6e9c82b	General improvements	2017-03-13 11:29:24 +01:00
Alex Amadori	971d8eb7c5	Merge remote-tracking branch 'upstream/master' into archive-reader	2017-03-13 10:56:31 +01:00
smoogipooo	35ddca78f5	Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).	2017-03-13 14:50:55 +09:00
smoogipooo	0cc2cb3278	Merge branch 'beatmap_parsing' into beatmap_conversion	2017-03-13 14:48:07 +09:00
Dean Herbert	c76a495d3d	Merge pull request #467 from smoogipooo/beatmap_conversion ... Beatmap conversion	2017-03-13 14:04:26 +09:00
smoogipooo	7d129ebd6d	Attempt to fix things.	2017-03-12 22:38:50 +09:00
smoogipooo	447cc17de8	Merge branch 'beatmap_conversion' into mod_application ... Conflicts: osu.Game.Modes.Catch/CatchRuleset.cs osu.Game.Modes.Mania/ManiaRuleset.cs osu.Game.Modes.Osu/OsuRuleset.cs osu.Game.Modes.Taiko/TaikoRuleset.cs	2017-03-12 22:20:52 +09:00