Commit graph

1832 commits

Author SHA1 Message Date
Azaezel ce2964d2d0 diffuse/albedo texture linearization
http://http.developer.nvidia.com/GPUGems3/gpugems3_ch24.html
2015-11-11 13:52:46 -06:00
Areloch 51b6469922 Merge pull request #1439 from Azaezel/initTextureSpace
ensures opengl texSpaceMat is initialized from the get-go
2015-11-09 10:55:10 -06:00
Areloch 9d726bb9ed Merge pull request #1453 from blackwc/playJournal-template-fix
playJournal fix and removed depcrecated command line options
2015-11-09 10:24:30 -06:00
Areloch c2e5eb82af Merge pull request #1457 from Azaezel/meshRoadMats
hooks meshroads up to the material system for castrays
2015-11-09 10:01:37 -06:00
Azaezel f4d40bf1b0 hooks meshroads up to the material system for castrays (at a minimum, sound playback) 2015-11-05 10:18:17 -06:00
Areloch bc44aba31c Merge pull request #1428 from Azaezel/hashHorking
cuts the shadergen hashkey generator down from a 64 bit to a 32 bit key.
2015-11-05 00:12:03 -06:00
Areloch 165cdb64e9 Merge pull request #1322 from Areloch/String_isEmpty_Convert
Replace uses of dStrIsEmpty with new String::isEmpty
2015-10-31 23:40:13 -05:00
Areloch db7363df12 Merge pull request #947 from eightyeight/trigger-inheritance
Make Trigger friendlier towards inheritance
2015-10-29 22:06:59 -05:00
blackwc ca37e9f84e fix playJournal instruction in comments 2015-10-28 22:52:16 -04:00
blackwc bba604a043 playJournal fix and removed depcrecated command line options 2015-10-28 22:46:17 -04:00
Areloch 000649e840 Merge pull request #1452 from rextimmy/skybox_vertex_format_fix
Corrected SkyBox vertex format
2015-10-27 01:00:24 -05:00
Areloch 48d38ca803 Merge pull request #1447 from blackwc/radioButton-image-new
improved radio button
2015-10-27 00:26:21 -05:00
rextimmy 27720cb786 Corrected SkyBox vertex format 2015-10-26 21:08:12 +10:00
Areloch 8253bcc343 Merge pull request #1446 from rextimmy/water_vertex_format_fix
Looks to work fine. Thanks!
2015-10-24 02:12:46 -05:00
blackwc ea1931d215 improved radio button 2015-10-23 20:37:22 -04:00
rextimmy 9c6ff1775b Removed unused vertex colors from GFXWaterVertex 2015-10-22 21:54:35 +10:00
Areloch 4db84b34d0 Merge pull request #1418 from JeffProgrammer/gpushader4
Looks fine
2015-10-22 00:02:58 -05:00
Areloch a72802b677 Merge pull request #1435 from Azaezel/glowDebugEmpty
Looks good
2015-10-21 00:56:59 -05:00
Areloch aba6cf2d9e Merge pull request #1436 from Azaezel/ribbonShadersEmpty
Agreed, it makes sense that the shaders are common, so that people can start with empty and add their own art without worrying about stuff not working as expected.
2015-10-21 00:51:22 -05:00
Areloch f41f9fb7c8 Merge pull request #1431 from blackwc/sfxCompareProvider-fix
Seems to work fine.
2015-10-19 22:20:18 -05:00
Areloch 0f8d4d30ab Merge pull request #1444 from rextimmy/scattersky_fix
Seems good
2015-10-19 19:07:25 -05:00
rextimmy af9ad17ad6 Replaced ScatterSkyVertex declaration with default GFXVertexP in ScatterSky. 2015-10-19 21:15:59 +10:00
rextimmy 246785a8bf Removed unused vertex formats from ScatterSky 2015-10-16 21:30:39 +10:00
Azaezel 215ae1429e ensures opengl texSpaceMat is initialized from the get-go (whines in console otherwise) 2015-10-11 22:47:33 -05:00
Azaezel a100a00c99 missing ribbon shaders, empty template 2015-10-07 05:40:05 -05:00
Azaezel e0c275b56b missing empty template glow pass debug tool 2015-10-07 05:36:44 -05:00
wcb 3c252689f3 sfxCompareProvider fix for Empty template 2015-10-06 02:07:01 -04:00
wcb 183c468dda sfxCompareProvider fix for Full template 2015-10-06 02:05:34 -04:00
Azaezel aa6d078c40 cuts the shadergen hashkey generator down from a 64 bit to a 32 bit key.
(MacOSX 32 bit compatibilty errors. was generating 2k+ shader files. may also address  https://github.com/GarageGames/Torque3D/issues/1219)
2015-09-30 22:51:59 -05:00
Areloch 2044b2691e Merge pull request #1426 from Azaezel/KrazyKeyKompares
backend correction for https://github.com/GarageGames/Torque3D/pull/1425
2015-09-27 17:55:21 -05:00
Areloch f08e31346d Merge pull request #1421 from blackwc/cmake-nmake-fix
CMake NMake fix to place exe in game directory
2015-09-27 16:42:18 -05:00
Areloch f6bf0282b8 Merge pull request #1423 from Areloch/SDL_menu_accelerator_fix
SDL Menubar accelerator fix
2015-09-27 16:41:57 -05:00
Areloch 7da2d6d9d2 Merge pull request #1416 from Areloch/SDL_Inputs_Fixup
SDL Textbox bleedthrough inputs fix
2015-09-27 16:41:48 -05:00
Areloch 9f7513dc0b Further fixes to work around certain accelerators being missed, and additional command bleed-through. 2015-09-27 15:43:47 -05:00
Azaezel f87f7c41b6 backend correction for https://github.com/GarageGames/Torque3D/pull/1425 2015-09-25 17:09:41 -05:00
Areloch 3d65f1f8cd Fixes it so when using SDL, the editor menubar will correctly react to accelerator commands. 2015-09-24 22:23:26 -05:00
wcb 845ec9c452 CMake NMake fix to place exe in game directory 2015-09-23 19:46:36 -04:00
Jeff Hutchinson 4baf410b4f remove GL_EXT_gpu_shader4 2015-09-22 00:57:40 -04:00
Areloch 4c13906865 Corrects input issues when typing into text fields and it bleeding through to player inputs. 2015-09-21 00:14:16 -05:00
Areloch e8d1238794 Merge pull request #1411 from Azaezel/textEditReversion
void GuiTextEditCtrl::execConsoleCallback() reversion
2015-09-17 18:35:28 -05:00
Areloch 70c7a67456 Merge pull request #1409 from Azaezel/LinuxLongLoopiness
U32 MRandomLCG::randI() was using longs
2015-09-16 21:27:56 -05:00
Areloch 0798b80371 Merge pull request #1410 from Areloch/light_anim_brightness_fix
Light animation brightness fix
2015-09-16 21:27:44 -05:00
Areloch 5ba5092d44 Merge pull request #1402 from Azaezel/SoSensitive3
Files caught by https://github.com/GarageGames/Torque3D/pull/1401
2015-09-16 21:27:30 -05:00
Azaezel 1d442c9f84 void GuiTextEditCtrl::execConsoleCallback() reversion
see https://github.com/GarageGames/Torque3D/issues/1408
2015-09-16 12:55:27 -05:00
Areloch 6e1d031ecd Corrects light animation to adhere to the brightness level set in the light's params instead of sticking with the default 0-1 brightness range. 2015-09-15 19:56:35 -05:00
Azaezel 58ae331609 U32 MRandomLCG::randI() was using longs
32 and 64 bit windows can handle that. 64 bit linux no likey mixing longs and ints.
2015-09-09 15:22:19 -05:00
Areloch 82bafd9f35 Merge pull request #1407 from Areloch/Companion_PR_1398
Companion PR to 1398
2015-09-05 12:08:39 -05:00
Areloch dd5f910b64 Companion PR to 1398 to add the change to the Empty template as well. 2015-09-05 12:07:47 -05:00
Areloch ec2da8c1c8 Merge pull request #1398 from Duion/patch-1 2015-09-05 00:20:29 -05:00
Areloch 5874b8db59 Merge pull request #1380 from Azaezel/C4946
partly addresses C4946 warnings
2015-09-04 21:23:44 -05:00