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

204 commits

Author SHA1 Message Date
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
eb7968538b
Merge pull request #564 from Azaezel/alpha40/macrocleanup 
macro cleanup
 2021-09-10 18:32:00 -05:00
Areloch
6487e2eede
Merge pull request #495 from JeffProgrammer/tsneo 
TorqueScript Interpreter 2.0
 2021-09-09 19:22:15 -05:00
AzaezelX
e4d16a8c61 (re) add collision yo noshape.dts 
set all rigidshapedatas to default to noshape instead of blank to fix the lack of a basic collision mesh blocking datablock creation
 2021-09-09 18:33:03 -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
Jeff Hutchinson
485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
AzaezelX
68c6b343d5 DiffuseRenderPassManager.addManager "cleanups" 
adds bintypes where they're lacking, since that's an active object-type filter to avoid accidently rendering things twice. (particleBin being like glowmanager, a seperate flow, that acts up if filtered in that manner)
basiconly likewise is intended to avoid multiple-pass insertions, despite the varname.
 2021-08-28 19:27:53 -05:00
Robert MacGregor
452ef71274 * BugFix: Correct $i and %i interchangeably being used in parseArgs.tscript. 2021-08-20 20:38:24 -04:00
Jeff Hutchinson
717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
 2021-08-13 20:14:39 -04:00
AzaezelX
47f2810e34 clients need loadModuleMaterials(); run too 2021-08-09 16:14:34 -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
3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Brian Roberts
8722d8bfd2
Merge pull request #515 from Azaezel/alpha40/moduleUnmangle 
partly address #502
 2021-07-28 13:31:10 -05:00
Brian Roberts
8d122bf3a6
Merge pull request #509 from Azaezel/postfxManagerManglefix 
adress #508 - fix postfxmanager default initialization
 2021-07-28 13:30:52 -05:00
AzaezelX
438e6cbb3c fix for diffuse map mangling in several cases, filter imposters out of real time lighting (for now?) fix the blankskybox via a resave, and filter "badfilereference" and "failed" assets out of variable replacement for the project converter 2021-07-25 17:18:55 -05:00
Areloch
432d201569 Further conversions of missed file fields in core and tools 
Assets created for missed objects and files
Improvements to the Project Importer to correct a number of issues, including not parsing ,'s from object names, trimming whitespace, pruning script extensions from exec invokes
 2021-07-24 02:08:23 -05:00
AzaezelX
795292bed5 alter nomaterial asset to a) use an imageasset, and b) remove the .cs assumption 2021-07-22 12:21:22 -05:00
Areloch
3e131f5b8e Added changes missed via merge failures. 
Removed some unused files/references that were causing errors, related to issues #502 & #512
 2021-07-20 20:05:49 -05:00
AzaezelX
817f01ff92 followup: readd, and rename the module.ScriptFile entries to thier lower case 2021-07-20 12:15:05 -05:00
AzaezelX
2090d85aa3 rename core and tools modules and index files to match the directory 
(ornery tool doesn't like case renames, so delete and readd)
 2021-07-20 12:13:54 -05:00
AzaezelX
29286ed924 adress #508 - fix postfxmanager default initialization 2021-07-19 20:45:53 -05:00
Areloch
5525f8ecdd Converts all game, gui editor, and system classes to utilize assets 
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
 2021-07-19 01:07:08 -05:00
AzaezelX
3c0ca5ea88 typofix in getScreenResolutionList 2021-07-09 21:17:13 -05:00
Jeff Hutchinson
acde0c3f0b Merge branch 'Preview4_0_DevHead' into tsneo 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
 2021-06-18 21:13:49 -04:00
OTHGMars
dd665496d1 Borderless window defaults. 
Limits borderless windows to the monitor usable area on non windows platforms to prevent the window from rendering behind taskbar/title bars.
 2021-05-14 03:57:00 -04:00
OTHGMars
a5c809a738 Limit fullscreen resolution to options that match the monitor aspect ratio. 2021-05-13 20:52:04 -04:00
Jeff Hutchinson
69d7a2f4a1 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
 2021-05-06 21:08:53 -04:00
Jeff Hutchinson
6f7fdca87d lotsa fixes. 2021-05-04 21:18:15 -04:00
Brian Roberts
2a2987869b
Merge pull request #478 from Bloodknight/SDL_OpenGL_BPP_Fix 
Fixes a resolution switching issue when the game uses **only** OpenGL…
 2021-04-22 19:51:14 -05:00
Brian Roberts
9323bac5ea
Update Templates/BaseGame/game/core/gui/scripts/canvas.tscript 
Co-authored-by: Lukas Joergensen <lpjoergensen@gmail.com>
 2021-04-13 16:53:31 -05:00
Areloch
92abfb8ccf Updates the masterserver domain referenced in the default scripts, pointing it to the new torque3d master server 2021-04-08 20:32:22 -05:00
Marc
3d2f3bda64 Fixes a resolution switching issue when the game uses **only** OpenGL as the renderer 
Canvas.tscript fixes provided by @OTHG_Mars
 2021-03-18 21:37:36 +00:00
AzaezelX
e5bc0a6e54 reset emissive to show 0,0,0,0 for local/vector lights in a manner that doesn't cause them to black out. 2021-03-09 15:26:48 -06:00
AzaezelX
39c914101d fix emissive 2021-02-14 18:47:42 -06:00
AzaezelX
1f518499c9 typofix 2021-01-27 13:28:12 -06:00
AzaezelX
dee5b46169 re-fix file exclusivity, readd callonmodules variable extension 
new method loadAssetsByType(%assetType)
 2021-01-27 00:45:49 -06:00
AzaezelX
e3933f7769 augment datablock file handling to include references with no suffixes 2021-01-24 02:43:21 -06:00
Lukas Aldershaab
9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00
Lukas Aldershaab
099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
Brian Roberts
2cf11fe199
Update module.cs 
cleanup
 2021-01-08 00:09:37 -06:00
AzaezelX
5bd9459da2 add parameter handling to callonmodule callbacks. 
IMPORTANT NOTE: cannot handle "" entries.
 2021-01-07 20:11:44 -06:00
Brian Roberts
27641b16ca
Merge pull request #424 from lukaspj/feature/new-terrain-blending 
Height based terrain texture blending
 2021-01-04 05:36:50 -06:00
Lukas Aldershaab
88bdb594aa Set default terrain texture format 2021-01-04 10:26:08 +01:00
Lukas Aldershaab
60a10f4334 Add global blendDepth slider and update default blendDepth for mats 2021-01-03 01:26:19 +01:00
Lukas Aldershaab
db496fa0c4 Make terrain texture settings global, add dialog to painter 2021-01-03 00:50:42 +01:00
Lukas Aldershaab
6f23dd191d Update core shader libraries to support texture arrays 2021-01-02 03:19:51 +01:00
Brian Roberts
578846ab6f
Merge pull request #428 from Areloch/ConsolidatedTerrainCreation 
Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
 2020-12-29 01:29:34 -06:00
Areloch
f7ce1efd62 Consolidates and standardizes terrain creation between the editor, asset browser and creator panel 
Also shifts terrain data importing into the new terrain asset window instead of separate in the File menu
Also removes redundant loadMaterials call that caused duplicates in the Terrain Painter material list
 2020-12-28 23:43:56 -06:00
Areloch
baeabb4a51
Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator 
add validation flagging for server objects
 2020-12-28 00:14:46 -06:00