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

Fixes window icons with SDL #1878

Merged
merged 89 commits into from Jan 16, 2017

Conversation

Projects
None yet
8 participants
@Areloch
Contributor

Areloch commented Dec 22, 2016

Fixes window icons with SDL, hooking it through the var $Core::windowIcon as the path.

Also adjusted the splash window icon to use the var $Core::splashWindowImage for it's path.

In reference to #1746

yourarcade and others added some commits Sep 25, 2016

Update guiOffscreenCanvas.h
Variables to add depth in the .cpp file.
Add a fix to the depth for the target texture
Fix to the named texture to have the 3d depth correctly rendered if a 3d view is inside the guiOffscreenCanvas.
It's disabled by default so it shouldn't change anything to projects that use guiOffscreenCanvas without the texture (like Oculus rendering).
Merge branch 'development' of https://github.com/GarageGames/Torque3D
…into andOrMaybe

Conflicts:
	Engine/source/T3D/staticShape.cpp
Fixes window icons with SDL, hooking it through the var $Core::window…
…Icon as the path.

Also adjusted the splash window icon to use the var $Core::splashWindowImage for it's path.

@Areloch Areloch added the Bugfix label Dec 22, 2016

@Areloch Areloch referenced this pull request Dec 22, 2016

Closed

SDL2 app icon missing #1746

@Duion

This comment has been minimized.

Show comment
Hide comment
@Duion

Duion Dec 23, 2016

Contributor

Tested and it works.

Contributor

Duion commented Dec 23, 2016

Tested and it works.

elfprince13 and others added some commits Jan 6, 2017

Merge pull request #1908 from elfprince13/CMDscanRegisterUseDeprecated
Removed deprecated use of register keyword from the TorqueScript lexer/parser
Merge pull request #1800 from Azaezel/andOrMaybe
clang reports: unclear || + && and &+| mixes.
Fixed StaticShape onUnmount
Somebody made a typo and didn't test if it compiled before committing...
Merge pull request #1926 from elfprince13/patch-1
Call the correct system rename
Hooks the splash window code up to the same image loading code as the…
… icon code, and also adds a check if it tries to load a BMP for either(this is a bad format and really shouldn't be used for pretty much anything).

Also includes a icon for the templates.

@Areloch Areloch merged commit 0aea1d5 into GarageGames:development Jan 16, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment