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

Afx plus 3.8 #1

Closed
wants to merge 870 commits into from
Closed

Afx plus 3.8 #1

wants to merge 870 commits into from

Conversation

Azaezel
Copy link

@Azaezel Azaezel commented Nov 16, 2015

  1. integration and conflict resolutions
  2. cmake module
  3. opengl shaders
  4. May be a few personal tweaks that might have slipped in. Apologies there.

Do note at time of writing, syncing with development requires the following alterations:
ConsoleType( ByteRange, TypeByteRange, ByteRange)
to
ConsoleType( ByteRange, TypeByteRange, ByteRange, "")

void RenderPassStateBin::initPersistFields()
{
addProtectedField( "stateToken", TYPEID< RenderPassStateToken >(), Offset( mStateToken, RenderPassStateBin ),
_setStateToken, _getStateToken );

Parent::initPersistFields();
}
to
void RenderPassStateBin::initPersistFields()
{
addProtectedField( "stateToken", TYPEID< RenderPassStateToken >(), Offset( mStateToken, RenderPassStateBin ),
_setStateToken, _getStateToken, "" );

Parent::initPersistFields();
}

bpay and others added 30 commits March 4, 2015 19:25
Fixes compile errors building with clang-cl, which doesn't define __GNUC__
in MS compatibility mode.
+added: gui slider for maximum exposure of vignetting
+changed: shaders to logical min/max floats
this pr contains the glsl shaders as well and therefore makes the
GarageGames#1225 Pull Request obsolete
…perations

DeferredBumpFeat order of operations corrections
Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files.
further insurance that shadow split stay within bounds.
Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode.
Areloch and others added 26 commits August 29, 2015 20:05
Will go ahead and merge this in on the grounds that while it may not technically be possible to make this problem occur(at least no one seems to have been able to reproduce it), having the clamping of values is generally a smart move on principle and prevents even the weird outliers from happening.
partly addresses C4946 warnings
32 and 64 bit windows can handle that. 64 bit linux no likey mixing longs and ints.
… light's params instead of sticking with the default 0-1 brightness range.
void GuiTextEditCtrl::execConsoleCallback() reversion
CMake NMake fix to place exe in game directory
 into afx_plus_3.8

Conflicts:
	Engine/source/T3D/aiPlayer.cpp
	Engine/source/T3D/aiPlayer.h
	Engine/source/T3D/gameBase/gameConnection.cpp
	Engine/source/T3D/player.cpp
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/consoleObject.cpp
	Engine/source/console/sim.h
	Engine/source/gui/core/guiCanvas.cpp
	Engine/source/gui/core/guiCanvas.h
	Engine/source/scene/sceneObject.cpp
	Engine/source/scene/sceneObject.h
	Engine/source/sim/netEvent.cpp
	Engine/source/terrain/terrData.cpp
	Engine/source/ts/tsShapeInstance.h
	README.md
@Azaezel
Copy link
Author

Azaezel commented Nov 16, 2015

http://forums.torque3d.org/viewtopic.php?f=10&t=443#p3809 looks like this'll need followup.

@Azaezel
Copy link
Author

Azaezel commented Dec 1, 2015

@faustlogic: no new reports, so should be good to go.

@Azaezel Azaezel closed this Jul 23, 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