TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-07 05:21:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4972 commits 5 branches 33 tags 958 MiB
Commit graph

4972 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch dec9f54a9b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909 2021-09-10 02:20:13 -05:00
Areloch 8781f2ab55 Add getScriptPath console function to GUIAsset 
Shifted tracking of importing asset status to an enum for more robust handling
Added logic to properly init freshly created shapeConstructors with the newly imported shapeAsset
Fixed handling of assets that have been marked to be skipped, but needed to fill in the parent's dependencies(UseForDependencies enum value)
Cleaned up redundant recursive logic for importing assets
Disable Create Game Objects button in inspector
Fixed material assignment for convex proxies
Updated asset icons for AB with WIP images to be more clear
Fixed issue where type-generic icons in the creator items in the AB weren't showing correctly.
Force AB to show creator entries in list mode for efficiency and avoid icon scaling issues
Moved creator functions for AB to separate file for convenience
Filled out GUIControls in the AB's creator mode, and context world editor and GUI creator entries based on active editor
Added drag-n-drop handling for guiControls via AB creator in guiEditor mode
Added more types' profiles in the AB gui profiles to give more unique border colors for better visual clarity of asset type
Added editor setting to indicate if the editor should load into the last edited level, or the editor default scene
Fixed setting of highlight material overlay in shapeEditor
Added global keybind for GUIEditor so space also toggles assetbrowser
Fixed up binding/finding of shapeConstructor by assetId, which also fixed displaying of shape's material listing
 2021-09-10 02:13:56 -05:00
Areloch 6487e2eede
Merge pull request #495 from JeffProgrammer/tsneo 
TorqueScript Interpreter 2.0
 2021-09-09 19:22:15 -05:00
Jeff Hutchinson 35b33f1864 various fixes and memory corruption bug. 2021-09-09 19:30:32 -04:00
Brian Roberts ad5d0b6d1b
Merge pull request #563 from Bloodknight/Minor_Module_Fixes 
replace new with singleton to fix cannot re-declare object log file …
 2021-09-08 12:48:44 -05:00
Marc c285813540 replace new with singletone to fix cannot re-declare object lof file spam 2021-09-08 15:18:04 +01:00
Brian Roberts 753b6c7189
Merge pull request #561 from Areloch/SoundAssetInitRollin 
Sound asset initial rollin
 2021-09-08 00:17:38 -05:00
Jeff Hutchinson 27a4868b6e Fix buffer corruption. 2021-09-07 21:52:36 -04:00
Jeff Hutchinson 6d93e96dc3 NULL out an object variable if it fails to register. 2021-09-07 21:03:57 -04:00
Jeff Hutchinson 55c0a748b4 Don't generate op_inc whenever its used as an expression. 2021-09-07 19:43:39 -04:00
Areloch 6439cb84d4 Adds handling in project import to process SFXDescriptions and Profiles into assets and remove the redundant OG declarations 2021-09-05 23:47:11 -05:00
Brian Roberts b44a8cf644
Merge pull request #562 from Azaezel/alpha40/macABfix 
followup to #531. fixes the same issue on mac
 2021-09-05 15:09:32 -05:00
AzaezelX 252f1b65f3 followup to #531. fixes the same issue on mac 2021-09-05 14:54:41 -05:00
Areloch 0ca66b99db Added fix so if a looping sound is preview-playing in the AB and you edit the properties, it doesn't try to reload the asset while it's playing, causing a crash 
Added console method for looking up a soundAsset by filename
Added initial pass of project importer for sound assets content
 2021-09-05 03:43:41 -05:00
Jeff Hutchinson 9b2f4976c9 small regression fix. 2021-09-04 22:00:32 -04:00
Jeff Hutchinson c16b88d709 Fix temporary buffer for scripting conversions. 2021-09-04 21:25:11 -04:00
Jeff Hutchinson 478a04bea8 Fix DSOs and bump version! 2021-09-04 16:37:59 -04:00
Jeff Hutchinson 278bef8d1a Fix if to else if regression. 2021-09-04 16:23:20 -04:00
Areloch df0f8dafa6 Imported in UI sounds 
Fixed asset properties editing so it applies after saving
Added fix for making sound asset preview playback properly
 2021-09-04 02:27:21 -05:00
Areloch cd1fd1ccf4 Merge branch 'SoundAssetInitRollin' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-04 01:38:22 -05:00
Jeff Hutchinson 313c069ecb Fix xyz again by reverting previous commit and fixing the local variables from not resetting the object states. 2021-09-03 23:27:39 -04:00
Jeff Hutchinson 57de7fd379
Merge pull request #3 from Ragora/bugfix-tsneo-editors 
* BugFix: Corrections for editors.
 2021-09-03 20:06:31 -04:00
