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
4704 commits 5 branches 33 tags 958 MiB
Commit graph

3243 commits

Author SHA1 Message Date
Brian Roberts 369c06c24c
Merge pull request #485 from Azaezel/alpha40/stringtoChar 
make string to char* conversion automatic
 2021-04-22 19:34:05 -05:00
AzaezelX 2e3e4228b2 make string to char* conversion automatic 2021-04-21 14:45:10 -05:00
Jeff Hutchinson c19bb29a16
Merge pull request #481 from Azaezel/alpha40/profileconflictreport 
report which profile usages are conflicting (was,is)
 2021-04-12 21:48:38 -04:00
Jeff Hutchinson 481c900d77
Merge pull request #482 from Azaezel/alpha40/sanitizerAug 
add additional chars to the flatfile->asset->objectID name santizatio…
 2021-04-12 21:46:22 -04:00
Jeff Hutchinson ef34210fef Implement Unit Test Suite for TorqueScript. 2021-04-12 21:43:57 -04:00
AzaezelX ab1661a851 add additional chars to the flatfile->asset->objectID name santization chain 2021-04-06 15:17:06 -05:00
AzaezelX ab878eb312 report which profile usages are conflicting (was,is) 2021-04-06 14:54:53 -05:00
Brian Roberts a8e2ec6df4
Merge pull request #475 from Areloch/importAssetSuffixes 
Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images
 2021-03-14 01:12:29 -06:00
Brian Roberts 43391f0f10
Merge pull request #474 from Areloch/internalNameTreeDisplayFix 
Fixes display of internal names on objects shown in guiTreeViewCtrl
 2021-03-14 01:12:20 -06:00
Areloch a0c8a77043 Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images 2021-02-27 02:43:37 -06:00
Areloch e428ecd6ab Fixes display of internal names on objects shown in guiTreeViewCtrl 2021-02-24 01:05:24 -06:00
Areloch 9a10d52e0b Added logic to correctly associate constructor script file for shape asset to asset as an assetfile 2021-02-21 02:21:50 -06:00
Brian Roberts f4982f3b7d
Merge pull request #464 from Azaezel/alpha40/ribbonParticles 
ribbon particle resource port
 2021-02-15 22:28:10 -06:00
AzaezelX 4c7535a9bc set perfab and makemesh origins to the biggest model 
allows one to preserve snap points
 2021-02-08 17:23:51 -06:00
AzaezelX e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00
AzaezelX d4cd1edad7 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into fix/terrainpainting 
# Conflicts:
#	Engine/source/gui/worldEditor/terrainEditor.cpp
 2021-01-27 23:38:14 -06:00
AzaezelX 66db6ac376 terrain brush dragging cleanups 2021-01-27 23:36:23 -06:00
Areloch e11c5a7a02 Re-fixes terrain edit dragging without breaking paint actions 2021-01-27 15:10:20 -06:00
Brian Roberts e2f706cd94
Merge pull request #461 from Areloch/ShapeAssetPreviewGen 
Implements shape preview caching for shape assets
 2021-01-27 14:58:41 -06:00
Areloch 16438e1ab3 Added in needed normal map processing for preview render 2021-01-27 12:26:33 -06:00
Areloch 85a9a9b608 Implements shape preview caching for shape assets 
Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
 2021-01-27 01:54:26 -06:00
AzaezelX 3603188b7f update openal-soft 
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
 2021-01-26 13:01:35 -06:00
Lukas Aldershaab 9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00
Lukas Aldershaab 099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
Areloch c5cdba750e Fixes some minor errors on MacOS regarding compiling in clang 2021-01-14 18:00:56 -06:00
AzaezelX 93cdc35a76 revert #401 as while it does surpress hieght painting touching the center of terrains, it also locks out terrain painting dragging 2021-01-05 03:14:27 -06:00
Brian Roberts 4de1449c4b
Merge pull request #442 from rextimmy/gfx_cleanup 
Removed old fixed function code from GFX.
 2021-01-05 03:00:04 -06:00
Brian Roberts 2ba8ccd333
Merge pull request #436 from Areloch/AssetificationPass01 
Assetifies MeshRoad, Decal Road, and the material slot of GroundCover
 2021-01-05 02:23:24 -06:00
rextimmy 028bf1df9b give afx the gfx cleanup treatment 2021-01-05 18:22:19 +10:00
Areloch 8585278fe4 Adds autoimport logic for materials if the materialDefinition already exists 
Adds some additional utility functions to AssetImporter for easier access to setup
Corrects handling for legacy field names with meshRoad
 2021-01-05 00:58:18 -06:00
rextimmy 6d71bec417 gfx enum correction 2021-01-05 13:04:53 +10:00
rextimmy 5a933c00d3 Removed old fixed function code from GFX. 2021-01-05 12:57:17 +10:00
rextimmy aad70af468 use const for consistency 2021-01-05 10:43:12 +10:00
rextimmy 511efcf462 Correct GFXD3D11TextureObject lock/unlock issues 2021-01-05 10:41:30 +10:00
Lukas Aldershaab 481e2a7230 Improve terrain rendering, handle bug with no detail 2021-01-04 20:06:17 +01:00
Brian Roberts 27641b16ca
Merge pull request #424 from lukaspj/feature/new-terrain-blending 
Height based terrain texture blending
 2021-01-04 05:36:50 -06:00
Areloch bf5b26f734 Assetifies MeshRoad, Decal Road, and the material slot of GroundCover 
Creates a networked and non-networked variant of DECLARE_MATERIALASSET macro
 2021-01-03 08:58:53 -06:00
Lukas Aldershaab 6f57aa51d2 Add 0.5f term back to contrast calculation 2021-01-03 11:43:13 +01:00
Lukas Aldershaab 9cac064be8 Avoid negative heights in texture blending 2021-01-03 11:35:08 +01:00
Lukas Aldershaab 10ed852dd2 Remove baseline component from contrast 2021-01-03 01:49:07 +01:00
Lukas Aldershaab 26f09d9a97 Fail hard on unrecoverable mistakes in GFXTextureArray 2021-01-03 01:32:39 +01:00
Lukas Aldershaab 60a10f4334 Add global blendDepth slider and update default blendDepth for mats 2021-01-03 01:26:19 +01:00
Lukas Aldershaab db496fa0c4 Make terrain texture settings global, add dialog to painter 2021-01-03 00:50:42 +01:00
Lukas Aldershaab d3996aec84 Add texture size fields to terrain textures and improve editor performance 2021-01-02 18:33:18 +01:00
Lukas Aldershaab 9caa08b7f0 Fix off-by-one in mip levels for OpenGL 2021-01-02 18:19:26 +01:00
Brian Roberts a0ba345095
Merge pull request #432 from Azaezel/alpha40/sdlwebGeneralization 
sdl usage standards proposal 3
 2021-01-02 11:09:52 -06:00
Brian Roberts 03e6b5b096
Merge pull request #433 from Azaezel/alpha40/shapeAssetErrorFollowups 
moar asset errorhandling
 2021-01-02 11:09:31 -06:00
Lukas Aldershaab 3c165b7d45 Update blendContrast, add glsl support 2021-01-02 03:30:08 +01:00
Lukas Aldershaab 1ffec9ab56 Add blend contrast slider 2021-01-02 03:20:18 +01:00
Lukas Aldershaab 3c8d07a03e Cleanup and fixes 2021-01-02 02:08:22 +01:00