Commit graph

4926 commits

Author SHA1 Message Date
Brian Roberts
f6cedc8043
Merge pull request #210 from Azaezel/alpha40_spotlightBoundsFix
adress #162 based on work by Chad Hall
2020-06-20 05:29:47 -05:00
Brian Roberts
cc0d4f4d6b
Merge pull request #222 from Azaezel/alpha40_kill_macroMaps
adress #221 crash surpress macromap
2020-06-20 05:28:33 -05:00
Brian Roberts
e3052a1919
Merge pull request #202 from Azaezel/alpha40_GL_CubemapSaver
implement copyResource, fix copyToBmp
2020-06-20 05:27:53 -05:00
AzaezelX
4a88d7a4e4 adress #221 crash surpress macromap
while shifitng loop in _initSamplerNames to use sgMaxTerrainMaterialsPerPass. if folks absolutely require thier projects to contain terrain macromaps, they can unrem

FEATUREMGR->registerFeature( MFT_TerrainMacroMap, new NamedFeatureGLSL("TerrainMacroMap Deprecated")); // new TerrainMacroMapFeatGLSL);
   //samplerNames.push_back("$macrolayerTex");
and
      //samplerNames.push_back(avar("$macroMap%d", i));
as well as turn sgMaxTerrainMaterialsPerPass down to 2 entries on a given terrain subchunk before it requires another rerender of the terrain blended in with prior passes.
2020-06-19 21:12:20 -05:00
Brian Roberts
73d57e86af
Merge pull request #213 from Azaezel/alpha40_gl_terrainfix
typofix in opengl terrain shadergen
2020-06-19 19:50:37 -05:00
Brian Roberts
2ef6008212
Merge pull request #216 from Azaezel/alpha40_groundcover_tricks
groundcover requested augs
2020-06-19 18:37:40 -05:00
Brian Roberts
e010d02809
Merge pull request #214 from Azaezel/alpha40_ststatic_tricks
adds an animspeed and animoffset to tsstatic instances
2020-06-19 13:29:03 -05:00
Brian Roberts
0364769f9a
Merge pull request #218 from Azaezel/alpha40_vertcolorCorrect
adress #16 - don't need to swizzle vert colors (on GL)
2020-06-19 06:49:32 -05:00
AzaezelX
206d86f1bb .. we do however appear to need to swizzle DX vert colors... 2020-06-19 06:48:50 -05:00
AzaezelX
6859cbe308 adress #16 - don't need to swizzle vert colors 2020-06-13 13:02:56 -05:00
AzaezelX
7c9d2f3ca2 groundcover requested augs
1) fadescale- allows an enduser to reduce drawdistance for groundcover via $pref::GroundCover::fadeScale
2) adds minslope, conformtonormal, and min/max rotations along the x and y axies
2020-06-13 12:18:41 -05:00
AzaezelX
8ecb474a67 fixes for trigger onenter/onleave
1- corrects onleavetrigger for deletions
2-adds a testObjects to trip onenter when creating or moving a trigger itself so that that will list objects already there as opposed to only going off when something moves into it
2020-06-13 12:12:52 -05:00
AzaezelX
136bc8874f adds an animspeed and animoffset to tsstatic instances so clones can be set to break up syncing on multiples 2020-06-13 12:08:01 -05:00
AzaezelX
494049c4f6 typofix in opengl terrain shadergen 2020-06-13 12:02:16 -05:00
AzaezelX
afd836cc56 export rounds LODs to the nearest power of 2
prevent submeshes from flickering in and out due to lod mismatches when exporting groups to a singularr model file
2020-06-13 11:58:16 -05:00
Tony
5f4f0b3914
forgot to remove section 2020-06-13 09:20:14 -04:00
Tony
16f91b7ba8
Updated links, added info from torque3d.org
Updated the github links to point to this repo
moved pull request guidelines, rules, version policy
changed irc link to discord, updated forums link and remove dead uservoice link
2020-06-13 09:11:37 -04:00
AzaezelX
0c0646a90c seed the engine core with three baseline light animation dbs. no motion, pulse, and spin. 2020-06-13 01:32:14 -05:00
AzaezelX
16a159992f adress #162 based on work by Chad Hall 2020-06-12 14:38:19 -05:00
AzaezelX
06abd3f1eb adress #203 2020-06-12 13:25:53 -05:00
Brian Roberts
341c7eeee1
Merge pull request #204 from Areloch/D3DOnlyCompileFix
D3D-only compile fix
2020-06-12 13:01:57 -05:00
Brian Roberts
a7b37cf0ad
Merge pull request #208 from Bloodknight/LinuxCompatFixes
Linux Slash compatability
2020-06-12 12:32:35 -05:00
Marc Chapman
913c8753d0 Linux Slash compatability 2020-06-12 06:24:54 +01:00
Brian Roberts
62819da86a
Merge pull request #206 from Azaezel/alpha40_GenMapJunk
adress #205
2020-06-10 16:39:05 -05:00
AzaezelX
4043015d2d adress #205 2020-06-10 11:52:47 -05:00
AzaezelX
265b55748e Merge branch 'alpha40_GL_CubemapSaver' of https://github.com/Azaezel/Torque3D-1 into alpha40_GL_CubemapSaver 2020-06-07 18:00:21 -05:00
AzaezelX
4223a26f05 no message 2020-06-07 18:00:17 -05:00
Areloch
a1baf0e03c A correction to the cmake file so if OGL is disabled, it doesn't include the sdl platform GL file, allowing the project to compile. 2020-06-07 02:52:06 -05:00
Areloch
97880e44dd Implements the special guiVariableInspector field type of 'range' which adds a slider to allow editing a float range. 2020-06-07 02:22:12 -05:00
AzaezelX
1f37bdb786 implement copyResource, fix copyToBmp
GFXFormatR16G16B16A16F case wasn't accounting for mips, nor was it using the right memcpy aperture
2020-06-05 04:51:57 -05:00
AzaezelX
f6a2149dd1 tempfix: corrects the display api entry...
in the options menu so that it properly reflects what's active/selected for restart, and more importantly saves the pref.

