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

5427 commits

This branch
This branch
All branches
Author SHA1 Message Date
JeffR 630285def6 Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file 
Also updates importers to correctly handle this change
Adds ability for taml XML serialization to properly assign array'd fields
Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized
AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file
Updated loading/handling logic in terrain material asset to be more similar to regular material assets
 2022-01-30 11:50:16 -06:00
Brian Roberts 656475deaf
Merge pull request #722 from Azaezel/alpha40/ambiguousRef 
clean up ambiguous reference
 2022-01-22 13:16:13 -06:00
AzaezelX eeff4d858a clean up ambiguous reference 2022-01-22 03:27:22 -06:00
Brian Roberts 3b12fefdf1
Merge pull request #721 from OTHGMars/guiBmpFix 
GuiBitmapCtrl named texture fixes.
 2022-01-22 01:03:05 -06:00
OTHGMars bed3be278c GuiBitmapCtrl named texture fixes. 
Adds StringTableEntry when bitmap is set via setBitmapHandle.
Prevents existing bitmap handles from being dropped in onWake (they are preserved in onSleep).
 2022-01-21 19:47:41 -05:00
Brian Roberts 024dcfaabd
Merge pull request #720 from Areloch/SimGroupSimSetCheck 
Changes the -> syntax check from exclusively checking simgroups to checking simsets, allowing both to be used
 2022-01-21 17:45:35 -06:00
JeffR ed13bdfdd2 Changes the -> syntax check from exclusively checking simgroups to checking simsets, allowing both to be used 2022-01-21 16:01:44 -06:00
Brian Roberts d14ffc8714
Merge pull request #719 from Areloch/UpdatedProjectImporter 
Updated project importer
 2022-01-20 17:52:25 -06:00
JeffR 1952820ef2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into UpdatedProjectImporter 2022-01-20 17:48:17 -06:00
JeffR 728aa83481 Comments and cleanup 2022-01-20 17:48:01 -06:00
JeffR ecd35df7e9 Implementation of updated handling of Legacy Project importer to better seperate out importer versions as well as more explicit processing of incoming content 2022-01-20 01:14:43 -06:00
Brian Roberts e2a2f26828
Merge pull request #717 from lukaspj/fix/improve-taml-xml-formatting-no-tampering 
Improve tinyXml2 output formatting
 2022-01-17 05:03:24 -06:00
Brian Roberts 33e3e41c8b
Merge pull request #718 from Areloch/SoundAssetFleshout 
Sound Asset Fleshout
 2022-01-03 20:58:55 -06:00
JeffR 15ef8b4fbe Cleaned up implementation of #712 
Also updates other game classes like the shapebase to utilize the sound asset hooks properly.
 2022-01-03 20:57:10 -06:00
Lukas Aldershaab 3ef57168b2 Cleanup fsTinyXml implementation 2022-01-03 21:16:34 +01:00
Lukas Aldershaab 5abd66dfa3 Split PrettyPrinting functionality from VFS printing 2022-01-03 21:10:26 +01:00
Lukas Aldershaab 165459c90b Improve tinyXml2 output formatting 2022-01-02 12:18:25 +01:00
Brian Roberts 3812ce2e82
Merge pull request #715 from Areloch/ConvexShapeSpawnFix 
Fixes creation of convex shapes via editor
 2021-12-25 17:11:08 -06:00
JeffR cde1d68f78 Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without 
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
 2021-12-25 12:30:31 -06:00
Brian Roberts c7342cc64f
Merge pull request #714 from Areloch/AssetPreviewUpdate 
Updates the handling of the baking of shape asset previews
 2021-12-24 17:34:42 -06:00
JeffR b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake 
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
 2021-12-24 17:26:45 -06:00
Brian Roberts d9bedbe31c
Merge pull request #711 from Azaezel/alpha40/audioWork 
fix ServerPlaySound
 2021-12-16 18:25:28 -06:00
AzaezelX 7c32abd026 fix ServerPlaySound 2021-12-16 18:25:14 -06:00
Brian Roberts f88e82c099
Merge pull request #705 from Azaezel/alpha40/playSoundAugs 
augments playSoundAsset
 2021-12-16 01:46:51 -06:00
Brian Roberts 09cfeb08a9
Merge pull request #707 from Ragora/bugfix-macos-install-build 
WIP: BugFix: Correct 'make install' not working on MacOS
 2021-12-16 01:41:19 -06:00
Brian Roberts 8be84f872d
Merge pull request #709 from rextimmy/gl_anisotropy_fix 
fix opengl device not returning the correct anisotropic value
 2021-12-16 01:12:49 -06:00
