TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 12:44:46 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4572 commits 5 branches 33 tags 958 MiB
Commit graph

4572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch c1cd217557 Initial pass at implementing MaterialAsset macromagic utility functions and applies it to the renderMeshExample object as well as groundPlane 2020-12-27 23:24:29 -06:00
Brian Roberts e9dba74891
Merge pull request #375 from Areloch/LoopmodePathManager 
Adds handling to the path manager so it can deal with both looping and non-looping paths
 2020-12-21 03:05:00 -06:00
Brian Roberts 52ecd8bb0f
Merge pull request #395 from Areloch/MarkActiveScene 
WIP of marking active scene in the scenetree
 2020-12-19 02:35:58 -06:00
Brian Roberts 7dc6fc8abf
Merge pull request #415 from Areloch/GroundPlaneAssetify 
Converts GroundPlane to utilize assets
 2020-12-19 02:35:32 -06:00
Brian Roberts 78a836e433
Merge pull request #409 from Azaezel/alpha40_assetPipeCleanups 
asset pipe cleanups
 2020-12-19 02:34:57 -06:00
Brian Roberts 2335827d15
Merge pull request #414 from Areloch/MinorMiscAssetImporterFixes 
Misc various improvements for noted issues with the Asset Importer
 2020-12-19 02:34:15 -06:00
Areloch fb5195dd44 Corrects groundplane assigned material in the example and editor levels 
Assetifies GroundPlane's handling of it's material field
 2020-12-19 01:43:52 -06:00
Areloch 3821ddd15a Merge branch 'GroundPlaneAssetify' of https://github.com/Areloch/Torque3D into Preview4_0 2020-12-18 14:12:54 -06:00
Areloch 8f60d03830 Adjusts Asset Importer logic when looking up and saving out a newly created ShapeConstructor so that it doesn't duplicate a definition it one already exists. 
Adds _ORM and -ORM suffixes for PBR-ORM map import rule
Tweaks naming convention for IgnoreNode/Meshes and ImportNode/Meshes to be clearer via the prefix 'Always'
Fixes a token typo in suffix parsing, and adds \t to token deliniation for all suffix parsing to asset importer
 2020-12-18 00:55:01 -06:00
Brian Roberts b2495fe957
Merge pull request #412 from Areloch/LinuxBugfixes 
Fixes a few bugs/issues on Linux
 2020-12-15 12:06:59 -06:00
Areloch 533ff28814 Corrects recursive path dump so it can actually recurse correctly on linux. This fixes module/asset scan lookups 
Also added logic to more correctly get the base path of executable, making it easier for certain debuggers, like on linux, to find the main.cs.
 2020-12-15 11:04:15 -06:00
AzaezelX b26c87491f need to ensure we've got an asset at all before setting the loaded state 2020-12-14 13:33:49 -06:00
AzaezelX f95a78d2e8 misc asset pipeline cleanups 
AssetImporter::validateAsset make sure the modelDef looked for is valid
AssetImporter::importShapeAsset had a stray +"_"+embeded in it when it came to stitching togeather filenames and extentions
 2020-12-14 13:32:45 -06:00
Brian Roberts 484ad73719
Merge pull request #407 from chaigler/wrap_mat_anim_floats 
Wraps material animation floats to sane values.
 2020-12-14 13:23:06 -06:00
Brian Roberts 41624ecb2c
Merge pull request #408 from Areloch/MiscOptionsMenuFix 
Fixes for AA toggle and GFX Device reporting for options menu
 2020-12-14 13:22:56 -06:00
Areloch 334cd1d205 Adds function to better report active device type from GFXDevice 
Ensures Window title and options menu correctly displays available and active render api
Fixes AA option so it correctly toggles FXAA
 2020-12-12 23:04:50 -06:00
chaigler c342e84bec Wraps material animation floats to sane values. 
Wraps material animation floats to sane values to prevent floating point drift.
 2020-12-12 20:07:01 -05:00
Brian Roberts 196e80b9da
Merge pull request #403 from GoldenThumbs/Preview4_0_goldenthumbs 
Correct bump map in waterObject.cpp being in sRGB space
 2020-12-11 19:13:42 -06:00
GoldenThumbs d168df03e0 Correct bump map in waterObject.cpp being in sRGB space 2020-12-11 19:07:19 -06:00
Brian Roberts 5534384c54
Merge pull request #390 from Azaezel/alpha40_assetErrorcodes 
variation on #387 that also introduces errorcodes
 2020-12-08 23:50:07 -06:00
Brian Roberts bd151a600f
Merge pull request #401 from NoboKani/Preview4_0 
Fixing bug Terrain Editor bug #91
 2020-12-08 15:39:40 -06:00
NoboKani a56fe4037e Fixing bug Terrain Editor bug #91 2020-12-08 22:12:45 +03:00
Brian Roberts 9be3151cb0
Merge pull request #400 from Areloch/PostFXEdFix 
Fixes logic that checks if a postFX was enabled so the PostFX Editor works properly
 2020-12-07 14:04:09 -06:00
