Commit graph

4318 commits

Author SHA1 Message Date
Areloch 4ffe6d2bb7 Adds a notes object that only displays in the editor, useful for when working on maps. 2020-08-17 16:41:59 -05:00
Brian Roberts fb7ae70676
Merge pull request #294 from Areloch/LocalLightShadowsPref
Adds a pref to dictate if local lights can cast shadows or not.
2020-08-16 20:28:42 -05:00
Areloch 756f2ef680 Adds a pref to dictate if local lights can cast shadows or not. 2020-08-16 18:08:00 -05:00
Brian Roberts abe2164e90
Merge pull request #293 from Areloch/ABPreviewFilePathTooltip
Expands AB tooltips with file info
2020-08-16 14:43:00 -05:00
Areloch 15ec65111e Adds some additional data, namely associated file path, to some of the asset browser's previews for a few types 2020-08-16 12:09:36 -05:00
Brian Roberts d763c6f509
Merge pull request #292 from Areloch/ABIconImageModes
Adds image variances for the menuGrid image
2020-08-16 04:26:28 -05:00
Brian Roberts 42f8a94cd6
Merge pull request #291 from Areloch/ConvexProxyMaterials
Adds in the missing materials used for the Convex Proxies for triggers, zones, etc.
2020-08-16 04:26:05 -05:00
Brian Roberts 89b885fd5a
Merge pull request #290 from Areloch/FixToolTipColor
Standardizes the tooltip profile colors to match the rest of the themeing stuff
2020-08-16 04:25:37 -05:00
Areloch 46f2ad04cf Adds image variances for the menuGrid image so the Asset Browser button reacts to interaction properly. 2020-08-16 03:10:39 -05:00
Areloch ac48625919 Adds in the missing materials used for the Convex Proxies for triggers, zones, etc. 2020-08-16 02:51:34 -05:00
Areloch 667557f6b2 Standardizes the tooltip profile colors to match the rest of the themeing stuff 2020-08-16 02:37:43 -05:00
Brian Roberts 84bf25f9e3
Merge pull request #289 from Areloch/NoAnimatedMakeAMesh
Adds logical check to skip animated statics when baking selection to mesh.
2020-08-16 02:27:13 -05:00
Areloch b6a3fb05d9 Adds logical check to skip animated statics when baking selection to mesh. 2020-08-16 02:16:19 -05:00
Brian Roberts 81777348c8
Merge pull request #288 from Areloch/MiscImageAssetFixes
Misc. Image Asset improvements
2020-08-13 15:05:47 -05:00
Areloch 686975c8ee shifts getImageFilename to getImagePath on ImageAsset
Adjusts references to utilize getImagePath to ensure things using the image asset gets the proper full path
Adjusts image import logic to import finding associated images
Adds logic so if a roughness map is imported, the generated material asset has the invertSmoothness flag on.
2020-08-13 01:35:24 -05:00
Brian Roberts 8d3071fb72
Merge pull request #286 from Areloch/SDLUpdate2012
Updates SDL to 2.0.12
2020-08-12 15:35:08 -05:00
Brian Roberts f582fa0dcd
Merge pull request #275 from Areloch/3DTextureFix
Fixes the backend logic for setting/creating 3DTextures in D3D11
2020-08-12 14:50:04 -05:00
Brian Roberts 2893cbfb88
Merge pull request #287 from Areloch/MoreMiscFixes20200812
More misc. fixes
2020-08-12 14:29:49 -05:00
Areloch bf8455469f from @rextimmy: appends vcruntime as a release dependency when using visual studio versions exceeding mark 1920, as failure to do so was leading to Error LNK2019 unresolved external symbol memset referenced in function SDL_vsnprintf_REAL
Ported up for the 2.0.12 version
2020-08-12 13:28:31 -05:00
Areloch 69bfbb0978 Adds functions to get the full path for level and shape asset files
Updated choose level UI to use getLevelPath function so it works again
Added a check for mis.dso for choose level UI as well in case it was compiled
Updated open asset in shape editor logic to use getShapeFile so it works again
Fixed on-exit crash after drag-n-drop importing of assets into the AB by properly using the import config object as a pointered object
Added sanity check when inspecting a TSStatic, if there isn't a materials inspector group for whatever reason to prevent a crash
Added filter logic so if in select mode for a specific asset type, it won't show datablocks, prefabs or other loosefiles
Removed unneeded setting of AB's current address path when creating a new terrain material asset
Added logic for forcing field validation in the create a new asset window. This fixes a problem where if you'd typed in a field but didn't hit enter and then immediately hit the done button, the typed string wasn't used.
2020-08-12 13:11:13 -05:00
Areloch a526029f2f Updates SDL to 2.0.12 2020-08-12 11:56:18 -05:00
Brian Roberts 3108a08650
Merge pull request #285 from Pecon/openWebBrowserLinux
Followup commit to switch to engine conventions
2020-08-11 17:29:28 -05:00
Pecon 909892f40e
Change shorts to ints 2020-08-11 15:27:52 -07:00
Pecon 90dc11410b
Followup commit to switch to engine conventions 2020-08-11 15:13:56 -07:00
Brian Roberts a03e0c9284
Merge pull request #284 from Pecon/openWebBrowserLinux
Basic Platform::openWebBrowser implementation for linux
2020-08-11 15:43:08 -05:00
Pecon d3f51cf7c0
Basic Platform::openWebBrowser implementation for linux 2020-08-11 12:51:46 -07:00
Brian Roberts d1a79ae5eb
Merge pull request #280 from Areloch/YetMoreMiscAssetFixes
Even more misc asset fixes
2020-08-09 14:09:29 -05:00
Areloch 79ecc2f4a0 Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving
Fixes select mode for the Asset Browser to properly filter to the selecting type
Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid
Fixes AssetBrowser asset selection return so it returns back a valid assetId
Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset
Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 01:32:27 -05:00
Brian Roberts 641c75b721
Merge pull request #279 from Areloch/MoreABAndImporterFixes
More various Asset Browser and importer fixes
2020-08-08 15:12:01 -05:00
Areloch d01341708e Removes extra assetImportConfigs file
Fixes name handling when finding associated image files on materials
Makes parseImageSuffix return back the case-correct suffix given the image's filename
Fixes import session reset logic to not have infinite looping happen when activated if files are in the session still(used mainly when import config is changed)
Makes sure materials are not processed if they are found in the import config's ignoreMaterials list
Makes sure active import config is properly on importer when it's changed in the Import window
Tweaked asset browser folder filtering logic so it always rejects .git folders from displaying, and also made the core, tools, cache and shaderCache filtering behavior consistent
Fixed navigation of root-level folders if double-clicking on them through the main window
Ensured import session is reset after an import happens so no extra files are left over in the importer's list
2020-08-08 13:01:50 -05:00
Brian Roberts 08f8d8abf2
Merge pull request #277 from Azaezel/alpha40_matAssetMangles
from @OTHGMars: AssetImporter type and path for material look-ups.
2020-08-08 00:55:26 -05:00
AzaezelX 284ad3e083 from @OTHGMars: AssetImporter type and path for material look-ups.
(and fix for pbrconfig<map> entry)
2020-08-08 00:54:06 -05:00
Brian Roberts 6153d3c27b
Merge pull request #276 from OTHGMars/queueExecOrder
Queue exec order
2020-08-07 11:18:18 -05:00
OTHGMars 6534957496 registerDatablock update in-place.
Maintains load order for datablock files that are overridden by registerDatablock.
2020-08-07 05:27:36 -04:00
OTHGMars 840ad6d385 queueExec update in-place.
Maintains load order for files that are overridden by queueExec.
2020-08-07 04:40:14 -04:00
Brian Roberts 4278d8ad5a
Merge pull request #274 from Areloch/MiscAssetImportAndWorkflowFixes
Various fixes for both asset importing and some workflowy bits relating to assets stuffs
2020-08-07 03:37:56 -05:00
Areloch 45d304ee31 Fixes the backend logic for setting/creating 3DTextures in D3D11 2020-08-07 01:10:36 -05:00
Areloch 813762c722 Separated ShapeAsset's fileName for the loose file name and the fully processed file path to avoid potential save-out problems
Fixed autoAssetImport so it properly cleared any prior import session objects
Added beginning and ending comment line signfiers to make import logging easier to spot in console
Fixed variable used when doing the actual import on assets where it would use the top-level asset import objects and not the children array, causing a crash
Fixed the Make Selected A Mesh logic to work with the creation of a new shapeAsset
Added secondary handling to generate a prefab of the original selection for preservation purposes
Added optional input for makeSelectedPrefab to not delete the original selection(useful for the preservational prefab mentioned above)
Adjusted font color for NA text edit fields to make it more legible
Changed the non-working reloadDatabase button in assetBrowser to instead open the Asset Editing editor settings page.
2020-08-07 00:24:26 -05:00
Brian Roberts 2b686bf713
Merge pull request #273 from OTHGMars/GamePad_nonwin
Fix gamepad binds on non-windows.
2020-08-05 04:52:59 -05:00
Brian Roberts b727d1d962
Merge pull request #272 from OTHGMars/InputTestInit
inputTest Module Initialization
2020-08-05 04:52:39 -05:00
OTHGMars 83e41ce188 inputTest Module Initialization
Updates module initialization to use queueExec() for consistency with the ui module. This is required so all module dependencies (gui objects and profiles) are loaded before they're referenced.
2020-08-05 03:57:29 -04:00
OTHGMars 186efd5c87 Fix gamepad binds on non-windows.
Removes unneeded #ifdef that was preventing gamepad binds from being found in non-windows builds.
2020-08-05 02:50:04 -04:00
Brian Roberts cc5359fdfd
Merge pull request #271 from Azaezel/alpha40_shaderGenCleanups
Alpha40 shader gen cleanups
2020-08-04 12:16:52 -05:00
Brian Roberts 237b7cdac3
Merge pull request #268 from Areloch/ObjectFadePref
Adds some console preference variables for object fade overriding on TSStatics
2020-08-03 18:14:21 -05:00
Areloch b9e16649d9 Slims down the obj size get math to just use the worldSphere radius rather than computing the bounds width to save cycles. 2020-08-03 18:12:21 -05:00
AzaezelX 3de60baf79 retool ShadowMaterialHook::_overrideFeatures so we're not including a bunch of extraneous features 2020-08-03 16:46:22 -05:00
AzaezelX ca4b77f424 give shadergen tags for the other two potential rendertargets for use down the line 2020-08-03 16:45:37 -05:00
AzaezelX 1e66b118b6 more prepass cleanup, plus skip out early on _determinefeatures for deferred if we're translucent 2020-08-03 16:45:05 -05:00
AzaezelX b81b4c61a5 clean up leftover interlaced prepass experimental code. 2020-08-03 16:44:20 -05:00
Brian Roberts 4da43119b0
Merge pull request #270 from Areloch/lightFieldsCleanup
Some cleanup and adjusting of local light fields and default settings.
2020-08-03 14:05:01 -05:00