Merge master into netstandard #1214
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Windows only
…e old AsyncLoadWrapper and DelayedLoadWrapper classes. Syntactically mostly the same: Only if you used a DelayedLoadWrapper instance without explicitly setting a TimeBeforeLoad which used to set a default delay of 500 (ms), this will now set it to zero in the new constructor, making it not delayed. This is so that all "AsyncLoadWrapper" constructors will still work. If you want to delay the loading, you will now HAVE to explicitly change the TimeBeforeLoad. Every DelayedLoadWrapper implementation already explicitly defined it, so nothing really had to be changed (except for obviously the naming).
…lasses (use LoadWrapper as the alternative)
…edLoadWrapper.cs files.
…f DelayedLoadWrapper.
…nymore. (Implementation changes too)
…ntent evaluation statement.
…ad-optimization
…" bug" This reverts commit 539c146.
test for some reason
warning required) and made a toggle to show what causes the problem.
Removes the necessity to construct a TestCase to get its description. Removes descriptions where they weren't adding anything to the titles. Also tidies up naming of some TestCases and button layout. Closes ppy#1185.
Add RectangleF.LTRB
Add additional IsFinite checks and remove check from computeDrawInfo
peppy
reviewed
Dec 1, 2017
SampleGame/SampleGame.csproj
Outdated
| @@ -1,5 +1,4 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <Import Project="..\LangVer.props" /> | |||
| <Import Project="..\OpenTK.props" /> | |||
| <Import Project="..\System.Drawing.props" /> | |||
| <Import Project="..\osu.framework.props" /> | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
…lesAssignment Remove suspicious variables assignment
Migrate to C# 7
peppy
previously approved these changes
Dec 1, 2017
peppy
approved these changes
Dec 1, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.