rextimmy e1398895b3 fix opengl device not returning the correct anisotropic value 2021-12-15 20:09:18 +10:00
Robert MacGregor bd979aa5cf * Adjustment: Minor formatting fix in basics.cmake. 2021-12-14 22:23:23 -05:00
Robert MacGregor 2746dcfe48 Merge remote-tracking branch 'main/Preview4_0' into bugfix-macos-install-build 2021-12-14 22:19:31 -05:00
Robert MacGregor d1dbfad0c7 * [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided. 2021-12-14 22:06:47 -05:00
Brian Roberts c7bf58c0a7
Merge pull request #708 from Ragora/bugfix-unix-include-paths 
BugFix: Correct a windows-only pathing issue in terrMaterial
 2021-12-14 18:47:27 -06:00
Robert MacGregor deb994cb13 * BugFix: Correct a windows-only pathing issue in terrMaterial. 2021-12-14 19:44:44 -05:00
AzaezelX a76613604a augments playSoundAsset 
adds hooks to the garbage collector
exposes an (optional) position.
adds a ServerPlaySound + clientCMDPlaySound command pair to trip that for all clients
 2021-12-13 20:36:50 -06:00
Brian Roberts 3c95fa808e
Merge pull request #704 from Areloch/TerrainSideProjectFix 
A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in
 2021-12-13 16:30:16 -06:00
JeffR 434c6c26fe A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in 2021-12-13 15:56:14 -06:00
Brian Roberts 1f4c488640
Merge pull request #703 from Ragora/bugfix-allocation-size-mismatch 
BugFix: Fix a Windows ASAN reported allocation/deallocation mismatch error.
 2021-12-13 07:35:59 -06:00
Robert MacGregor cc45f9e9a4 * BugFix: Fix a Windows ASAN reported allocation mismatch error. 2021-12-13 00:04:24 -05:00
Brian Roberts b0218d129c
Merge pull request #702 from Areloch/ImposterFix 
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
 2021-12-10 03:39:58 -06:00
JeffR a8b3d874a1 Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely. 2021-12-10 00:01:26 -06:00
Brian Roberts bd876e427a
Merge pull request #701 from JeffProgrammer/console-warn-void-fix 
Fix console warning when calling void functions in console
 2021-12-08 22:10:46 -06:00
Jeff Hutchinson 73b023a4b7 Fix console warning when calling void functions in console 
Forgot to add this check when rewriting the interpreter.
 2021-12-08 21:00:50 -05:00
Brian Roberts 0e06e2853e
Merge pull request #691 from Azaezel/alpha40/terrainTrickery 
use internalname for terrain layers
 2021-12-05 19:32:29 -06:00
Brian Roberts 07310d4d6d
Merge pull request #699 from Areloch/CoreInitCleanup 
Cleans up some core execution behavior
 2021-12-05 19:31:13 -06:00
Areloch c6c2e9139f Cleans up some core execution behavior 
Removes a duplicated material definition
Fixes up PostFX init'ing order so it inits before trying to load the prefs
Adds a skip of loading the CoreModule's materials so we don't double-execute any of them
Fixes a typo for the Vignette PostFX's name so it properly integrates
 2021-12-05 11:00:02 -06:00
Brian Roberts ce1fbe5f2c
Merge pull request #698 from Areloch/RemoveLibraryTabsFromEditors 
Removes the Library tabs from the World and GUI editors to avoid confusion
 2021-12-05 02:33:10 -06:00
Areloch a30e9c6242 Removes the Library tabs from the World and GUI editors to avoid confusion. Adjusts the creation namespace from ECreatorWindow to a dummy object ObjectCreator to handle invoking for creation 2021-12-04 22:47:10 -06:00
Areloch 54fb5837ec
Merge pull request #696 from Ragora/bugfix-macos-compile 
BugFix: Correct compilation for MacOS
 2021-12-04 14:11:00 -06:00
Robert MacGregor 5fa7c62ba9 * BugFix: Don't use the register keyword in the console grammar files. 2021-12-03 20:33:02 -05:00
Robert MacGregor 58f6431ff0 * BugFix: Correct compilation for MacOS by explicitly specifying C++11 for all libraries and C++17 for the engine itself. 2021-12-03 16:37:22 -05:00
Brian Roberts 82b33b757a
Merge pull request #694 from rextimmy/cmake_cpp17 
Minor cmake corrections
 2021-12-02 15:19:10 -06:00