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

4842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert MacGregor 3ecdf292d7 * Adjustment: Remove some unnecessary ifdef logic in UUID headers. 2021-08-20 22:53:45 -04:00
Robert MacGregor 3f34c9020e * [ParticleEmitter] BugFix: Make GCC happy by removing the inline specification on updateKeyData. 2021-08-14 18:22:30 -04:00
Robert MacGregor eca3fbfa67 * [UUID] BugFix: Correct a memory mismanagement error in UUID programming due to the way xuuid_t is utilized. 2021-08-14 17:44:17 -04:00
Robert MacGregor 3c61538811 Merge remote-tracking branch 'main/Preview4_0' into Preview4_0 2021-08-14 14:36:49 -04:00
Brian Roberts 190343cbc7
Merge pull request #531 from Ragora/bugfix-asset-browser-linux 
Asset Browser on Linux Fixes
 2021-08-13 22:35:40 -05:00
Robert MacGregor 3a4f0e8808 * [x86UNIXFileio] BugFix: Correct an error in the initial call to recurseDumpDirectories that causes an empty list of directories to always be returned. 
* [UI Module] BugFix: Change module directory name to uppercase for matching the declared module name in its module file for asset tree browsing to work correctly on case sensitive systems.
 2021-08-13 23:31:29 -04:00
Brian Roberts 8d9f57b077
Merge pull request #526 from Azaezel/alpha40/abExecOrder 
ensure the asset browser is executed prior to other pseudo-modules that may need bits
 2021-08-13 22:21:06 -05:00
Brian Roberts c9d2ec0f56
Merge pull request #527 from Azaezel/alpha40/stopTheBleeding_Materials 
suppress deletion of temp material created by the editor
 2021-08-13 22:20:58 -05:00
Brian Roberts 0be2086e0f
Merge pull request #529 from Azaezel/alpha40/splashscreenNixFix 
get the splash screen on linux to stop corrupting the main window
 2021-08-13 22:20:48 -05:00
Brian Roberts f43619b994
Merge pull request #530 from Ragora/bugfix-material-editor-pathing 
* [Material Editor] BugFix: Correct case sensitivity errors on the model previews when running on case sensitive systems (Ie. Linux).
 2021-08-13 20:20:43 -05:00
Robert MacGregor 8d4d4b7588 * [Material Editor] BugFix: Correct case sensitivity errors on the model previews when running on case sensitive systems (Ie. Linux). 2021-08-13 21:07:29 -04:00
AzaezelX 1e119141d2 ok, turns out the asset browser needs to have the world editor spooled up to slot in place 2021-08-12 19:08:04 -05:00
AzaezelX 431fb05b6f get the splash screen on linux to stop corrupting the main window 2021-08-12 18:13:33 -05:00
AzaezelX 98941702a7 supress deletion of temp mateiral created by the editor 
stops it from crashing out swapping back and forth into the mat editor
not a proper fix, just ensures we have *something* for the weekend if we don't do a better job.
 2021-08-12 17:02:13 -05:00
AzaezelX d4c739c348 ensure the asset browser is executed prior to other tll pseudo-modules that may need bits 2021-08-10 23:29:48 -05:00
Brian Roberts 9dd9e9fae5
Merge pull request #522 from Azaezel/alpha40/stringstringShenanigans 
bad constructor usage! bad! GCC no like!
 2021-08-10 22:31:21 -05:00
Brian Roberts 86a8fb5854
Merge pull request #523 from Azaezel/alpha40/windowWonk 
report if SDL_CreateWindow is unable to create a window at all
 2021-08-10 22:29:05 -05:00
Brian Roberts d843a3247a
Merge pull request #521 from Azaezel/alpha40/uniformReportRetort 
give useful data when not finding a given shader var
 2021-08-10 16:46:31 -05:00
AzaezelX a2ecbe53dd gcc seems to have an issue converting nullptr to Resource<TSShape>, so this will at least get it compiling 2021-08-10 03:13:46 -05:00
AzaezelX c7b44203ad sanity check 2021-08-10 03:11:52 -05:00
AzaezelX fc9d767256 report if SDL_CreateWindow is unable to create a window at all 2021-08-09 23:48:01 -05:00
AzaezelX 0285e073b9 wrap all the things! 2021-08-09 22:40:41 -05:00
AzaezelX cd6e027d1f nother specifier wrapper 2021-08-09 22:31:58 -05:00
AzaezelX 20e4f3c120 wrap to remove ambiguity 2021-08-09 22:24:20 -05:00
AzaezelX 1037b5d718 extraneous entry 2021-08-09 22:24:03 -05:00
AzaezelX 76386f433c fix eronous extra glue code in macro, fix slash direction in include 2021-08-09 22:08:55 -05:00
AzaezelX 594c4f65c7 bad constructor usage! bad! GCC no like! 2021-08-09 21:34:24 -05:00
AzaezelX a944b6435c give useful data when not finding a given shader var 2021-08-09 20:19:16 -05:00
Areloch 06aef7cff3
Merge pull request #520 from Areloch/EngineAssetify 
Engine Asset Update
 2021-08-09 19:11:34 -05:00
