Commit graph

1033 commits

Author SHA1 Message Date
Brian Roberts
f4982f3b7d
Merge pull request #464 from Azaezel/alpha40/ribbonParticles
ribbon particle resource port
2021-02-15 22:28:10 -06:00
AzaezelX
39c914101d fix emissive 2021-02-14 18:47:42 -06:00
Areloch
931556c3c6 Added the makeRelative call to the other openShapeAsset function to ensure it works both ways 2021-02-13 00:18:48 -06:00
Areloch
372a7887be Fixes the constructor path compare logic in the shape editor so the lists can populate correctly. 2021-02-12 00:21:36 -06:00
AzaezelX
e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00
Brian Roberts
47ec7e8d98
Merge pull request #460 from Azaezel/fix/moduleHelpers
re-fix file exclusivity, readd callonmodules variable extension
2021-01-27 15:12:42 -06:00
AzaezelX
1f518499c9 typofix 2021-01-27 13:28:12 -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
dee5b46169 re-fix file exclusivity, readd callonmodules variable extension
new method loadAssetsByType(%assetType)
2021-01-27 00:45:49 -06:00
Brian Roberts
762a84550f
Merge pull request #458 from Areloch/ObjectCreatorABAdd
Integrates object creator logic into the AB
2021-01-24 15:15:31 -06:00
Areloch
3cb1699ed1 Fixed guiProfile references 2021-01-24 04:40:19 -06:00
Areloch
b7a2c30337 Integrates object creator logic into the AB
Adds lookup logic to Datablock AB entries to try and find class icons for the preview
Adds 2 new datablock class create methods
2021-01-24 04:33:28 -06:00
AzaezelX
e3933f7769 augment datablock file handling to include references with no suffixes 2021-01-24 02:43:21 -06:00
Areloch
a71805515c Corrects missed asset script file references in asset definitions when swapping to the tscript extension 2021-01-20 19:41:28 -06:00
Areloch
c051a0357c Fixes some conversion mistakes in the scripts 2021-01-19 21:32:31 +01: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
64c9667bad
Merge pull request #283 from Azaezel/alpha40_mouseBindIcons
mouse display for keybinds
2021-01-10 22:40:22 -06: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
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
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
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
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
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
f55e7f7a22 Terrain painter integration for height based blending 2021-01-01 21:07:12 +01:00
Brian Roberts
578846ab6f
Merge pull request #428 from Areloch/ConsolidatedTerrainCreation
Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
2020-12-29 01:29:34 -06:00
Brian Roberts
1fbf46fa90
Merge pull request #425 from Areloch/MaterialMacroMagic
Initial pass at implementing MaterialAsset macromagic utility functions
2020-12-29 00:40:46 -06:00
Areloch
d19cbd334b Fixed wrong field name on groundPlane in ExampleLevel 2020-12-29 00:37:40 -06:00
Areloch
f7ce1efd62 Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
Also shifts terrain data importing into the new terrain asset window instead of separate in the File menu
Also removes redundant loadMaterials call that caused duplicates in the Terrain Painter material list
2020-12-28 23:43:56 -06:00
Areloch
baeabb4a51
Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator
add validation flagging for server objects
2020-12-28 00:14:46 -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
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
AzaezelX
6408297eb9 add validation flagging for server objects
sets up a generic `ServerAssetValidator` PersistenceManager onServerCreated and saves anything marked dirty after processing. demonstrates looking that up and setting something dirty via shapebase::preload asset tagging
2020-12-16 21:31:54 -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
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
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
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
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