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
5024 commits 5 branches 33 tags 958 MiB
Commit graph

5024 commits

This branch
This branch
All branches
Author SHA1 Message Date
OTHGMars 58a79e0105 inputTest Module Update 
Updates the input event monitor to work with the current BaseGame template.
 2021-09-24 22:55:59 -04:00
Jeff Hutchinson 0f89373782
Merge pull request #592 from Ragora/bugfix-worldeditor-datablock-spawning 
* BugFix: Correct an object spawning error
 2021-09-24 19:11:41 -04:00
Robert MacGregor d7919950bf * [Editor] BugFix: Correct an object spawning error when attempting to drag and drop datablocks from the asset browser where they would always spawn at origin. 2021-09-24 18:34:57 -04:00
Brian Roberts 2e153e43e0
Merge pull request #588 from Azaezel/alpha40/splashscreenSuppression 
kill splashscreen on nonwindows
 2021-09-23 20:57:10 -05:00
AzaezelX 901228c3a8 kill splashscreen on nonwindows 
was worth a shot, but it's playing up way too much to focus on at present
 2021-09-21 23:19:00 -05:00
Brian Roberts f83b528f3c
Merge pull request #587 from JeffProgrammer/local-evals 
Allow local variables to be used in eval.
 2021-09-20 20:35:27 -05:00
Jeff Hutchinson 2d50f52cf1 Allow local variables to be used in eval. 2021-09-20 21:00:33 -04:00
Brian Roberts 5137e54a7c
Merge pull request #586 from Azaezel/alpha40/particleCleanups 
particle cleanups
 2021-09-20 14:10:54 -05:00
AzaezelX c150afebaa particle cleanups 
misc dupe code cleanup bits.
safeties for the varous flavors of void ParticleEmitter::setup
ideally we circle back to break some of that logic on out to shared steps
 2021-09-20 13:50:47 -05:00
Brian Roberts bda5266c88
Merge pull request #584 from Areloch/QOL20210918 
Misc QOL and Bugfixes 2021/09/19
 2021-09-19 14:55:14 -05:00
Areloch ef5daae770 Removed unneeded var 2021-09-19 12:55:56 -05:00
Areloch 9a809dfb6b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-09-19 02:28:19 -05:00
Brian Roberts 2fe767f2cd
Merge pull request #578 from Azaezel/alpha40/dedicatedGFXnullouts 
dedicated gfx device suppression
 2021-09-19 01:57:22 -05:00
Brian Roberts c2d5df4c86
Merge pull request #583 from Ragora/bugfix-opengl-errors-during-load 
* [OpenGL] BugFix: Correct shader errors being thrown during load
 2021-09-19 01:57:04 -05:00
Brian Roberts c055276d21
Merge pull request #579 from Areloch/PrecipdataSoundConvert 
Converts precipitationData to use sound asset macros
 2021-09-19 01:56:43 -05:00
Areloch adec6e7c74 Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed. 
Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename
Cleaned up message spam from the MaterialSlot fields on TSStatics
Added getter/setters for terrain file and assets
Removed unneeded exec of tools profiles for MainMenuGUI
Add logic to remove creators section of AB if in select mode
Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox'
Fix classname for NotesObject in AB Creator Entry
Fix issue where ConvexShapeEditor toolbar would hide after being seen once
Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases
Fixed default image assignments for River objects on foam/ripple/depth
Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now.
Updated various fields' defaults for ObjectBuilder to utilize correct assetId's
Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed
Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before
Added menubar items in the Object category to take control and release control of control objects quickly for testing
 2021-09-19 01:01:47 -05:00
Areloch 2a8f8c15f3 Shifted long-form check/fetch of sound asset's SFXProfile to a convenience function 
Fixed formatting on projectImporter.tscript file
 2021-09-18 02:46:15 -05:00
Robert MacGregor c8a5ccb191 * [OpenGL] BugFix: Correct shader errors being thrown during the load phase due to direct use of glUseProgram causing desync with GFXGLDevice. 2021-09-17 17:39:29 -04:00
Brian Roberts 4176482373
Merge pull request #581 from Ragora/bugfix-incorrect-function-call-crash-fix 
* BugFix: Correct function call Error that causes the engine to crash
 2021-09-16 20:23:15 -05:00
Robert MacGregor f9b78597f7 * BugFix: Correct an error that causes the engine to crash when calling non-namespaced engine functions incorrectly. 2021-09-16 21:21:04 -04:00
Areloch 17d1253ba2 Converts precipitationData to use sound asset macros 
Adds handling for soundProfile fields and lookups of sound assets by SFXProfile name in project importer
 2021-09-15 00:41:23 -05:00
AzaezelX 98a4e7fb12 dedicated gfx device surpression 
augments $Video::forceDisplayAdapter = -1; to force usage of GFXAdapterType::NullDevice
skips trying to open a splash window for dedicated servers
bypasses guicanvas window display if window does not exist
 2021-09-14 17:49:27 -05:00
Brian Roberts 328319b853
Merge pull request #577 from JeffProgrammer/ts-objectcopyfailures 
Reimplement object copy failures.
 2021-09-13 20:06:24 -05:00
Jeff Hutchinson a7db690b59 Reimplement object copy failures. 2021-09-13 19:46:21 -04:00
Brian Roberts 4effefce91
Merge pull request #576 from JeffProgrammer/more-eval-cleanups 
Clean up more evals that have local variables are not working correctly.
 2021-09-12 22:03:23 -05:00
