TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-04 04:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5980 commits 5 branches 33 tags 960 MiB
Commit graph

5980 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Roberts
e43ed41d11
Merge pull request #775 from Azaezel/alpha40/updateSDL2022 
update sdl to release 2.0.22
 2022-05-06 17:10:42 -05:00
AzaezelX
af88302935 Merge branch 'Preview4_0' into alpha40/updateSDL2022 2022-05-05 17:55:04 -05:00
Brian Roberts
22db2d4291
Merge pull request #779 from JeffProgrammer/make_console_sane_again 
Make the Console Sane Again
 2022-04-27 21:32:39 -05:00
Brian Roberts
e58dce4997
Merge pull request #778 from JeffProgrammer/torquescript_ternary 
Fix weird ternary operator in torquescript regression
 2022-04-27 20:29:35 -05:00
Jeff Hutchinson
c6263829c9 Make the Console Sane Again 2022-04-27 21:28:49 -04:00
Jeff Hutchinson
59125c85eb Fix weird ternary operator in torquescript regression 
With a test!
 2022-04-27 21:02:55 -04:00
AzaezelX
7716663346 need to unhide OBJ for this one 2022-04-26 17:11:02 -05:00
AzaezelX
82e608f990 add workaround logic for configuration file generation 2022-04-26 16:03:00 -05:00
AzaezelX
f297476092 update assimp to 5.2.3 Bugfix-Release 2022-04-26 11:56:24 -05:00
Brian Roberts
35de012ee7
Merge pull request #776 from Areloch/workflowIfFix 
Adds a conditional to the github workflow file so it only runs on the main repo
 2022-04-26 11:07:28 -05:00
JeffR
bea7d6f4a1 Adds a conditional to the github workflow file so it only runs on the main repo 2022-04-26 11:06:15 -05:00
AzaezelX
d4307ea413 update sdl to release 2.0.22 2022-04-26 09:17:21 -05:00
Brian Roberts
9a436f3c17
Merge pull request #773 from Areloch/VertexColorHLSLBRGAFix 
Removes the BGRA inversion when displaying vertex colors on materials
 2022-04-26 08:32:44 -05:00
Brian Roberts
6dae3e940c
Merge pull request #774 from CouleeApps/github-actions-ci 
Github actions CI
 2022-04-26 08:32:31 -05:00
Brian Roberts
113f9da67f
Merge pull request #771 from Azaezel/alpha40/macCompile 
correct mac compilation
 2022-04-26 08:31:41 -05:00
Brian Roberts
b37d15d183
Merge pull request #769 from Areloch/MiscFixes20220423 
Misc Fixes 2022/04/23
 2022-04-26 08:31:22 -05:00
Glenn Smith
e5fba24778
Github actions CI 
Using cmake + ninja
 2022-04-26 05:37:51 -04:00
AzaezelX
4ae7d7ce3f from higuy: "PATH_MAX is defined there on macos" 2022-04-26 02:00:34 -05:00
JeffR
cbf758e089 Removes the BGRA inversion when displaying vertex colors on materials 2022-04-25 23:53:40 -05:00
Brian Roberts
1444f47b88
Merge pull request #772 from DraconicEnt/cleanup-compile-warnings 
Cleanup: Resolve several compiler warnings associated with TORQUE_DEBUG
 2022-04-25 17:52:27 -05:00
Robert MacGregor
39952a490f * Cleanup: Resolve several compiler warnings associated with TORQUE_DEBUG. 2022-04-25 18:23:15 -04:00
AzaezelX
bd1bbdc258 correct mac compilation 
SDL now leverages https://cmake.org/cmake/help/v3.10/command/enable_language.html
 2022-04-25 13:28:32 -05:00
JeffR
81eec1dcb4 Added multi type filter support to AB select mode 
Adjusted logic for World Editor's Assets tab to filter by ShapeAssets and Datablocks
Improved ShapeEditor's Assets tab filter and select logic
Added ability for AB search to work on creator section
Fixed icon display of AB on preview cards when in list mode
 2022-04-24 13:03:33 -05:00
JeffR
4f3d6c918b Fixes issue where storing of AB position and extent wasn't applying correctly 
Changes ShapeEditor's Library tab to an "Assets" tab and opens the AB with the shapeAsset filter on
Adds Asset tab to world editor scenetree window that opens the assetBrowser
Fixes issue where opening default scene in worldEditor would activate the saveAs dirty flag, then if you exit the level and open a new one, you can only saveAs and not save the existing level asset
 2022-04-24 12:16:22 -05:00
Brian Roberts
8b127373c0
Merge pull request #770 from zfbx/Preview4_0 
add .vs directory to gitignore
 2022-04-24 07:48:15 -05:00
Tony zfbx
1ef41d8545 add .vs directory to gitignore 2022-04-23 21:23:26 -07:00
JeffR
70a70dfc10 Fixes issue with some of the On/Off options not properly toggling in the OptionsMenu 
Adds staged loading/generation of preview images for image, shape, material and terrain material types to improve navigation responsiveness
Disabled lookup of bitmap info of image assets for tooltip metadata as it was causing major hangs when the images were high resolution
Added function so Import new File button on AB interface will correctly prompt to find and then import in a new file
Fixed theming of AssetBrowser preview card profiles to improve readability
Fixed theming of ToolsGuiTextListProfile to improve readability
Fixed issue where trying to import in a splat map for importing terrain data could fail due to not having full path when trying to load the bitmap's channel data
Corrected Import Terrain Heightmap item in menubar to prompt creation of a new terrain asset in addition to opening the import terraindata window to avoid missed steps foc creation
 2022-04-23 16:07:36 -05:00
