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

69 commits

Author SHA1 Message Date
Areloch 71c19a6151 Companion PR to #719 
Adds the OGL side. redoing it to make sure the PR history is clean.
 2015-08-28 00:27:08 -05:00
Areloch 95ab3a33a5 Merge pull request #719 from rextimmy/dxtnm-parallax-fix 
Fix to allow parallax mapping with dxtnm textures via the red channel.
 2015-08-27 23:59:20 -05:00
Daniel Buckmaster 4f2f1ca4e1 Merge pull request #1356 from Areloch/PVS_Cleanup_813 
Convert un-modified function arguments to const references.
 2015-07-20 22:55:22 +10:00
Areloch 11398bb04e Issue found with PVS-Studio: 
A lot of instances where some function args are not actually modified in any way, meaning that it is better for performance to convert them into const references. This prevents an additional copy, which can help performance.
 2015-07-16 22:02:18 -05:00
Areloch 2002d74b78 Issue found with PVS-Studio: 
Many instances of a function or expression being used repeatedly, which can lower performance.

Fixed it in these cases by creating on local var, reference or pointer that's used instead.
 2015-07-13 22:51:17 -05:00
Azaezel 6218d792f3 No need for server-only aps to generate visible textures. (the other had a transcription error) 2015-06-15 21:07:33 +10:00
Areloch e18312b950 Fixed a issue with the terrain blending having hard-edges. 2015-06-08 00:11:48 -05:00
Azaezel a879ad4dcf re-enables prior functionality allowing folks to post-editor modify terrain cached textures. 2015-05-16 16:35:47 +10:00
Daniel Buckmaster 69f2efab8f Merge remote-tracking branch 'lukaspj/Fuzzy-texture-border-fix' into release-3.7 2015-05-09 14:29:30 +10:00
LukasPJ a3f08df9e3 Fix for fuzzy borders 2015-01-12 17:03:52 +01:00
Daniel Buckmaster 7ab6731f51 Merge branch 'development' into walkabout 
Conflicts:
	Templates/Empty/game/tools/worldEditor/scripts/editors/creator.ed.cs
	Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
 2015-01-02 14:45:20 +11:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
 2014-12-26 13:22:16 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis. 
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
 2014-12-23 18:48:02 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod 
Conflicts:
	Engine/source/T3D/missionMarker.cpp
 2014-12-21 21:23:55 +11:00
LuisAntonRebollo f3e737e001 3 textures blending fix for OpenGL. 2014-12-03 21:59:53 +01:00
LuisAntonRebollo 7962eef7dd Revert - Merge pull request #962 Fix OpenGL new terrain blend 
from BeamNG/fix_opengl_new_terrain_blend (reverted from commit a0d5dc25cd)
 2014-12-03 21:54:57 +01:00
LuisAntonRebollo 4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo fb08fafc9c Fix terrFeatureGLSL.cpp for GCC. 2014-11-30 05:03:30 +01:00
LuisAntonRebollo ff83e8c209 Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend 2014-11-30 04:47:38 +01:00
LuisAntonRebollo 98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support 
Add/Activate OpenGL render.
 2014-11-30 02:48:13 +01:00
LuisAntonRebollo 9c66aa0681 Merge pull request #931 from BeamNG/terrain_layer_format 
Set correct terrain layer texture format.
 2014-11-30 02:22:39 +01:00
LuisAntonRebollo 2f8d18c0c0 Merge pull request #929 from BeamNG/remove_old_opengl_code 
Remove unnecesary code for handle OpenGL.
 2014-11-30 02:22:24 +01:00
LuisAntonRebollo 03ffa1ddd3 Merge pull request #925 from BeamNG/shaderdata_samplernames 
Add sampler names to ShaderData
 2014-11-30 02:21:30 +01:00
Daniel Buckmaster f4c940f4fe Added basic Walkabout with #define renamed and no editor. 2014-11-28 19:42:10 +11:00
Anis A. Hireche a954daa43f terrain_blending_opengl_port_from_lukas_code 2014-11-27 20:56:23 +01:00
LuisAntonRebollo dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
LuisAntonRebollo 1ac8fab884 Changes for get necesary sampler names for OpenGL shaders. 2014-11-08 18:31:14 +01:00
LuisAntonRebollo b81ebaa386 Set correct terrain layer texture format. 2014-11-08 18:19:14 +01:00
LuisAntonRebollo f101fbe820 Remove unnecesary code for handle OpenGL. 2014-11-08 18:11:35 +01:00
LukasPJ f481d31285 BaseTexFormat was not networked properly. 2014-11-08 04:58:56 +01:00
LukasPJ ad7b75de09 Fix for fuzzy borders between textures 2014-11-08 04:58:01 +01:00
Daniel Buckmaster 9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix 
3 textures blending fix
 2014-11-04 17:06:04 +11:00
Daniel Buckmaster 97ae3445c9 Merge pull request #793 from lukaspj/Terrain-Basetex-Formats 
Terrain basetex formats
 2014-11-04 14:54:08 +11:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
 2014-10-14 15:09:11 +11:00
Lukas Joergensen ef11b565bf Expose new formats to the editor. 2014-09-23 15:23:04 +02:00
LukasPJ 431d8a9b66 Terrain baseTex support multiple formats 
DDS, PNG, JPG or NONE
 2014-09-23 15:22:57 +02:00
Lukas Joergensen ea4a8bb361 Proper rendering of basetexture 
Now terrain basetexture is properly cleared and never transparent.
 2014-09-10 17:33:09 +02:00
Lukas Joergensen 9612d3c290 BlendTotal is now an actual total rather than a max 2014-08-25 21:08:34 +02:00
rextimmy 3c56bf3a56 Fix to allow parallax mapping with dxtnm textures via the red channel. 2014-07-03 17:56:47 +10:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes 
Various engine fixes
 2014-05-23 14:09:00 +02:00
Thomas Fischer c850d60a4f Merge pull request #621 from BeamNG/glsl_shadergen 
Update GLSL Shadergen.
 2014-05-23 07:52:35 +02:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency 
Platform type consistency
 2014-05-10 11:40:40 +10:00
Daniel Buckmaster a42c92391a Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None 
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
 2014-05-10 11:01:18 +10:00
bank 5c986f755a Fix: Bit shifting of the 32-bit value with a subsequent expansion to the 64-bit type. 
We now shift the 64-bit value, which is now treated correctly.
 2014-05-06 15:39:24 +04:00
LuisAntonRebollo 9221b4dd10 Update GLSL Shadergen. Not used on DX9. 2014-04-17 18:39:13 +02:00
LuisAntonRebollo 7f46383eb5 Rename enum GFXTextureProfile::None for avoid conficts on Linux. 2014-04-07 00:03:52 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
 2014-04-04 13:43:25 +11:00
Thomas Fischer 502e346eb6 visual studio 2012 Level 4 warning fixes 2014-03-15 11:38:53 +01:00
SilentMike 2ac675000f Merge pull request #449 from Phantom139/uuidreplacement 
UUID Replacement
 2013-10-09 12:31:47 -07:00