TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
Torque3D/Engine/source
History
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
2014-10-14 15:09:11 +11:00
..
app Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
cinterface Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
collision Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
component Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
console Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
core Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
environment Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
forest Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
gfx Merge pull request #737 from Azaezel/queryStallPrevention 2014-10-01 23:48:53 -05:00
gui Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
i18n Improvements to console refactor code 2012-10-12 19:12:06 +01:00
lighting kills off the presence of a fake light when there are no others in a given scene 2014-08-14 21:46:48 -05:00
main Load new DLL first so old projects don't see odd behavior. 2014-08-16 11:55:46 +10:00
materials Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
math Merge pull request #801 from eightyeight/gtest-tests 2014-10-02 01:31:13 +02:00
navigation NavPath::alwaysRender works the same as NavMesh::alwaysRender. 2014-07-08 14:42:59 +02:00
platform Merge pull request #801 from eightyeight/gtest-tests 2014-10-02 01:31:13 +02: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 Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
platformX86UNIX Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
postFx Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
renderInstance Merge pull request #612 from GarageGames/platform-type-consistency 2014-05-10 11:40:40 +10:00
scene Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash 2014-06-16 10:57:04 +10:00
sfx Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
shaderGen implicit truncation warning cleanup. 2014-07-09 16:25:42 -05:00
sim Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
T3D Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
terrain Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
testing All unit tests that run now pass. 2014-09-29 11:38:44 +10:00
ts Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
util Merge branch 'master' into console-func-refactor 2014-10-14 15:09:11 +11:00
windowManager Merge pull request #801 from eightyeight/gtest-tests 2014-10-02 01:31:13 +02:00
ggEndOfLineFix.txt Engine directory for ticket #1 2012-09-19 11:15:01 -04:00