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

Fnf 6 #3186

Draft
wants to merge 20 commits into
base: release6
Choose a base branch
from
Draft

Fnf 6 #3186

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c72b219
Enable GLSL 3.00 migration
EliteMasterEric Dec 2, 2022
f2959a6
Fix issue causing his to be null on HTML5
EliteMasterEric Nov 3, 2023
8708ef1
Merge remote-tracking branch 'eric/bugfix/glsl-300-shader' into dev-new
EliteMasterEric Dec 14, 2023
9bdea91
Merge remote-tracking branch 'eric/bugfix/switch-state-crash' into de…
EliteMasterEric Dec 14, 2023
adcaa36
Merge remote-tracking branch 'flixel/dev' into dev
EliteMasterEric Dec 20, 2023
a837386
Readd wasDestroyed warnings to camera draw functions.
EliteMasterEric Dec 20, 2023
6af9faf
Update BitmapFrontEnd.hx
EliteMasterEric Jan 17, 2024
8c030ad
Update FlxGraphic.hx
EliteMasterEric Jan 17, 2024
b2d2363
Prevent readding collections.
EliteMasterEric Jan 17, 2024
07c6018
Merge branch 'dev' of https://github.com/FunkinCrew/flixel into dev
EliteMasterEric Jan 17, 2024
25c84b2
Merge remote-tracking branch 'flixel/dev' into dev
EliteMasterEric Feb 5, 2024
2afdd54
Merge remote-tracking branch 'flixel/release6' into dev-6.0.0
EliteMasterEric Feb 6, 2024
4d054bd
Merge remote-tracking branch 'flixel/dev' into dev-6.0.0
EliteMasterEric Feb 13, 2024
edfaf85
Fix a crash when flickering in onComplete
EliteMasterEric Mar 13, 2024
44f2961
Include the text in the bitmap key.
EliteMasterEric Mar 13, 2024
5823c46
Add convenience functions to FlxFlicker.
EliteMasterEric Mar 13, 2024
a7d8e3b
debug pointer accounts for flxsprite opacity
ninjamuffin99 Apr 27, 2024
735187e
Merge remote-tracking branch 'flixel/release6' into HEAD
EliteMasterEric May 28, 2024
0acbd85
Merge remote-tracking branch 'flixel/release6' into dev-6.0.0
EliteMasterEric Jun 11, 2024
a5635ac
Merge branch 'dev-6.0.0' into fnf-6
Geokureli Jun 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flixel/graphics/tile/FlxGraphicsShader.hx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FlxGraphicsShader extends GraphicsShader
openfl_ColorOffsetv = colorOffset / 255.0;
openfl_ColorMultiplierv = colorMultiplier;
}
}")
}", true)
@:glFragmentHeader("
uniform bool hasTransform;
uniform bool hasColorTransform;
Expand Down Expand Up @@ -62,7 +62,7 @@ class FlxGraphicsShader extends GraphicsShader
}
return vec4(0.0, 0.0, 0.0, 0.0);
}
")
", true)
@:glFragmentSource("
#pragma header

Expand Down
Loading