812 Commits

Author	SHA1	Message	Date
Andrey Zavadskiy	2f9a15092b	Refactor pause buttons	2017-03-28 04:52:11 +03:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
Dean Herbert	0ad070c2d8	Update grade textures.	2017-03-27 22:24:47 +09:00
Jorolf	775fd63d0f	Added difficulty container	2017-03-25 23:33:03 +01:00
Jorolf	d8724e5e3e	Add metadata details	2017-03-24 23:02:24 +01:00
DrabWeb	f0035659db	Unused using	2017-03-24 00:45:19 -03:00
DrabWeb	a6dfed9668	Formatting	2017-03-24 00:41:56 -03:00
DrabWeb	0edee04200	Use OsuColour instead of static colours	2017-03-24 00:41:14 -03:00
Dean Herbert	cb0c7dca71	Merge branch 'master' into taiko_scoreprocessing	2017-03-24 12:25:19 +09:00
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
DrabWeb	b56fb310bf	More cleanup	2017-03-23 23:38:23 -03:00
smoogipooo	2074812f46	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
DrabWeb	0a11d035fe	Formatting	2017-03-23 09:07:13 -03:00
DrabWeb	b429d8f1b3	More proper fix	2017-03-23 09:05:53 -03:00
DrabWeb	3364801221	Fix for the fix	2017-03-23 08:32:24 -03:00
DrabWeb	bbca6cf602	Fix bottom square being clipped	2017-03-23 08:13:03 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
Dean Herbert	63d7c5a5a3	Pressing back while mod select is visible should close mod select before exiting.	2017-03-23 19:35:46 +09:00
Dean Herbert	8c4fd44a85	Tidy up song select footer and fix depth of mod select vs osu! cookie.	2017-03-23 19:32:58 +09:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	3923892863	Delete SongProgressGraphColumn.cs	2017-03-23 07:20:16 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	b5d661b53a	some fixing and restyling.	2017-03-23 18:20:00 +09:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	644e9ae9d5	Increase padding to make flyte happy.	2017-03-23 16:36:52 +09:00
Dean Herbert	6bcbd116c8	Only get APIAccess from DI (it's all we need).	2017-03-23 16:32:35 +09:00
Dean Herbert	3ae7d0cb98	Better handle the passing of Beatmap and updating of scores. ... PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.	2017-03-23 16:31:08 +09:00
Dean Herbert	a561611125	Set default tab to global scores. ... This will need to be saved to the config file eventually.	2017-03-23 16:29:10 +09:00
Dean Herbert	022fd625df	Remove transitions for now ... If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.	2017-03-23 16:28:45 +09:00
DrabWeb	88d878e1d5	Formatting	2017-03-23 02:47:27 -03:00
DrabWeb	b8129526a4	Typo	2017-03-23 02:29:23 -03:00
Dean Herbert	e77229b34b	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 14:26:00 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	b8b45262c5	Formatting	2017-03-23 01:35:55 -03:00
DrabWeb	67421cdf1c	Even though it was 5 minutes ago what was I thinking	2017-03-23 01:34:06 -03:00
DrabWeb	677b8afc1f	Integration	2017-03-23 01:19:29 -03:00
DrabWeb	87b8015e8f	Cleanup	2017-03-23 00:29:28 -03:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
DrabWeb	5ebbc2c0ba	Formatting	2017-03-22 09:33:01 -03:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
DrabWeb	333008e26d	Formatting	2017-03-22 08:59:44 -03:00
DrabWeb	340ddb59cd	License headers	2017-03-22 08:54:21 -03:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Dean Herbert	f3486b7288	Add correct lifetime expiry for leaderboard content	2017-03-22 09:07:02 +09:00
Dean Herbert	7387dbd9fc	Tidy up LeaderboardScore	2017-03-22 09:04:33 +09:00
Dean Herbert	1699daaf7f	Make DrawableRank safer.	2017-03-22 08:32:28 +09:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Dean Herbert	0b2bb2ea0e	Fix typo in font name declaration.	2017-03-21 22:51:49 +09:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	09bf014ded	Simplify fade out gradient code.	2017-03-19 21:49:29 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Dean Herbert	256a3268ac	Inline single usage of EdgeEffect.	2017-03-19 18:51:40 +09:00
Thomas Müller	44f71b3975	Merge branch 'master' into fix-beatmap-options	2017-03-19 09:34:53 +01:00
Dean Herbert	8cb334a118	Adjust sizing a touch.	2017-03-19 16:34:29 +09:00
DrabWeb	b0e7296e25	-IHasDrawableRepresentation, User.Region -> Country	2017-03-19 00:09:58 -03:00
Dean Herbert	3d8ec4fa05	FIx transition not always being correct.	2017-03-19 02:33:25 +09:00
Dean Herbert	3c7b4a8ffa	Fix cursor being displayed during disclaimer.	2017-03-19 01:59:13 +09:00
DrabWeb	0bc8ed9c9e	Use Colour for non-faded scores	2017-03-18 01:56:19 -03:00
DrabWeb	e78069af12	Parenthesis	2017-03-18 01:48:29 -03:00
DrabWeb	b9d5ab5d8c	Only calculate fade for fading leaderboard scores	2017-03-18 01:44:05 -03:00
DrabWeb	fbb8e79f1a	Move ctor above methods	2017-03-17 19:45:51 -03:00
DrabWeb	137611ecf3	Use LeaderboardScore height for fade	2017-03-17 19:07:45 -03:00
DrabWeb	82c02fa1fc	Formatting	2017-03-17 18:29:55 -03:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	27ab8e2e86	Merge	2017-03-17 18:21:35 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
smoogipooo	bcaf12e3d9	Rename Criteria -> CreateCriteria and make into method.	2017-03-18 02:11:14 +09:00
Dan Balasescu	cd30958086	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 01:25:22 +09:00
Dean Herbert	3e3cde01ef	Fix missing permitNulls.	2017-03-17 21:21:16 +09:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	7110ab8e17	Stop cursor moving when paused.	2017-03-17 20:45:27 +09:00
Dean Herbert	0a03bdc428	Add missing license header.	2017-03-17 20:44:02 +09:00
Dean Herbert	6be80c95ae	Preload song select from main menu.	2017-03-17 20:11:59 +09:00
Dean Herbert	c7fa79b027	Fix nullref.	2017-03-17 20:09:23 +09:00
Dean Herbert	907236e475	Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.	2017-03-17 19:54:51 +09:00
Dean Herbert	4b97304603	CarouselContainer -> BeatmapCarousel.	2017-03-17 19:12:54 +09:00
Dean Herbert	dc28f8c79e	Remove all external access to BeatmapGroup.	2017-03-17 19:12:15 +09:00
Dean Herbert	9c664e5b05	Reorganise song select methods to allow for more flexibility.	2017-03-17 11:52:54 +09:00
smoogipooo	9a4af8f194	GetScore -> CreateScore.	2017-03-17 02:03:12 +09:00
smoogipooo	2394e7ff78	Make CheckFailed not actually trigger internal things, and make private.	2017-03-17 01:36:30 +09:00
Dean Herbert	ea642e5ef4	Merge branch 'master' into scoreprocessor_failing_improvements	2017-03-17 00:52:30 +09:00
Dean Herbert	e78bcf8739	Update TabControl in line with framework changes.	2017-03-17 00:39:40 +09:00
smoogipooo	b13340c3c8	Move CheckFailed outside of Schedule().	2017-03-17 00:30:23 +09:00
Dean Herbert	60fc782e93	Merge branch 'master' into beatmap_timinginfo	2017-03-16 23:08:24 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
smoogipooo	5137338c7c	Replace List<ControlPoint> with TimingInfo in Beatmap.	2017-03-16 17:11:24 +09:00
Dean Herbert	e17f728282	Fix CI.	2017-03-16 17:04:03 +09:00
Dean Herbert	1a7c2eda5e	Size FilterControl relatively now that we can.	2017-03-16 17:01:02 +09:00
Dean Herbert	bd5493fb25	Add back correct defaults.	2017-03-16 16:44:14 +09:00
Dean Herbert	334e389518	Tidy up OsuTabControl and FilterControl.	2017-03-16 16:35:44 +09:00
Dean Herbert	4bedd4d2d7	Block input behind FilterControl.	2017-03-16 14:33:31 +09:00
Dean Herbert	da6b98db10	fixup! Filter doesn't need to be public, nor have a property.	2017-03-16 14:23:48 +09:00
Dean Herbert	269c1a5e5c	Reword some comments.	2017-03-16 14:08:37 +09:00
Dean Herbert	352de22590	Filter doesn't need to be public, nor have a property.	2017-03-16 14:08:29 +09:00
Dean Herbert	4d84bf7350	Change difficulty sort to be based on MaxStarDifficulty.	2017-03-16 13:59:23 +09:00
smoogipooo	2a2caeba32	Add better failing support to ScoreProcessor.	2017-03-16 13:39:57 +09:00
Dean Herbert	ff37d2da03	Index -> Rank + some formatting.	2017-03-16 13:15:06 +09:00
Dean Herbert	8e5d83b857	Isolate leaderboard retrieval code into its own method.	2017-03-16 12:56:59 +09:00
smoogipooo	c82ae011fb	Make ScoreProcessors take generic judgements.	2017-03-16 12:45:23 +09:00
Dean Herbert	a22b34817c	Merge branch 'master' into leaderboards	2017-03-16 11:12:53 +09:00
Drew DeVault	01cca1a4d2	Refactor color handling ... colour*	2017-03-15 20:52:31 -04:00
Drew DeVault	db5a1e241a	Don't crash on unimplemented sorts	2017-03-15 20:18:20 -04:00
Drew DeVault	3aecbf5739	Rearrange things somewhat	2017-03-15 20:15:40 -04:00
Drew DeVault	cac6c42aac	Merge remote-tracking branch 'upstream/master' into tab-control	2017-03-15 20:15:28 -04:00
DrabWeb	cf81467e13	Move fade start out of loop	2017-03-15 14:00:31 -03:00
DrabWeb	cd37ebdff2	Fading	2017-03-15 13:57:41 -03:00
DrabWeb	efd617dd34	Formatting	2017-03-15 08:53:36 -03:00
DrabWeb	20685d51cd	Adjust delays to start at 0	2017-03-15 08:51:07 -03:00
DrabWeb	847d485d5f	Remove schedules	2017-03-15 08:49:17 -03:00
DrabWeb	aea9a7b795	LeaderboardScore state, initial delay handled by leaderboard	2017-03-15 08:44:29 -03:00
DrabWeb	7572947214	Badge -> Team	2017-03-15 08:09:44 -03:00
Dan Balasescu	a3906820ec	Merge branch 'master' into beatmap_parsing	2017-03-15 19:29:45 +09:00
Dean Herbert	56868e3c06	Make a few more strings literals.	2017-03-15 19:21:55 +09:00
Dean Herbert	f2cfcdb2ca	Force an OnBeatmapChanged event to invoke when entering a screen.	2017-03-15 19:09:30 +09:00
Dean Herbert	1855f48997	Add cancellation support for API requests.	2017-03-15 18:07:26 +09:00
Dean Herbert	295f821025	Add leaderboard to song select.	2017-03-15 17:11:08 +09:00
Dean Herbert	4f95378f27	Add fade out of previously displayed scores.	2017-03-15 17:10:54 +09:00
Dean Herbert	78efecb89d	Remove Alpha 0.001 hack.	2017-03-15 17:07:56 +09:00
Dean Herbert	775a86e798	Add null-checks and fallbacks to make display work with current API version.	2017-03-15 15:22:46 +09:00
Dean Herbert	1ae4c2dfbb	Remove a lot of customisation from Avatar (and add it in individual usages).	2017-03-15 15:22:28 +09:00
Dean Herbert	7bc0a1fdfe	Use fixed-width for score display.	2017-03-15 15:21:07 +09:00
Dean Herbert	dfc4bccbe0	Add some padding to leaderboard.	2017-03-15 14:42:56 +09:00
Dean Herbert	c1f56c7c0e	Scores should be enumerable.	2017-03-15 14:38:38 +09:00
Dean Herbert	15e713899d	Add a left content area to song select.	2017-03-15 14:34:19 +09:00
Dean Herbert	d96a78459d	Rename ScoreRanks to be in line with current API.	2017-03-15 13:55:29 +09:00
Kelvin	4353c9dc3d	Fixed Warnings	2017-03-14 20:42:02 -07:00
Kelvin	18afd8eabe	Fixed license headers	2017-03-14 20:30:42 -07:00
Dean Herbert	253bcebf51	Merge remote-tracking branch 'upstream/master' into leaderboards ... # Conflicts: # osu.Game/osu.Game.csproj	2017-03-15 12:23:34 +09:00
Kelvin	20e2e7a8c8	Sort on SortTabs ValueChanged	2017-03-14 20:19:41 -07:00
Kelvin	755fb260db	Updated TabControl Usage	2017-03-14 19:52:21 -07:00
Kelvin	ee3d3b682f	Updated usage for DropDownHeader of FilterTabControl	2017-03-14 19:49:40 -07:00
Kelvin	40bcc63a90	Added and styled FilterTabControls	2017-03-14 19:49:40 -07:00
Kelvin	2629f78afc	Add FilterControl and FilterTabControl	2017-03-14 19:49:40 -07:00
Huo Yaoyuan	37ff1f3971	Control footer by virtual property.	2017-03-15 10:10:59 +08:00
DrabWeb	09cb0d6bbc	Proper icons	2017-03-14 12:58:22 -03:00
DrabWeb	94c2734b09	More warnings	2017-03-14 12:15:19 -03:00
DrabWeb	55187a8380	Warnings, accuracy formatting	2017-03-14 11:55:19 -03:00
Huo Yaoyuan	8c991eae01	Fix CI issues.	2017-03-14 22:27:24 +08:00
DrabWeb	4c03b62a75	More usings	2017-03-14 11:23:48 -03: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
DrabWeb	ebe48b7c24	Removed D rank	2017-03-14 11:14:27 -03:00
DrabWeb	322446effe	-Unused usings	2017-03-14 11:11:23 -03:00
DrabWeb	650fc7563d	ScoreRank, Avatar to own files, +DrawableRank	2017-03-14 10:58:28 -03: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
Dean Herbert	8176b4ef77	Fix merge errors.	2017-03-14 22:11:38 +09:00
Dean Herbert	12326f610e	Adjust transition to flyte's liking.	2017-03-14 22:11:29 +09: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
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
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
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
Huo Yaoyuan	9a4247f67e	Make Footer handles hotkey.	2017-03-14 18:16:04 +08: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
Huo Yaoyuan	fae6afa9e3	Create basic SongSelect class.	2017-03-14 16:44:35 +08:00
Huo Yaoyuan	0198593697	Make BeatmapInfoWedge:OverlayContainer and unify transforms.	2017-03-14 16:29:20 +08: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	1f68731a09	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +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
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Dean Herbert	0da950beac	Fix KeyCounter M1 M2 display.	2017-03-14 12:31:09 +09:00
Dean Herbert	1eacafc7b4	Merge branch 'master' into general-fixes	2017-03-14 12:02:24 +09:00
Dean Herbert	4fa037c0b2	Update framework.	2017-03-14 12:01:58 +09: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
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
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	f50e0bbf3c	Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.	2017-03-13 19:15:25 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
smoogipooo	64aab090d5	Instantiate HitRenderer with WorkingBeatmap.	2017-03-12 18:03:13 +09:00
smoogipooo	529cabb001	Make HudOverlay not dependent on Ruleset.	2017-03-10 16:16:07 +09:00
smoogipooo	4015b87965	General fixes.	2017-03-10 13:09:50 +09:00
smoogipooo	31f6cbd8cf	Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.	2017-03-10 12:14:13 +09:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	01c379da19	User invariant culture sorting.	2017-03-09 14:02:20 +09:00
Dean Herbert	9772f2a042	Update framework.	2017-03-09 13:50:33 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Dean Herbert	02cab41d34	Move InputManager to a higher and more implicit level. ... Also makes KeyCounterCollection work with replays.	2017-03-07 19:30:48 +09:00
Dean Herbert	5cbcf7a20a	Fix error-level inspections.	2017-03-07 14:31:54 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	1751532a01	Fix a few regressions.	2017-03-07 13:30:36 +09:00