Brian Roberts 6350b578ef
Merge pull request #517 from lukaspj/task/update-tinyxml 
Update TinyXML to TinyXML2
 2021-08-09 19:00:29 -05:00
Areloch 0dddeeb6dd Corrects preload logic for projectiles to only fail if shape is specified, but failed to load 
Corrects logic in Project Importer for if cubemapData is defined in material scripts, it can process them correctly.
 2021-08-09 18:55:05 -05:00
AzaezelX 47f2810e34 clients need loadModuleMaterials(); run too 2021-08-09 16:14:34 -05:00
AzaezelX 11a29ef97a preload materials for shapebasedatas and debris 2021-08-09 16:14:10 -05:00
AzaezelX e7403197c7 yell when warningmaterial is undefined 2021-08-09 16:13:30 -05:00
AzaezelX 58b539653e skip using the extension for the asset.scriptFile entry 2021-08-09 13:48:44 -05:00
Areloch 426f5974da Corrected ShapeAsset array initpersist macro to assign arraySize 
Uncommented line in preview build function for material assets so they generate the reduced preview image
Added cubeFace to cubemapData import processing vars checked
Updated ShapeBaseImageData convert vars to properly use asset var names
 2021-08-08 23:44:17 -05:00
Areloch 34f0f01cea Adds console function to compare file modified times 
Adds console function to save a scaled image
Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified
Added logic to generate scaled preview image for material and image assets to improve load times of AB
 2021-08-08 16:20:58 -05:00
Areloch 555c563b39 More updating of editor icons to assets 
Fixed handling of convex shape editor's active and default materials
Fixed assignment of material for convex shapes via editor
Fixed material editor map assignment logic
Added utility function to detect possible duplicate files in project to ProjectImporter
Added conversion of legacy sky and water classes to importer
Fixed bufferLen issue with guiTreeViewCtrl
 2021-08-07 19:27:01 -05:00
Areloch 2f5f585aaf Fixed logic for parsing registerDatablock paths to trim script extensions during import conversion 
Fixed creation of materialAsset from AB to properly generate companion script file
Fixed logic in project import that if we import in a legacy module script, we get rid of the newly generated one in favor of the old one
 2021-08-07 02:36:38 -05:00
AzaezelX bdf32f4f7b texture profile cleanups 2021-08-06 03:33:02 -05:00
Areloch c76c5f7ee1 Removed unneeded duplicate of blank sky skybox 
Fixed various inspector field editor button icons
Fixed drag-n-drop apply logic for material assets
Fixed up some convex shape editor material references
Fixed tools overlay gui profile opaqueness flag
Fixed uvEditor image asset binding/lookups
Fixed decal editor preview display
Fixed shape editor would you like to save your changes prompt
Added additional sanity check for bad material reference in tsMesh
Fixed saving of terrain asset when working in editor default level
 2021-08-06 01:06:36 -05:00
AzaezelX c5d0310bc3 Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check 
# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp
 2021-08-02 13:54:51 -05:00
Areloch 88ae8a9665 Added getShapeConstructorFilePath console function on shapeAsset 
Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets
 2021-08-02 04:20:27 -05:00
AzaezelX c43cee13ab Merge branch 'task/update-tinyxml' of https://github.com/lukaspj/Torque3D into EngineAssetify_Followups_XML2Check 2021-07-31 17:12:44 -05:00
AzaezelX b5b06c4a10 assettext/macrotext/assetdoc refinements ala https://github.com/TorqueGameEngines/Torque3D/pull/518 2021-07-31 17:06:19 -05:00
AzaezelX 59e162abe5 void floating point error clipping courtessy higuy and hutch 2021-07-31 17:05:29 -05:00
AzaezelX 33e78fd8a8 init reflection probes 2021-07-31 17:04:31 -05:00
Lukas Aldershaab 9a795e89f3 Update usage of TinyXML to use TinyXML2 2021-07-31 21:54:19 +02:00
Lukas Aldershaab cd170910b2 Replace TinyXML library with version 9.0.0 of TinyXML2 2021-07-31 21:53:10 +02:00
AzaezelX b73353a446 we want old direct-file references first, then asset macros, since those plug in the old entries to empty if valid. 2021-07-29 11:12:07 -05:00