TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 00:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4210 commits 5 branches 33 tags 960 MiB
Commit graph

4210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
a71f5cfd9d Missed header changes 2020-07-11 15:58:39 -05:00
Areloch
a5404ad216 Adds ability to utilize bitmap arrays and set entry indexes for popup menus 
Also enables the ability to fetch the text of a popup menu item
 2020-07-11 15:57:13 -05:00
Brian Roberts
67dbe4dfe2
Merge pull request #229 from Areloch/TerrainAssetFixup 
Reworks the terrain loader code to work with the assets.
 2020-07-10 17:30:27 -05:00
Brian Roberts
ef6137ac6f
Merge pull request #242 from Azaezel/alpha40_stuckSpots 
from practicing: aiplayer onstuck correction
 2020-07-10 17:28:29 -05:00
Brian Roberts
7de3829d38
Merge pull request #243 from Azaezel/alpha40_triggerTricks2 
from @practicing01: trigger mounting
 2020-07-10 17:28:15 -05:00
AzaezelX
b8c3b515f8 from @practicing01: trigger mounting 2020-07-10 15:50:25 -05:00
AzaezelX
1619b7cd23 from practicing: aiplayer onstuck correction 2020-07-10 12:15:46 -05:00
Brian Roberts
55c95a6146
Merge pull request #241 from Azaezel/alpha40_macCompile 
comparison flaw in spotlight animation check.
 2020-07-08 12:27:28 -05:00
AzaezelX
61db21aaaf comparison flaw in spotlight animation check. also, proper location of shadercache dir 2020-07-07 16:54:25 -05:00
Brian Roberts
9d42895b2e
Merge pull request #240 from JeffProgrammer/wincpu_detect 
fixed cpu detection on 64bit windows
 2020-07-07 01:47:02 -05:00
Jeff Hutchinson
7880c71d9a fixed cpu detection on 64bit windows (and removing nasty assembly for win32). 
Note that this still works for 32bit windows.
 2020-07-07 01:05:08 -04:00
Brian Roberts
1173c4f153
Merge pull request #239 from Azaezel/alpha40_compilefix 
#include "console/typeValidators.h"
 2020-07-05 20:39:07 -05:00
Brian Roberts
d86c6aff35
Merge pull request #238 from Azaezel/alpha40_gl_cubemapWipwork 
fix cubemap capture for gl
 2020-07-05 20:38:53 -05:00
AzaezelX
fcffca65e6 #include "console/typeValidators.h" 2020-07-03 22:58:27 -05:00
AzaezelX
c57205b1f4 from @rextimmy: final fixes 2020-07-03 22:56:44 -05:00
Brian Roberts
aa897d0242
Merge pull request #235 from chaigler/fix_gui_editor_crash 
Fix crash due to GuiEditCanvas::save()
 2020-07-02 16:23:59 -05:00
Brian Roberts
52c93ab5ea
Merge pull request #234 from chaigler/fix_gl_sreenies 
Implements missing _captureBackBuffer method for GL gfx layer.
 2020-07-02 16:18:00 -05:00
chaigler
c682830dd5 Fix crash in GuiEditCanvas::save() 
Fixes crash in GuiEditCanvas::save() if file location can't be written to.
 2020-07-02 16:20:52 -04:00
Brian Roberts
9239101303
Merge pull request #233 from chaigler/terr_zoning_crash_fix 
Fix for crash in _onZoningChanged methods when called by hidden objects.
 2020-07-02 15:03:49 -05:00
chaigler
e2bf5cb8fe Implements missing _captureBackBuffer method for GL gfx layer. 
GL layer was missing _captureBackBuffer() implementation which caused screenShot() function to fail. Also caused ScreenShot::capture() to be called every frame afterward which caused significant performance issues.
 2020-07-02 16:02:05 -04:00
chaigler
c4e00be91a Fix for crash in _onZoningChanged methods when called by hidden objects. 
Hidden objects are removed from the scene manager so calls to getSceneManager()->getZoneManager() crash and burn.
 2020-07-02 15:50:29 -04:00
AzaezelX
ce2b05e0e2 a) grab the source mipmap levels not the dest ones for copy. b) lets rely less on trusting sizeof*4 when we've gor a size per pixel lookup already there 2020-06-29 21:26:08 -05:00
Areloch
7b1c083839 Adjusts importer logic of assets to fill spaces in the names as underscores to avoid issues. 2020-06-26 23:28:53 -05:00
Brian Roberts
005f7f6fd2
Merge pull request #227 from Azaezel/alpha40_scatterskyCleanups 
adress #116 and #179 (shaderside)
 2020-06-26 20:51:59 -05:00
Brian Roberts
bac3146054
Merge pull request #215 from Azaezel/alpha40_trigger_tricks 
fixes for trigger onenter/onleave
 2020-06-26 20:48:27 -05:00
Brian Roberts
7a10c42c40
Merge pull request #226 from Azaezel/alpha40_NamesapceNoNo 
adress #225
 2020-06-26 20:47:52 -05:00
Areloch
41277fe3b8 Fixes a mistake with setting the looseFilePath for the auto-created terrain asset. 2020-06-26 00:05:14 -05:00
Areloch
4ce558f042 Reworks the terrain loader code to work with the assets. 
Fixes the terrain asset creation, makes the loading logic go through the asset auto-import behavior when a filename or assetid is bound that is not found.
Corrects terrain material binding to properly save and load
Makes the terrain asset inspector fields work as expected.
 2020-06-25 23:33:01 -05:00
AzaezelX
24e6d8c73c partial followup to #202. 
largely cleanups, though does include glCopyImageSubData for gl revs that support it
TODOS:
1) non glCopyImageSubData for `void GFXGLCubemapArray::copyTo(GFXCubemapArray *pDstCubemap)`
2) while we don't get corruption showing in >0 mips for irradiance maps using the newer code, it nevertheless renders wrong.
not 100% sure if renderdoc is showing blank mips because it expects it due to size, or if we are in fact generating em even though we don't use em in the end for irradiance references.
 2020-06-25 17:34:48 -05:00
AzaezelX
5072a091a8 adress #116 and #179 (shaderside) 
kills off code folks haven't been using for years now, as well as a clamp to force the color into a 0-1 range. (hdr relies on >1.0 values for it's blur effect to populate)
 2020-06-23 17:41:56 -05:00
AzaezelX
6fde8dd4c3 adress #225 2020-06-23 13:43:04 -05:00
Brian Roberts
3e1795ba1d
Merge pull request #223 from Bloodknight/FontCleanup 
Removal of old font files from basegame template
 2020-06-20 13:32:36 -05:00
Marc Chapman
d5bb385a7d Removal of old font files from basegame template 2020-06-20 19:21:16 +01:00
Brian Roberts
b98d0a946b
Merge pull request #209 from Azaezel/alpha40_ScopeStackShenanigans 
adress #203
 2020-06-20 05:32:04 -05:00
Brian Roberts
9a0971cfe5
Merge pull request #211 from zfbx/patch-1 
Updated links, added info from torque3d.org
 2020-06-20 05:30:17 -05:00
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
Tony
5f4f0b3914
forgot to remove section 2020-06-13 09:20:14 -04:00