Brian Roberts
3f796d2a06
Merge pull request #768 from Azaezel/alpha40/singleSlotORMs 
drop the prior requirement for a createcomposite to have a minimum of…
 2022-04-21 06:00:55 -05:00
Brian Roberts
30300e93bd
Merge pull request #766 from Azaezel/alpha40/BigusNumerus 
requested feature: large number display
 2022-04-21 06:00:47 -05:00
AzaezelX
c14c9b78c0 drop the prior requirement for a createcomposite to have a minimum of roughness and metalness. also kick it off if it's got just an ao map. 2022-04-20 15:53:29 -05:00
Brian Roberts
4b391d8a27
Merge pull request #767 from lukaspj/fix/taml-schema-for-array-groups 
Fix TAML schema for array groups
 2022-04-20 01:14:14 -05:00
Lukas Aldershaab
6d2c108cbd Fix TAML schema for array groups 2022-04-20 00:24:38 +02:00
AzaezelX
b795776b23 requested feature: large number display 
origional author: Peter Simard
 2022-04-17 13:03:44 -05:00
Areloch
496f282249
Create CODE_OF_CONDUCT.md 
Didn't have one of these for consistent comprehension of expectations of community behavior
 2022-04-16 16:00:34 -05:00
Brian Roberts
bf1e8705ac
Merge pull request #765 from Azaezel/alpha40/previewSizeSlimdown 
bump down saveScaledImage default to 256
 2022-04-13 14:52:28 -05:00
AzaezelX
880ac5a264 bump down saveScaledImage default to 256 
also add a "Assets/Browser/PreviewImageSize" value lookup, which if left blank defaults to 256
 2022-04-12 19:46:19 -05:00
Brian Roberts
4ffa367240
Merge pull request #763 from Areloch/MiscFixes2022049 
Misc FIxes for 2022/04/09
 2022-04-10 22:15:19 -05:00
JeffR
1c7c32baa6 Separates out acquireAsset call for importing assets until after all assets have been imported, then runs it as a post step to ensure all assets are properly loaded before they're used 2022-04-10 19:41:37 -05:00
JeffR
50973b7f6f Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into MiscFixes2022049 2022-04-10 18:54:33 -05:00
Brian Roberts
02864095ee
Merge pull request #764 from Azaezel/alpha40/logNo_foundAssetcount 
getAssetIdByFilename loaded state fix
 2022-04-10 17:44:28 -05:00
AzaezelX
0136af477f getAssetIdByFilename loaded state fix 
getAssetIdByFilename should set the <type>Asset->mLoadedState = AssetErrCode::BadFileReference; so we know we're using a fallback
 2022-04-10 17:29:55 -05:00
JeffR
5c8d8fab00 Changes behavior with suffix appending of asset importer so it doesn't contaminate the original "clean" name, which is used for setting the mapTo value of material definitions 
Also adds a sanity check when applying the type suffix to see if it's already there to avoid needless doubleups
Fixes offsetting/positioning behavior on icon buttons to actually respect the icon position variable
Adds sanity checks to ensure we're not trying to utilize a in-process-of-deleting decoy dummy
Fixes handling of sliders in option menus to properly store and test unapplied values
Fixes handling of display device setting to properly store and test unapplied values
Adds additional logic to creation of shape and material asset previews to attempt to force-load dependencies to improve likelihood that they'll actually be loaded when we go to generate the preview.
Temp disables creating cubemap 'assets' via the RMB context menu in the AB
 2022-04-10 01:40:15 -05:00
Brian Roberts
96fd520eb7
Merge pull request #761 from zfbx/patch-1 
Add funding/sponsor options for support
 2022-04-09 05:53:04 -05:00
Brian Roberts
9b0150a7d0
Merge pull request #762 from zfbx/patch-2 
Updated readme with new links
 2022-04-09 05:52:51 -05:00
Brian Roberts
ab90f288c1
Merge pull request #751 from Azaezel/alpha40/sdl2Sync22MAR22 
update sdl to https://github.com/libsdl-org/SDL 22March 2022
 2022-04-09 05:52:30 -05:00
Tony
7cb438550d
Update FUNDING.yml 2022-04-08 18:04:21 -04:00
Tony
20a29027a1
add roadmap link 2022-04-08 18:03:37 -04:00
Brian Roberts
be3be2eb7d
Merge pull request #760 from Areloch/ForestBrushGroupToolingFixes 
Fixes tooling of Forest Editor to be module-friendly
 2022-04-08 01:29:06 -05:00
Tony
4e78800ae0
Updated readme with new links 
The release, downloads and tag will update once a tag is created and a release is pushed
 2022-04-07 20:54:57 -04:00
Tony
bcc7f2f6cf
Add funding/sponsor options for support 
More options can be seen here https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
 2022-04-07 20:30:25 -04:00