Commit graph

4366 commits

Author SHA1 Message Date
Jeff Hutchinson
2bf3c8384c Fix global variables not being able to be used inside of a foreach$ loop. 2020-10-03 00:47:20 +02:00
Brian Roberts
76c5e30869
Merge pull request #321 from Azaezel/alpha40_miscCleanups26Sep2020
minor cleanups:
2020-09-27 12:17:12 -05:00
Brian Roberts
d160e3f020
Merge pull request #319 from Areloch/NewLightingOptions
Implements new shape fadeout and lighting fade/max lights/shadows pref options into the options menu
2020-09-26 22:45:06 -05:00
AzaezelX
e88b7a0783 minor cleanups:
clean up mismatched  PROFILE_START+PROFILE_END() that was in/out of the mip packign for loop on the gl side, leaving just the self-cleaning PROFILE_SCOPE(GFXGLTextureObject_copyToBmp); similar to the dx11 side
   void GuiGameListMenuCtrl::removeRow(const S32& row); (the GuiGameListMenuCtrl:: bit in the class iteslf is redundant and making linux unhappy)
2020-09-26 22:43:26 -05:00
Brian Roberts
7097edc2fe
Merge pull request #320 from Azaezel/alpha40_Execute_internalExecute_Bug
memleak fix
2020-09-25 12:28:55 -05:00
AzaezelX
1d71ee70e8 memleak fix 2020-09-25 12:25:35 -05:00
Areloch
4a8273b824 Implements new shape fadeout and lighting fade/max lights/shadows pref options into the options menu 2020-09-24 22:49:05 -05:00
Brian Roberts
add299e1b8
Merge pull request #316 from Areloch/UpdatedWindowsSettingsOptions
Updated version of OTHGMars' updated window and resolution options modes.
2020-09-20 16:02:35 -05:00
Brian Roberts
d6ec72de6e
Merge pull request #315 from Areloch/MemleakAndFriends
Various misc. tweaks and fixes targeting memleaks and crashes
2020-09-20 13:11:00 -05:00
Areloch
26ef40950b Updated version of OTHGMars' updated window and resolution options modes.
Additional changes include disabling certain options when they are not valid(ie, resolution is disabled when in borderless mode)
2020-09-20 02:06:15 -05:00
Areloch
350d3e6702 Fixes 2 minor mistake corrections 2020-09-20 01:19:08 -05:00
Areloch
8956559bfd Various misc. tweaks and fixes based on static code analysis to minimize/fix memleaks, crashes, or other performance impacting code. 2020-09-19 18:25:10 -05:00
Brian Roberts
d76c73c252
Merge pull request #314 from Areloch/liveShapeChangeFix
Fixes the hook-ins so when a shape asset  is changed, tsstatics now are correctly triggered for a reload
2020-09-14 18:43:37 -05:00
Areloch
8fbad31b43 Fixes the hook-ins so when a shape asset is changed, tsstatics now are correctly triggered for a reload 2020-09-13 17:57:19 -05:00
Brian Roberts
1600bfaf57
Merge pull request #313 from Azaezel/alpha40_chooselevelCorrection
fix chooseleveldlg
2020-09-12 15:01:18 -05:00
AzaezelX
7af0a758d1 fix chooseleveldlg 2020-09-12 15:01:01 -05:00
Brian Roberts
721320b612
Merge pull request #312 from Areloch/PostFXReorgAndUpdate
Reorgs the layout and editing of PostFX with some supplemental level save/load changes
2020-09-11 15:51:36 -05:00
Brian Roberts
d785927074
Merge pull request #311 from Areloch/DynamicReflProbes
Re-implements the dynamic cubemap mode option for reflection probes
2020-09-11 15:51:27 -05:00
Areloch
a8177885e2 Fixes the glowBlur shader paths 2020-09-11 13:36:27 -05:00
Areloch
b05d5fd3bd Merge branch 'PostFXReorgAndUpdate' of https://github.com/Areloch/Torque3D into Preview4_0 2020-09-11 03:21:56 -05:00
Areloch
3c0c106051 Reorgs the editing of postFX so the editor settings edits the default config, and Scene > edit postFX to edit scene
Changes the saving of postfx from saving via the editor to instead save on level save
Reorganizes the core postfx folder to subfolders for better organization, as well as moving the shaders to group with the respective postFX
Changes the postfx editor so it only edits postFXs that are actively enabled in the scene, and only saves out similarly.
Adjusts the level download logic to pass asset id for both data compactness compared to the full level filename, as well as easier lookup reference for associated files like the postFX preset file or decal files from the asset def.
Updated the PostFXAsset template to provide an up-to-date starting point/template.
2020-09-11 02:28:15 -05:00
Areloch
5289fdf7f1 Re-implements the dynamic cubemap mode option for reflection probes 2020-09-11 02:13:05 -05:00
Brian Roberts
c2bbab774a
Merge pull request #308 from Areloch/MiscFixes20200831
Misc fixes for Asset Browser navigation, scene asset utilization and editor settings
2020-09-10 12:55:39 -05:00
Brian Roberts
326690cccc
Merge pull request #310 from Areloch/MiscFixes20200907
Misc asset browser/asset creation fixes
2020-09-10 12:55:18 -05:00
Areloch
c51adb6c1c Fixes regression of Select Asset Path selection
Fixes setting for showing core and tools dirs in Asset Browser
Fixes path for newly created PostFX, state machine and cubemap assets
Improves logic for getModuleFromAddress from asset browser directory handler
Prevents error if no field was edited in the Create New Asset window before hitting the create button
Forces acquiring newly created asset just so they can be utilized immediately
Updates PostFXAsset template files to better hook in and provide a better example of basic behaviors.
2020-09-08 01:22:57 -05:00
Areloch
c5bccd8ff4 Adjusts getUtilizedAssets writeout so it more consistently prints out the dependent assets
Adds handling for prefabs with getUtilizedAssets
2020-09-08 01:04:41 -05:00
Areloch
0b954459a3 Added recursive scanning for utilized assets on any object within the scene, soas to catch objects in simgroups or parented
Disabled initial materialSlot fill-out until logic for looking up assetName from material list name can be done to avoid 'unable to find assetid' spam
Added function to SimGroup to easily acquire child object by index
Some minor cleanup of commented lines in asset browser
Fixed forward/backward navigation arrow behavior in asset browser
Fixed double-click navigation when the AB is in select mode
Fixed erroneous 'could not acquire asset' messages when navigating folders in AB
Added editor setting for UseGroupSnap snap option and integrated it into the UI interface
Removed some duplicate settings from the EditorSettingsWindow
2020-09-02 01:26:43 -05:00
Brian Roberts
82f7db3d48
Merge pull request #306 from Areloch/MiscFixes20200828
Misc Fixes for level saving and selecting asset paths
2020-08-30 07:24:04 -05:00
Brian Roberts
48b79ebec7
Merge pull request #307 from Areloch/MiscFixes20200830
Misc editor settings fixes and additions
2020-08-30 07:23:56 -05:00
Areloch
8824ee9a2a Added autosave logic to the world editor. Via a schedule, it will autosave to tool/autosave to create a backup of the current dirty scene
Fixed RMB menu on multi select objects in the Scene Tree so it will properly display the full list of actions
Fixed up several spots of editor settings fields being incorrect copy-pastes
Integrated AssetBrowser tool into the standard initSettings hook-through for proper default settings integration
Added Editor Theme settings to the default value init'ing of the World Editor
Shifted exec of editor settings default values as part of the initial editor load to ensure that if the settings.xml is deleted, theme info reverts back to the default
Integrated Convex Editor's settings into new EditorSettings window system
Added several missing World Editor settings to Editor Settings Window
2020-08-30 04:59:26 -05:00
Areloch
f3fe2298d5 Fixes level save as logic to correctly name new level's scene object to match, and helps ensure you're editing the right scene.
Added New Folder button to Select Path window
2020-08-29 04:22:58 -05:00
Brian Roberts
8611e7090a
Merge pull request #304 from Areloch/MiscLightFixes20200828
Misc. Fixes and cleanup for lights
2020-08-28 14:59:48 -05:00
Brian Roberts
4c63090a6f
Merge pull request #305 from Areloch/OpenShapeEditorFix
Fixes logic when opening shapeEditor with a TSStatic selected
2020-08-28 12:02:24 -05:00
Areloch
55e24926e4 Fixes logic when opening shapeEditor with a TSStatic selected, it'll attempt to load up the shapeAsset if one is set on the static. 2020-08-28 02:49:26 -05:00
Areloch
ae70cccfde Fixes de-selection logic in editor that caused special cases to permanently be selected such as mounted Lights
Shifted every-frame RT allocation to be stored in advancedLightBinManager
Remove deprecated references to dynamicShadowMap in light materials
Updated spotLight shaders to remove deprecated dynamic shadowmap reference which was causing a crash when spotlights had shadows turned on
Added GLSL version of Viz_SurfaceProperties so it works on both APIs
2020-08-28 01:57:06 -05:00
Brian Roberts
31039de2cf
Merge pull request #303 from Areloch/MiscFixes20200826
Miscellaneous small issue fixes
2020-08-26 18:19:51 -05:00
Areloch
7405453123 Fixes issue where it would try and load a SIS file even if it doesnt exist
Fixed warning about use of invalid function 'setEnabled' instead of 'setActive'
Fixed formatting of a schedule call in ExmapleGameMode
Fixed EditorOpenMission logic to correctly get and use levelAsset
Removed unneeded continues from menuInputButtons' refresh()
Updated settings.xml to have sorted order for future consistency
2020-08-26 13:40:04 -05:00
Brian Roberts
5544951b5d
Merge pull request #302 from Areloch/soundAndAnimationAssetImport
Integrates sound and shapeAnimation assets into the importer
2020-08-25 00:23:05 -05:00
Areloch
1942535923 Integrates sound and shapeAnimation assets into the importer
Added drag-n-drop spawn action for soundAssets
2020-08-24 20:24:50 -05:00
Brian Roberts
a71537488c
Merge pull request #301 from Areloch/AssetMaterialLookupsAndSis
Material Asset import lookups and initial re-integration of sis files.
2020-08-24 15:40:52 -05:00
Areloch
d06c99a088 Adds function to get material definition by mapTo usage
Re-enables logic for looking up existing material(generally just for in-place autoimport) and creates the material asset off of that. Also adds logic to look up the mapTo if it exists if the material name lookup fails.
Adds initial pass at re-enabling the sis file support for shape importing. In the event the UseManualShapeConfigRules setting is disabled(which it is by default) it will try and find the matching sis file and apply the rules from that to the config. Once the processing/import is done on the shape, the cached values of the main config are restored again.
Adds initial fbx.sis file. Needs to have the fields standardized to the config names.
2020-08-24 04:41:17 -05:00
Brian Roberts
20479cd818
Merge pull request #300 from Areloch/sortedSettings
Adds sorting to the settings class so when it saves out to file
2020-08-23 16:26:59 -05:00
Areloch
3f676e0966 Adds sorting to the settings class so when it saves out to file, it puts them in alphabetical order which keeps things consistent. 2020-08-23 14:29:17 -05:00
Brian Roberts
93ce5d0cfa
Merge pull request #298 from Azaezel/alpha40_triggerTroubleTre
fix for trigger::testobjects vector population
2020-08-21 07:28:40 -05:00
Brian Roberts
8e61600a82
Merge pull request #299 from Areloch/LevelDependencyLoadingAndFixes
Level Asset Dependency handling and various level fixes
2020-08-21 07:28:24 -05:00
Areloch
40dd926873 Adds function for sceneObjects to report utilized assets
Add reporting of used assets to tsStatics and TerrData
When saving a Scene, it will write static object asset dependencies to it's levelAsset
Shifted level loader logic to pass up the levelAsset rather than full level path
Made it so when level is loading, the levelAsset loads its dependencies. When the level is ended, as part of cleanup, they are unloaded
Shifts defaultEditorLevel to be an actual asset and made the ToolsModule load assets
Fixes the Save As action to correctly save out to the new level asset
Fixed the autoLoadAssets logic to be cleaner and not manually check types
Removed extra, unused DefaultEditorFile file
2020-08-19 18:30:42 -05:00
Brian Roberts
f7dbfff42d
Merge pull request #297 from Areloch/NotesObject
Adds a notes object that only displays in the editor
2020-08-17 18:13:53 -05:00
AzaezelX
967841db7a fix for trigger::testobjects vector population 2020-08-17 18:06:23 -05:00
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