Brian Roberts 0e775be56b
Merge pull request #575 from Areloch/QOLBugfix20210912 
Misc QOL and bugfixes for 2021/09/12
 2021-09-12 21:17:03 -05:00
Jeff Hutchinson 7556e403e7 Clean up more evals that have local variables are not working correctly. 2021-09-12 15:09:33 -04:00
Areloch 5892ff7428 Adds handling for drag-and-drop import of files even if asset browser is not open. If world or gui editor are the active controls, then it will injest the incoming files and prompt what their destination module and path will be via a new popup window. After clicking OK, import continues into that destination. 
Cleaned up commented lines from drag-and-drop functions.
Fixed issue where material icon on buttons in the object creator windows wouldn't display.
Fixed issue where it wasn't correctly binding cloud textures for BasicClouds object or ripple/foam/depth textures for water objects when newly created
Fixed issue where when double-clicking on a datablock type in the datablock editor, wasn't correctly going through the module selection process, making an invalid destination.
Added handling for Trigger object creation via TriggerData class
Standardized double-click handling of datablock entries in AB to respect double click action mode, and properly either open the datablock editor to the given datablock, or spawn it.
Made Create New Datablock prompt window indicate the destination module to be clearer where it's going if force-prompt of module setting is off.
 2021-09-12 05:32:30 -05:00
Jeff Hutchinson a30f64506f
Merge pull request #570 from JeffProgrammer/remove_fmod 
remove FMODex from Torque3D
 2021-09-11 20:34:19 -04:00
Brian Roberts 4860e548d0
Merge pull request #573 from Areloch/toolPaletteFix 
Fixes initial indexing of the tool palette widgets
 2021-09-11 17:17:17 -05:00
Brian Roberts cf8169da5a
Merge pull request #574 from Areloch/PrototypingExpansion 
Updates Prototyping module
 2021-09-11 17:17:06 -05:00
Areloch 3bfb9a320a Updates Prototyping module. Reorganizes primitive shapes, adds some vehicle shapes, adds datablocks for prototyping wheeled, hover and flying vehicles. 2021-09-11 17:13:23 -05:00
Areloch 97584a9838 Fixes initial indexing of the tool palette widgets 2021-09-11 17:07:20 -05:00
Brian Roberts c003cad3d0
Merge pull request #572 from JeffProgrammer/fix-material-editor 
Fix local variable being eval'd in materialEditor
 2021-09-11 16:52:46 -05:00
Jeff Hutchinson efb98d420d Fix local variable being eval'd in materialEditor 2021-09-11 16:31:10 -04:00
Jeff Hutchinson 41bd5ef6b6 remove FMODex from Torque3D 
The current version of FMod in Torque3D uses the legacy ex plugin, which hasn't been around for a long time.
 2021-09-11 16:29:32 -04:00
Brian Roberts 7663fb6f9a
Merge pull request #571 from JeffProgrammer/fix-ts-datablocks 
Forgot to null out the datablock after being deleted when it fails to preload
 2021-09-11 14:20:12 -05:00
Jeff Hutchinson 7f59bc6350 Forgot to null out the datablock after being deleted when it fails to preload. 2021-09-11 15:16:36 -04:00
Brian Roberts 772c0ae25b
Merge pull request #569 from Areloch/guiContentImportFix 
%guiContent importer compliance fix
 2021-09-11 02:38:49 -05:00
Areloch 4cf40defe6 Adds handling to project importer so if incoming gui files have the %guiContent declaration at the start, it's converted to a global to comply with the script interpreter 2021-09-11 02:28:14 -05:00
Brian Roberts 86fbb3748b
Merge pull request #565 from Areloch/BugfixQOL_20210909 
Bugfix qol 20210909
 2021-09-11 01:52:19 -05:00
Brian Roberts 7e887e79cc
Merge pull request #568 from Azaezel/alpha40/upconvertPhysicsShapeData 
fix PhysicsShapeData upconvert entry
 2021-09-11 01:15:08 -05:00
Brian Roberts 465b1815d7
Merge pull request #567 from Ragora/bugfix-guieditor-mission-editor 
* BugFix: Correct an error where the GUI editor cannot be opened
 2021-09-11 01:14:13 -05:00
AzaezelX 3384d7f426 fix PhysicsShapeData upconvert entry 2021-09-10 22:37:05 -05:00
Robert MacGregor f6f204a13a * BugFix: Correct an error where the GUI editor cannot be opened when going from GUI editor to mission editor (or any other editor). 2021-09-10 20:10:53 -04:00
Brian Roberts eb7968538b
Merge pull request #564 from Azaezel/alpha40/macrocleanup 
macro cleanup
 2021-09-10 18:32:00 -05:00
Brian Roberts 1e7a932a9e
Merge pull request #566 from Azaezel/alpha40/previewPixelfix 
don't try to generate mipmaps for images that aren't n^2 dureing prev…
 2021-09-10 18:18:46 -05:00
AzaezelX 5f0551b831 don't try to generate mipmaps for images that aren't n^2 dureing preview map generation 2021-09-10 18:18:30 -05:00
Areloch 140c575f47 Minor corrections for localvar issues 2021-09-10 16:23:00 -05:00
Areloch b9c071b9fd Cleanup mismerge lines 2021-09-10 15:14:57 -05:00