Brian Roberts 72281880ee
Merge pull request #399 from Areloch/MiscEditorGUIFixups 
Misc Editor and editor GUI fixups/improvements
 2020-12-07 14:03:28 -06:00
Areloch d25e9d64dc Fixes logic that checks if a postFX was enabled so the PostFX Editor works properly 
Corrected the enabled variable hook-in for the SSAOPostFX
 2020-12-07 00:00:53 -06:00
Areloch b0f977b810 Fixes opening of Gui Asset from AB so it correctly opens the GUI editor, making the toolbar appear 
Fixes typo'd name for material-editor menubar image
Adds probe menubar images
Adds setting menubar images
Adds probe and settings buttons to menubar
Removes unneeded tab from class visibility window popup
 2020-12-06 08:48:35 -06:00
Brian Roberts d18721d78e
Merge pull request #398 from Azaezel/alpha40_fixCubeMips 
mMipCount was never being filled out. just use mPrefilterArray->getMi…
 2020-12-05 12:36:49 -06:00
AzaezelX 53f9f49410 mMipCount was never being filled out. just use mPrefilterArray->getMipMapLevels() direct 2020-12-05 00:04:19 -06:00
Brian Roberts a41e0d5160
Merge pull request #397 from Areloch/GuiGameMenuCtrlSanityCleanup 
Removes unneeded redundant asserts when the functions already have range sanity checks
 2020-12-04 16:39:30 -06:00
Areloch 87217e2365 Removes unneeded redundant asserts when the functions already have range sanity checks 2020-12-04 11:22:25 -06:00
Brian Roberts eb51b8a4b6
Merge pull request #396 from Areloch/EditorAwarePauseMenu 
Adds handling so the pause menu has a button to exit the editor as a quick shortcut
 2020-12-03 21:14:22 -06:00
Areloch 7b6ee8a453 Adds handling so the pause menu has a button to exit the editor as a quick shortcut 2020-12-03 19:58:51 -06:00
AzaezelX ae5f766abe just to save a PR: default asset visitor variables to emptystring 2020-12-03 15:38:42 -06:00
AzaezelX 8bb43dd5ae error string interpreter, example of usage in shapebase::preload, plus flips the datablock filter back on to save some network bandwidth. 2020-12-03 15:37:51 -06:00
Brian Roberts 6b58d4b8ca
Merge pull request #388 from Azaezel/alpha40_objectEditorAssetRef 
hooks up shapebase children breadcrumb
 2020-12-03 13:49:30 -06:00
Brian Roberts 6779e486dc
Merge pull request #394 from Areloch/DragNDropFixes 
Fixes Datablock and Prefab DragnDrop behavior with the AB
 2020-12-03 12:45:09 -06:00
Brian Roberts 217b691f4e
Merge pull request #393 from Areloch/DeleteModuleAction 
Adds ability to delete a module
 2020-12-03 12:44:55 -06:00
Brian Roberts 14a41a19a6
Merge pull request #392 from Areloch/AssetLogCleanup 
Cleanup of some log errors and spam with assets
 2020-12-03 12:44:43 -06:00
Brian Roberts 89a7e498f5
Merge pull request #391 from Areloch/FindModuleByFilepathImprovement 
Better handling for finding modules by file path. Mainly used in asset importer
 2020-12-03 12:44:28 -06:00
Areloch 27cf3466c3 WIP of marking active scene in the scenetree 2020-12-03 00:31:23 -06:00
Areloch a43abffed2 Fixes Datablock and Prefab DragnDrop behavior with the AB 2020-12-03 00:19:16 -06:00
Areloch 941cfb6d40 Adds ability to delete a module 2020-12-03 00:15:24 -06:00
Areloch 2ce48d0e6f Cleanup of some log errors and spam with assets 2020-12-03 00:11:35 -06:00
Areloch e8564680e4 Better handling for finding modules by file path. Mainly used in asset importer 2020-12-02 23:57:17 -06:00
AzaezelX 220771d2fe variation on #387 that also introduces errorcodes 2020-12-01 19:16:36 -06:00
AzaezelX 6f23eed8e0 hooks up shapebase children breadcrumb 
(lets you select an object-instance in game and review it via the shape editor)
TODO: hutn why lists aren't propagating
 2020-12-01 13:36:32 -06:00
Brian Roberts 80eb4ab2ba
Merge pull request #386 from Azaezel/alpha40_createCompositeCopypasta 
adress #385
 2020-11-29 21:04:58 -06:00
AzaezelX 0fa8e23475 adress #385 2020-11-29 21:04:11 -06:00
Brian Roberts 9f802fa23f
Merge pull request #383 from Azaezel/alpha40_shapeAssetTransmissionFix 
get shapeassetID read. TODO: find further flaws and unrem the filter
 2020-11-27 19:03:44 -06:00
AzaezelX c626bc10e0 get shapeassetID read. TODO: find further flaws and unrem the filter 2020-11-27 19:03:20 -06:00