Robert MacGregor 5cce344bb1 * BugFix: Fix a missing <vector> include for GCC. 
* BugFix: Correct some globally used local variables in the editor code.
 2021-09-03 00:26:48 -04:00
Jeff Hutchinson 07877f246a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-09-02 22:24:19 -04:00
Jeff Hutchinson 7efe72aced More fixes with xyz lookup, and some cleanup and test cases. 2021-09-02 22:21:00 -04:00
Brian Roberts ce476f5e07
Merge pull request #560 from Ragora/bugfix-noinline-placement 
* BugFix: Correct placement of the TORQUE_NOINLINE statements
 2021-09-01 21:41:52 -05:00
Robert MacGregor d7ed88494e * BugFix: Correct placement of the TORQUE_NOINLINE statements for MSVC compat. 2021-09-01 22:38:55 -04:00
Jeff Hutchinson b0549118b6 various misc fixes from merge. 2021-09-01 22:36:59 -04:00
Jeff Hutchinson 17231ca9fb Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
 2021-09-01 22:26:23 -04:00
Jeff Hutchinson 8d75d60f91 Write out variable mapping table to DSO stream, and fix .dump() 2021-09-01 22:15:37 -04:00
Brian Roberts 3aa7174a64
Merge pull request #559 from Ragora/bugfix-gcc-release-mode 
* Workaround: GCC Release mode Runtime Errors
 2021-09-01 21:08:20 -05:00
Robert MacGregor 1b55dce613 * Workaround: Implement noinline attributes for problematic functions in str.cpp due to what appears to be GCC compiler bugs. 2021-09-01 21:12:12 -04:00
Jeff Hutchinson 9448256422 Fix console garbage error when evaluating strings. 2021-09-01 20:16:08 -04:00
Brian Roberts 09272e0e63
Merge pull request #550 from Areloch/MiscQOLFixes20210828 
Misc Quality of Life and Bug fixes
 2021-09-01 18:04:21 -05:00
Areloch e8a49ef4ca Requested cleanups 2021-09-01 17:57:21 -05:00
Areloch 25a32cba2a Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-01 17:44:43 -05:00
Brian Roberts 09492f0885
Merge pull request #558 from Areloch/MiscFixes20210901 
Misc Fixes and QOL improvements
 2021-09-01 17:38:24 -05:00
Brian Roberts 3f5a725c0b
Merge pull request #556 from Azaezel/alpha40/minorABcleanups 
mini cleanups for ab
 2021-09-01 17:37:40 -05:00
Brian Roberts c862edef25
Merge pull request #555 from JeffProgrammer/threadid 
Update thread ids for 64bit support.
 2021-09-01 17:36:49 -05:00
Areloch 534d90c002 Missed line adding ShapeEditorToolbar to main editor UI needlessly. 2021-09-01 01:19:53 -05:00
Areloch 683c438b09 Improves handling of rendering guiPopupCtrls where if the height extent is taller than the bitmap array height, it'll adjust the height to recenter the displayed bitmap elements. 
Streamlined the toolbar for the gui and world editors to utilize a stack, making the behavior and manipulation of toolbar elements significantly more consistent.
Added Settings and Asset Browser buttons to both gui and world editor toolbars for easier access.
Moved all tool toolbars over to work with the stack system to make them more consistent and better formatting
Added saving of asset browser's last position and extent so it remembers it on load.
Added editor setting to close the asset browser after completing a drag-n-drop action.
Added keybind to editor keybind list, making space toggle the asset browser
 2021-09-01 01:12:16 -05:00
Jeff Hutchinson f04aca9def Fix string stack issue returning from a foreach statement. 2021-08-31 22:18:08 -04:00
JeffR 56b0a0cb85 Initial hook-in of the sound asset's integration into sfxEmitter, as well as some fixups for editor/workflow usage. 2021-08-31 00:54:05 -05:00
Jeff Hutchinson 485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
AzaezelX 66d7b0c49f mini cleanups for ab 
seems some operating systems don't play nice with setting `extent =` outside of a define{init} block,
cleaned up %assetarray using $AssetBrowser::AssetArray
cleanup for terrain definition path display
 2021-08-30 01:50:47 -05:00
Brian Roberts ef6efbf738
Merge pull request #554 from Azaezel/alpha40/setNULLnono 
account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls
 2021-08-30 01:38:58 -05:00
Brian Roberts f6d3a30638
Merge pull request #551 from Azaezel/alpha40/decalDemangle 
DiffuseRenderPassManager.addManager "cleanups"
 2021-08-30 01:38:47 -05:00
Brian Roberts 61cb93643c
Merge pull request #552 from Azaezel/alpha40/classconvertsafety 
ensure new (foo) lines being converted are valid according to findObj…
 2021-08-30 01:38:35 -05:00
Jeff Hutchinson a2d5e475fb fix script issue. 2021-08-29 22:41:48 -04:00
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00