| .. |
|
afx
|
Update afxRenderHighlightMgr.cpp
|
2019-01-07 11:41:17 -06:00 |
|
app
|
Merge pull request #2248 from lukaspj/new-cinterface
|
2018-12-09 15:28:22 -06:00 |
|
assets
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
cinterface
|
|
|
|
collision
|
Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
|
2018-04-23 10:08:14 -05:00 |
|
console
|
Merge pull request #2248 from lukaspj/new-cinterface
|
2018-12-09 15:28:22 -06:00 |
|
core
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
environment
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
forest
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
gfx
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
gui
|
corrects a pair of conversions. one object oriented, one not.
|
2018-12-12 14:52:14 -06:00 |
|
i18n
|
|
|
|
lighting
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
main
|
|
|
|
materials
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
math
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
module
|
|
|
|
navigation
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
persistence
|
|
|
|
platform
|
Merge pull request #2246 from lukaspj/update-cinterface
|
2018-12-09 15:24:29 -06:00 |
|
platformMac
|
|
|
|
platformPOSIX
|
|
|
|
platformSDL
|
|
|
|
platformWin32
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
platformX86UNIX
|
|
|
|
postFx
|
|
|
|
renderInstance
|
|
|
|
scene
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
sfx
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
shaderGen
|
|
|
|
sim
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
sqlite
|
|
|
|
T3D
|
nextfreemask does nothing for proximity mines as there are no subclasses on this chain, but does bump it's enum value over the limit with the new addition to sceneobject. so killed it.
|
2019-01-31 06:45:10 -06:00 |
|
terrain
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
testing
|
corrects a pair of conversions. one object oriented, one not.
|
2018-12-12 14:52:14 -06:00 |
|
ts
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
util
|
Merge branch 'development' into EngineAPI-Refactor
|
2018-12-09 14:48:50 -06:00 |
|
windowManager
|
Merge pull request #2284 from OTHGMars/SDLMonitor
|
2018-12-09 15:36:15 -06:00 |
|
.gitattributes
|
|
|
|
ggEndOfLineFix.txt
|
|
|