Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 2.4 #135

Merged
merged 11 commits into from
Oct 25, 2016
Merged

Update to 2.4 #135

merged 11 commits into from
Oct 25, 2016

Conversation

dabbertorres
Copy link
Contributor

Addresses #132.

Commit 09f8dd2 completes #117.

Window.SetMouseCursorGrabbed
RenderWindow.SetMouseCursorGrabbed

Also:
	Some function reordering according to SFML.
	A little doc comment cleanup.
	Deprecation of RenderWindow.Capture().
Deprecated Text.Color in favor of:
Text.FillColor
Text.OutlineColor

In addition:
Text.OutlineThickness
Updated shader example to use it.

Added Glsl.cs containing structs for passing to SFML representing GLSL
types.

Deprecated SetParameter methods.

Changed Transform data members to internal from private so the Glsl Mat
types can set their data from a Transform.
@ghost
Copy link

ghost commented Oct 24, 2016

You are just awesome, thanks for your effort! <3

@LaurentGomila
Copy link
Member

Thanks a lot!

It's a huge PR to review, so as usual I trust you :)

@LaurentGomila LaurentGomila merged commit 7c8ca44 into SFML:master Oct 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants