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

4643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Roberts b8b62292bd
Merge pull request #451 from Areloch/macOSMinorFixes 
Fixes some minor errors on MacOS regarding compiling in clang
 2021-01-14 22:16:44 -06:00
Areloch c5cdba750e Fixes some minor errors on MacOS regarding compiling in clang 2021-01-14 18:00:56 -06:00
Areloch 64c9667bad
Merge pull request #283 from Azaezel/alpha40_mouseBindIcons 
mouse display for keybinds
 2021-01-10 22:40:22 -06:00
Brian Roberts 9ba1ca3d22
Merge pull request #447 from Jozor/cmake_directory_fix 
Cmake allow non-source project directory
 2021-01-10 15:51:18 -06:00
Joseph fe9dc1e25b Help from Az finally gave the correct answer to the problem I was trying to address originally, so really this fix is from Az. 
Exposes the directory for where your game files go in cmake without having to go to Advanced tab.
 2021-01-10 21:48:46 +00:00
Brian Roberts 80d4df09d3
Merge pull request #446 from Azaezel/alpha40/callOnModules_Vars 
add parameter handling to callonmodule callbacks.
 2021-01-09 00:28:13 -06:00
Joseph 4c781ce5c6 Enables support for having your project directory different to your Torque engine directory. 2021-01-08 20:59:35 +00:00
Brian Roberts 2cf11fe199
Update module.cs 
cleanup
 2021-01-08 00:09:37 -06:00
AzaezelX 5bd9459da2 add parameter handling to callonmodule callbacks. 
IMPORTANT NOTE: cannot handle "" entries.
 2021-01-07 20:11:44 -06:00
Brian Roberts 5e4008d207
Merge pull request #443 from Azaezel/alpha40/terrainPaintFix 
revert #401 as while it does surpress hieght painting touching the ce…
 2021-01-05 03:15:08 -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
Brian Roberts 9dce04d3e2
Merge pull request #441 from rextimmy/d3d11_texture_lock 
D3d11 texture lock
 2021-01-05 02:23:06 -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
Brian Roberts 58d2e30af7
Merge pull request #438 from lukaspj/fix/no-detail-in-terrain 
Improve terrain rendering, handle bug with no detail
 2021-01-04 14:27:15 -06: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
Lukas Aldershaab 7ffe0f3c80 Fix default values for texture formats in UI 2021-01-04 11:48:00 +01:00
Lukas Aldershaab 88bdb594aa Set default terrain texture format 2021-01-04 10:26:08 +01: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
Brian Roberts ab4c19e5ff
Merge pull request #434 from Areloch/UpdatedCppAssets 
Adjusts handling of C++ asset types
 2021-01-02 11:09:13 -06:00
Areloch 07336d258d Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded) 
Also adds a few additional C++ template files to work with
 2021-01-02 01:58:15 -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 6f23dd191d Update core shader libraries to support texture arrays 2021-01-02 03:19:51 +01:00
Lukas Aldershaab 3c8d07a03e Cleanup and fixes 2021-01-02 02:08:22 +01:00
Lukas Aldershaab f55e7f7a22 Terrain painter integration for height based blending 2021-01-01 21:07:12 +01:00
Lukas Aldershaab 4f472bf402 New terrain blending 2021-01-01 21:07:12 +01:00
Lukas Aldershaab e92e945912 Refactor GFXTextureArray 2021-01-01 21:06:08 +01:00
Lukas Aldershaab 87dd7ffc4a Implement Singlepass Terrain Render 2021-01-01 21:06:01 +01:00
AzaezelX 5e8862dafc further info by request 2020-12-31 19:38:53 -06:00
AzaezelX 6495ee16c6 report shape file location that failed to load, set loaded status to badfilereference if getAssetById can't even find noshape 2020-12-31 18:54:31 -06:00
Brian Roberts 07b9887cdd
Merge pull request #430 from Azaezel/alpha40/macfixes 
mac fixes
 2020-12-31 14:50:59 -06:00
AzaezelX 254ac462b5 sdl usage standards proposal 3: 
again maintains fallbacks for folks that just don't want to use the lib (though if we do want to go that route, we'll likely want to re-review a few commits and put fallbacks, well, *back* at some point)
includes sdl in torqueconfig.h if in use to kill duplication.
adds a generic sdlPlatform.cpp for general methods, oneliners, and the like
 2020-12-31 14:44:39 -06:00