Important Note:
down the line we'd discussed treating options similar to the key remap system where it'd be a map of

opt[varname]=varstate;
2020-06-04 20:04:47 -05:00
AzaezelX
81a4e47235 crashfix-string deconstructor
validate we aren't either empty or using the reserved empty string before we release the pointed to value (as a note, the latter at least shouldn't have been required, but might as well be paranoid about it)
2020-06-02 17:10:39 -05:00
Areloch
11f0ec2c0f Overhauled keybind remap part of options menu
Fix audio options menu so it correctly save and applies settings
2020-06-01 03:55:25 -05:00
Areloch
69089e1ee2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework 2020-06-01 03:48:20 -05:00
Areloch
a561d590ca Minor cleanups to guiGameListMenuCtrl 2020-06-01 03:32:45 -05:00
Areloch
3b47d41da2 Majority of options menu integration completed
Implemented keybind option type
Updated Pause menu to comply with new style
2020-05-25 00:51:33 -05:00
Areloch
bc27125e90 Initial pass to rework and cleanup the main UI interface
Implements interface buttons that react to input type and visually display keybinds
Updates the T3D icon and splash screen
2020-05-20 17:19:52 -05:00
Areloch
6a5661ddc7 Corrected some path-slash wrongness 2020-05-17 15:27:16 -05:00
Areloch
aae0c0613b Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-17 01:38:34 -05:00
Areloch
9b7b09dce8 Adjusts the ShapeAsset autoImport invoke logic to actually use the C++-side autoImport logic
Changed originalImportingAssets to originalImportingFiles in the AssetImporter for naming clarity
Made autoImportFile properly return the assetId that was made
Additional logging in the AssetImporter
Adjusted the asset registration logic to support reimports, which merely refreshes the assetID
Added logic to shape asset importing to be able to import in an existing companion constructor cs file
Tweaked the TSStatic setShapeName logic so it will properly set fields depending on if the assetID was correctly set, or if we have the noShape fallback in use
2020-05-17 01:38:17 -05:00
Areloch
2a01d8a651 Merge pull request #148 from Azaezel/alpha40TerainLayerHack
'fixes' terrain normal blending for tightly grouped >4 layer scenarios
2020-05-17 01:31:04 -05:00
Areloch
75583ca6c7 Merge pull request #161 from Azaezel/alpha40_BandingBreakup
Alpha40 banding breakup
2020-05-17 01:25:59 -05:00
Areloch
4774226d8f Merge pull request #160 from Azaezel/alpha40_dbClear
make sure we're working with a clean slate each datablock load cycle
2020-05-17 01:25:39 -05:00
Areloch
b14a4af654 Merge pull request #162 from Azaezel/alph40_cleanups
Alph40 cleanups -uninitialized vars batch 1
2020-05-17 01:19:55 -05:00
Areloch
9d781798ee Merge pull request #155 from Azaezel/alpha40_explodeNorm
expose explosion.initialnormal to script for fine grained directional control
2020-05-16 02:38:33 -05:00
Areloch
c52541bdac Merge pull request #157 from Azaezel/alpha40_HiddenHugs
show/hide children automagically for simgroups via inspector
2020-05-16 02:37:24 -05:00
Areloch
3f0195475d Merge branch 'alpha40TerainLayerHack' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:19:02 -05:00
Areloch
240aa571de Merge branch 'alpha40_explodeNorm' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:18:35 -05:00
Areloch
87b160faab Merge branch 'alpha40_dbClear' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:17:50 -05:00
Areloch
2c2c9659e1 Merge branch 'alpha40_HiddenHugs' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:17:24 -05:00