TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5047 commits 5 branches 33 tags 958 MiB
Commit graph

5047 commits

This branch
This branch
All branches
Author SHA1 Message Date
AzaezelX
ef652ad8b9 clean out of the manual getSFXProfile() methods 2021-09-26 20:07:49 -05:00
AzaezelX
7b137c2ee8 genProcessor("LightningData"... attempt. will need to re-review. 2021-09-26 17:30:57 -05:00
AzaezelX
dba0899887 soundasset augments: get<name>Profile methods, test for emptystring, initialize asset arrays 
lightning provides a conversion sample (attempt. it's still yelling)
 2021-09-26 17:30:13 -05:00
AzaezelX
2181ce08c3 lightning ref fixes 2021-09-26 03:12:14 -05:00
AzaezelX
b83babe175 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into SoundAssetImplements 2021-09-26 03:07:23 -05:00
Jeff Hutchinson
9c243bc5e2
Merge pull request #596 from OTHGMars/menuControl 
GuiGameListMenuCtrl Update
 2021-09-25 20:42:10 -04:00
Brian Roberts
97ddb97410
Merge pull request #594 from JeffProgrammer/executef-fixes 
Fix specific usage of Con::executef where it was not being assigned t…
 2021-09-25 18:13:27 -05:00
Areloch
7a3f735067
Merge pull request #593 from JeffProgrammer/material-editor-fixes 
Material editor fixes from eval cleanup.
 2021-09-25 01:52:15 -05:00
OTHGMars
666065ce6c GuiGameListMenuCtrl Update 
Methods to simplify managing localized option lists.
Adds a text key to each option in an option row.
Adds methods for getting the current selections index or key value.
Adds methods for setting the current selection by index or key value.
This change is backward compatible. If the new methods are not called, the control behavior is unaffected.
 2021-09-25 02:48:30 -04:00
Jeff Hutchinson
e35b5f5119
Merge pull request #591 from Ragora/bugfix-object-deletion-crash 
* BugFix: Fix a crash that sometimes occurs when groups of of objects are deleted
 2021-09-24 23:28:15 -04:00
Jeff Hutchinson
8aa1f2e881
Merge pull request #589 from Ragora/bugfix-linux-win-console 
* BugFix: Corrections to allow the Linux win console to work
 2021-09-24 23:27:37 -04:00
Jeff Hutchinson
e7f002228c
Merge pull request #590 from Ragora/bugfix-projectile-on-add 
* BugFix: Correct the onAdd callback not being raised for Projectiles
 2021-09-24 23:27:11 -04:00
Jeff Hutchinson
755bbacaa0 Fix specific usage of Con::executef where it was not being assigned to a ConsoleValue before getting it's data out of it. 2021-09-24 19:32:57 -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
Jeff Hutchinson
f1ee4f781b Material editor fixes from eval cleanup. 2021-09-24 19:09:43 -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
Robert MacGregor
12f4af51f5 * [Editor] BugFix: Fix a crash that sometimes occurs when groups of objects are deleted in the world editor. 2021-09-24 17:58:17 -04:00
Robert MacGregor
55063601e6 * [Projectile] BugFix: Correct the onAdd callback not being raised for projectiles. 2021-09-23 22:58:25 -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
Robert MacGregor
4cfb3c4f04 * [Linux] BugFix: Corrections to allow the Linux win console (Ie. the terminal you ran the game from) to act as a console input. 2021-09-22 20:28:39 -04: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
marauder2k7
57aceb60fb QOC 
Code cleaning of unnecessary else'
Remove unnecessary dynamic_casts
 2021-09-20 17:57:16 +01:00
marauder2k7
e9d0f68b55 Preload all soundAsset 
-Fixed: Preloads need to preload all soundAssets not just the ones it was preloading before.
 2021-09-20 17:05:11 +01:00
marauder2k7
30b57c0f95 More turns 
-Flying Vehicle
-Proximinity Mine
 2021-09-20 14:17:10 +01:00
marauder2k7
704eb27600 More Implements 
-Most Vehicles and FX classes
-Vehicle classes may need more preloads for assets.
 2021-09-20 13:07:50 +01:00
marauder2k7
1ea693fea6 SoundAsset Array 
Few fixes to soundasset array to stop it complaining
 2021-09-20 10:49:34 +01:00
marauder2k7
3ad6d47ca9 Update SoundAsset.h 
-SoundAsset array setters getters and binds in place
 2021-09-20 09:55:36 +01:00
marauder2k7
c92cfe3e81 SoundAssetImplements 
-Explosion
-Lightning
-Splash

-Other sound asset implementations will require soundasset array if possible.
 2021-09-20 09:37:31 +01: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