Commit graph

4686 commits

Author SHA1 Message Date
Areloch 438788c9b3 Rolled in Az's suggested fixes 2021-05-13 19:30:53 -05:00
Areloch 9a0de40505 Updates the torsion.in file to properly be configured to handle tscript extension 2021-03-13 23:47:18 -06:00
Brian Roberts 5442f52bc5
Merge pull request #476 from Azaezel/alpha40/emissiveProper
reset emissive to show 0,0,0,0 for local/vector lights in a manner th…
2021-03-09 15:27:10 -06: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
Brian Roberts bea11acc66
Merge pull request #450 from Azaezel/alpha40/playgui_onwake_callback
provides a general Playgui_onWake callback for modules
2021-02-15 22:28:26 -06:00
Brian Roberts f4982f3b7d
Merge pull request #464 from Azaezel/alpha40/ribbonParticles
ribbon particle resource port
2021-02-15 22:28:10 -06:00
Brian Roberts 30f746416d
Merge pull request #466 from Azaezel/alpha40/bakeOrigintweaks
set prefab and makemesh origins to the biggest model
2021-02-15 22:27:59 -06:00
Brian Roberts 7be1e24c06
Merge pull request #470 from Azaezel/alpha40/fixEmissive
fix emissive
2021-02-15 22:27:50 -06:00
AzaezelX 39c914101d fix emissive 2021-02-14 18:47:42 -06:00
Brian Roberts 331200ba69
Merge pull request #468 from Areloch/shapeEdListFix_Followup
Missed a function where similar to previous was needed for the shape editor list fix to ensure it works both ways
2021-02-13 00:20:31 -06:00
Areloch 931556c3c6 Added the makeRelative call to the other openShapeAsset function to ensure it works both ways 2021-02-13 00:18:48 -06:00
Brian Roberts 11e13dddf0
Merge pull request #467 from Areloch/shapeEdListFix
Fixes the constructor path compare logic in the shape editor so the lists can populate correctly.
2021-02-12 14:37:59 -06:00
Areloch 372a7887be Fixes the constructor path compare logic in the shape editor so the lists can populate correctly. 2021-02-12 00:21:36 -06:00
AzaezelX 4c7535a9bc set perfab and makemesh origins to the biggest model
allows one to preserve snap points
2021-02-08 17:23:51 -06:00
AzaezelX e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00
Areloch dcf176f043
Merge pull request #463 from Azaezel/fix/terrainpainting
terrain brush dragging cleanups
2021-01-28 00:45:01 -06:00
AzaezelX d4cd1edad7 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into fix/terrainpainting
# Conflicts:
#	Engine/source/gui/worldEditor/terrainEditor.cpp
2021-01-27 23:38:14 -06:00
AzaezelX 66db6ac376 terrain brush dragging cleanups 2021-01-27 23:36:23 -06:00
AzaezelX 863da35ca0 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/playgui_onwake_callback 2021-01-27 19:06:51 -06:00
Brian Roberts 47ec7e8d98
Merge pull request #460 from Azaezel/fix/moduleHelpers
re-fix file exclusivity, readd callonmodules variable extension
2021-01-27 15:12:42 -06:00
Brian Roberts c2c959122e
Merge pull request #462 from Areloch/TerrainEditDragFixup
Re-fixes terrain edit dragging without breaking paint actions
2021-01-27 15:11:56 -06:00
Areloch e11c5a7a02 Re-fixes terrain edit dragging without breaking paint actions 2021-01-27 15:10:20 -06:00
Brian Roberts e2f706cd94
Merge pull request #461 from Areloch/ShapeAssetPreviewGen
Implements shape preview caching for shape assets
2021-01-27 14:58:41 -06:00
AzaezelX 1f518499c9 typofix 2021-01-27 13:28:12 -06:00
Areloch 16438e1ab3 Added in needed normal map processing for preview render 2021-01-27 12:26:33 -06:00
Brian Roberts 21d9268e03
Merge pull request #459 from Azaezel/update/openal
update openal-soft
2021-01-27 09:16:04 -06:00
Areloch 85a9a9b608 Implements shape preview caching for shape assets
Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
2021-01-27 01:54:26 -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 3603188b7f update openal-soft
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
2021-01-26 13:01:35 -06:00
Brian Roberts 762a84550f
Merge pull request #458 from Areloch/ObjectCreatorABAdd
Integrates object creator logic into the AB
2021-01-24 15:15:31 -06:00
Areloch 3cb1699ed1 Fixed guiProfile references 2021-01-24 04:40:19 -06:00
Areloch b7a2c30337 Integrates object creator logic into the AB
Adds lookup logic to Datablock AB entries to try and find class icons for the preview
Adds 2 new datablock class create methods
2021-01-24 04:33:28 -06:00
Brian Roberts 6226e9d575
Merge pull request #457 from Azaezel/fix/db_file_suffix
augment datablock file handling to include references with no suffixes
2021-01-24 02:55:32 -06:00
AzaezelX e3933f7769 augment datablock file handling to include references with no suffixes 2021-01-24 02:43:21 -06:00
Brian Roberts 692f19855c
Merge pull request #453 from Areloch/prototypeTscriptAssetFix
Corrects missed asset script file references in asset definitions when swapping to the tscript extension
2021-01-20 21:17:56 -06:00
Areloch a71805515c Corrects missed asset script file references in asset definitions when swapping to the tscript extension 2021-01-20 19:41:28 -06:00
Brian Roberts 80429d8252
Merge pull request #452 from lukaspj/feature/discord-badge
Add Discord badge to README
2021-01-20 15:21:14 -06:00
Areloch aef1b26587
Merge pull request #406 from lukaspj/feature/parametrize-script-extension
Parametrize script extension, default to 'tscript'
2021-01-20 00:29:58 -06:00
Lukas Aldershaab 84921022e0 Add Discord badge to README 2021-01-19 21:48:56 +01:00
Areloch c051a0357c Fixes some conversion mistakes in the scripts 2021-01-19 21:32:31 +01: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 b8b62292bd
Merge pull request #451 from Areloch/macOSMinorFixes
Fixes some minor errors on MacOS regarding compiling in clang
2021-01-14 22:16:44 -06:00
Areloch c5cdba750e Fixes some minor errors on MacOS regarding compiling in clang 2021-01-14 18:00:56 -06:00
AzaezelX 27a35ff104 provides a general Playgui_onWake callback for modules
any module with a modulename::Playgui_onWake now has the capacity to layer thier gui elements on playgui
2021-01-11 17:34:23 -06:00
Areloch 64c9667bad
Merge pull request #283 from Azaezel/alpha40_mouseBindIcons
mouse display for keybinds
2021-01-10 22:40:22 -06:00
Brian Roberts 9ba1ca3d22
Merge pull request #447 from Jozor/cmake_directory_fix
Cmake allow non-source project directory
2021-01-10 15:51:18 -06:00
Joseph fe9dc1e25b Help from Az finally gave the correct answer to the problem I was trying to address originally, so really this fix is from Az.
Exposes the directory for where your game files go in cmake without having to go to Advanced tab.
2021-01-10 21:48:46 +00:00
Brian Roberts 80d4df09d3
Merge pull request #446 from Azaezel/alpha40/callOnModules_Vars
add parameter handling to callonmodule callbacks.
2021-01-09 00:28:13 -06:00
Joseph 4c781ce5c6 Enables support for having your project directory different to your Torque engine directory. 2021-01-08 20:59:35 +00:00