TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Torque3D/Engine/source
History
AzaezelX dd1470202d Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
..
afx Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
app Clean up redundant variables 2019-02-06 15:03:06 -05:00
assets Tweaks to the Asset/Module info echo behavior to spam the console less. 2019-02-23 14:20:57 -06:00
cinterface Integrate new CInterface into the engine-console 2018-04-21 12:04:15 +02:00
collision Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess 2018-04-23 10:08:14 -05:00
console Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
core Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
environment Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
forest Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
gfx Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
gui Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
i18n Eliminate unnecessary uses of ConsoleFunction 2018-04-17 21:41:29 +02:00
lighting Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
main requested revision: use dword just in case of compiler shenanigans 2018-02-26 22:34:21 -06:00
materials shifted forward lit probe lighting to pre-rt lighting in keeping with the deferred methodologies. in diong so, also needed to add a vertex feature for in/out tangent space normals detection. also in keeping with the fact we sample the deferred albedo result-buffer, fed the createForwardSurface the output target so that can take color multiplication et al instead of just raw albedo 2019-04-29 17:39:47 -05:00
math Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
module Tweaks to the Asset/Module info echo behavior to spam the console less. 2019-02-23 14:20:57 -06:00
navigation the buildtiles method does not in fact build tiles right then and there, but instead queues tiles to update themselves over time. as such, simply disabling then enabling collision no longer functions (and how it did before so before is frankly likely due to exploiting a bug someplace upstream). as such, we set the same flag for NavMeshUpdateAll as we do for NavMeshIgnore to filter something as hidden from navmesh generation or not on a permanent, instead of a temporary basis via removing from the physics sim since it's likely to still be generating by the time it's put back. 2019-03-06 18:14:36 -06:00
persistence Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess 2018-03-28 15:42:34 -05:00
platform Merge pull request #2220 from irei1as/development 2019-03-30 18:42:19 -05:00
platformMac corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
platformPOSIX Use strncat instead of strcat to prevent some buffer overflows 2018-03-06 00:48:44 -05:00
platformSDL Merge pull request #2300 from OTHGMars/SDL_Joystick2 2019-01-21 15:17:31 -06:00
platformWin32 Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
platformX86UNIX no message 2019-01-02 17:53:17 -06:00
postFx Correct stateblock settings to display probes more correctly without crushing other forward elements. 2019-02-18 00:43:21 -06:00
renderInstance Ongoing fiddling with correcting the forward render behavior. 2019-04-29 00:07:38 -05:00
scene Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
sfx Merge pull request #2220 from irei1as/development 2019-03-30 18:42:19 -05:00
shaderGen Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
sim Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
sqlite Sqlite Console refactor, also rename param to make tooltip function more helpful 2019-01-10 21:31:17 +00:00
T3D Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
terrain Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
testing corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
ts Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
util Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
windowManager Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 2019-05-01 23:18:31 -05:00
.gitattributes Somebody broke SDL when they updated it. The new version depends on AudioToolbox, so added that as dependency in torque3d.cmake 2017-01-13 10:42:52 -05:00
ggEndOfLineFix.txt Engine directory for ticket #1 2012-09-19 11:15:01 -04:00