TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-28 00:24:44 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
Torque3D/Engine/source
History
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup 
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
..
app Merge pull request #922 from eightyeight/fix-http-post 2014-11-08 15:35:32 +11:00
cinterface Merge pull request #842 from eightyeight/console-func-refactor 2014-10-24 00:42:58 +11:00
collision Minor Improvement to depthSortList.cpp 2014-11-04 06:18:24 -05:00
component Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
console Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
core Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
environment Merge pull request #618 from BeamNG/clouds_shader_sampler_reg 2014-11-30 02:20:31 +01:00
forest Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
gfx Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
gui Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
i18n Improvements to console refactor code 2012-10-12 19:12:06 +01:00
lighting Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
main Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
materials Merge pull request #940 from BeamNG/add_opengl_support 2014-11-30 02:48:13 +01:00
math Merge pull request #877 from GarageGames/revert-794-euler_to_quat_revert 2014-11-24 11:02:00 +11:00
navigation NavPath::alwaysRender works the same as NavMesh::alwaysRender. 2014-07-08 14:42:59 +02:00
platform Just cleaned up some code 2014-11-30 20:28:40 -05:00
platformMac Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
platformPOSIX Fixes for dedicated build on linux. 2014-05-30 12:35:39 +02:00
platformWin32 Add OpenGL support. 2014-11-08 20:21:50 +01:00
platformX86UNIX Merge pull request #842 from eightyeight/console-func-refactor 2014-10-24 00:42:58 +11:00
postFx This just adds some console spam if the PostEffect Texture isn't found. I had a problem back where it was that I mistyped the texture and it took hours to find it. This way you know right away. 2014-11-30 21:47:45 -05:00
renderInstance Merge pull request #940 from BeamNG/add_opengl_support 2014-11-30 02:48:13 +01:00
scene clean PlaneReflector member variables declaration. 2014-11-30 05:16:56 +01:00
sfx Merge pull request #917 from jamesu/fix_audio_print 2014-11-12 09:37:16 +11:00
shaderGen Clean GLSL fragment shader out. 2014-11-30 23:00:18 +01:00
sim Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
T3D Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
terrain Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
testing All unit tests that run now pass. 2014-09-29 11:38:44 +10:00
ts Merge branch 'development' into style-cleanup 2014-12-15 12:15:55 +11:00
util Fix imposter capture on OpenGL. 2014-11-08 18:57:45 +01:00
windowManager Merge pull request #940 from BeamNG/add_opengl_support 2014-11-30 02:48:13 +01:00
ggEndOfLineFix.txt Engine directory for ticket #1 2012-09-19 11:15:01 -04:00