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

1511 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luis Anton Rebollo
f87b3f2da7 Merge pull request #1243 from eightyeight/simplify-readme 
Simplify readme
 2015-03-08 22:55:48 +01:00
Luis Anton Rebollo
825912e800 Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations 
DeferredBumpFeat order of operations corrections
 2015-03-08 22:49:27 +01:00
LuisAntonRebollo
ae3128b28b DeferredBumpFeat order of operations corrections. Clean. 2015-03-08 22:30:03 +01:00
Luis Anton Rebollo
7e7025d1ca Merge pull request #1238 from Azaezel/defaultNormal 
https://github.com/GarageGames/Torque3D/issues/770 resolution
 2015-03-08 22:12:24 +01:00
LuisAntonRebollo
1067da284f Add error msg to Shadergen when GBufferConditioner?LSL::processVert don't have normals defined. 2015-03-08 22:10:22 +01:00
Daniel Buckmaster
338666a0a4 Fixed a link and removed link to GitHub releases. 2015-03-09 07:51:33 +11:00
Luis Anton Rebollo
946e74817e Merge pull request #1242 from BeamNG/fix_rpath 
Fix Linux rpath.
 2015-03-08 21:00:11 +01:00
LuisAntonRebollo
30bf15f4ee Fix Linux rpath. Changed to use $ORIGIN. 2015-03-08 20:40:35 +01:00
Luis Anton Rebollo
0e346fed9f Merge pull request #1241 from J0linar/Vignette_Final 
vignette_final
 2015-03-08 18:43:10 +01:00
Luis Anton Rebollo
d9ebe10c90 Merge pull request #1244 from BeamNG/fix_water_hdr 
Fix waterBasicP.glsl for HDR.
 2015-03-08 13:00:34 +01:00
LuisAntonRebollo
049de72cc5 Fix waterBasicP.glsl for HDR. 2015-03-08 12:56:24 +01:00
Daniel Buckmaster
8a3c299123 Format license. 2015-03-08 16:48:41 +11:00
Daniel Buckmaster
76d713f179 Shortened the readme and updated links. 2015-03-08 16:47:13 +11:00
LuisAntonRebollo
265d1a540a Fix Linux rpath. 2015-03-07 22:41:00 +01:00
Miodrag Sejic
351d5f08e9 vignette_final 
+added: gui slider for maximum exposure of vignetting
+changed: shaders to logical min/max floats
this pr contains the glsl shaders as well and therefore makes the
https://github.com/GarageGames/Torque3D/pull/1225 Pull Request obsolete
 2015-03-07 14:03:12 +01:00
Daniel Buckmaster
74a05854d5 Merge pull request #1236 from eightyeight/revert-style-cleanup 
Revert recent style cleanup changes
 2015-03-05 07:54:37 +11:00
Azaezel
bc32da74ca https://github.com/GarageGames/Torque3D/issues/770 resolution suggested by @LuisAntonRebollo 2015-03-03 23:10:47 -06:00
Daniel Buckmaster
84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Daniel Buckmaster
a73850a4bb Merge pull request #1234 from Azaezel/colladaCalamity 
typofix for void ColladaAppMesh::lockMesh
 2015-03-02 19:35:53 +11:00
Azaezel
c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06:00
Daniel Buckmaster
33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
 2015-03-01 22:30:22 +11:00
Daniel Buckmaster
baf594aee7 Merge pull request #1006 from BeamNG/fix_lighting_with_zero_lights 
Fix lighting errors when all lights are disabled.
 2015-03-01 21:06:34 +11:00
Daniel Buckmaster
57eed9c8e4 Amend console stack fixes to work with gcc in Ubuntu x64. 2015-03-01 20:34:16 +11:00
Daniel Buckmaster
6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development 
Conflicts:
	Engine/source/console/console.cpp
 2015-03-01 20:33:29 +11:00
Daniel Buckmaster
497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning 
Fix some issues flagged by cppcheck
 2015-03-01 18:27:40 +11:00
Daniel Buckmaster
5118d4bc63 Merge pull request #1230 from Azaezel/notSoShocking 
removal of  un-implemented ShockwaveData entries from explosion.
 2015-03-01 18:27:21 +11:00
Nathan Bowhay
bc31d79da1 Changed type to NetSocket 
Changed some S32 types to use the typedef NetSocket since they are a
socket.
 2015-03-01 17:20:48 +11:00
Daniel Buckmaster
bd6c331dfc Merge pull request #1215 from eightyeight/naveditor-default-background 
Default to background navmesh builds
 2015-03-01 17:15:42 +11:00
Daniel Buckmaster
6822a78fcf Merge pull request #1067 from Lopuska/patch-13 
bugfix #1066
 2015-03-01 14:17:59 +11:00
Daniel Buckmaster
4aeaad91e7 Merge pull request #1218 from eightyeight/revert-1036 
Revert "PR for issue #748"
 2015-03-01 14:14:00 +11:00
Daniel Buckmaster
18cc91000e Merge pull request #1220 from eightyeight/fix-#396 
Fix #396
 2015-03-01 14:13:50 +11:00
Azaezel
0c10ba6833 removal of un-implemented ShockwaveData entries from explosion. 2015-02-27 20:24:47 -06:00
Daniel Buckmaster
1c580f5a5f Merge pull request #1227 from Azaezel/TrampolineTreatment 
Con::executef trampoline had mismatched argc values for the high end
 2015-02-27 14:47:21 +11:00
Azaezel
54e1cceda9 Con::executef trampoline had mismatched argc values for the high end 2015-02-26 14:28:21 -06:00
Daniel Buckmaster
11d49d70a5 Merge pull request #1226 from brakhane/fix-opengl-vs2014 
fix preprocessor directive
 2015-02-26 07:42:04 +11:00
Dennis Brakhane
6d5571e233 Fix preprocessor directive 2015-02-25 21:12:01 +01:00
Azaezel
0325aaf5bb good catch 2015-02-25 12:50:00 -06:00
Azaezel
ea29f5203d DeferredBumpFeat order of operations corrections 2015-02-23 15:35:10 -06:00
Ben Payne
f67a0353d0 Review fixes 2015-02-23 14:57:37 -05:00
Daniel Buckmaster
02c88201c6 Merge remote-tracking branch 'GuyAllard/aiPlayerTweaks' into development 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
	Engine/source/T3D/aiPlayer.h
 2015-02-22 21:51:56 +11:00
Daniel Buckmaster
0bf021280e Regenerate parser. 2015-02-22 14:46:06 +11:00
Daniel Buckmaster
69ffe43b10 Fix docblock parsing rule. 
We first require that the first character after a /// not be a newline,
in addition to it not being another /. Then we make the whole contents
of the line optional, so we can handle empty lines.
 2015-02-22 14:44:48 +11:00
Daniel Buckmaster
ded87c0165 Revert "PR for issue #748" 
This reverts commit 8518c85e80.
 2015-02-22 12:47:00 +11:00
Daniel Buckmaster
905dd50d36 Merge pull request #980 from Azaezel/gl_debug_callbacks 
opengl error reporting formatting
 2015-02-22 12:24:30 +11:00
Daniel Buckmaster
61a7342b45 Merge pull request #1216 from eightyeight/fix-vs2008 
Fix VS2008 again again
 2015-02-22 12:06:43 +11:00
Daniel Buckmaster
686f8d04a5 Merge pull request #1199 from antonyjones67/development 
Added NULL check in function findItemByName.
 2015-02-22 12:05:06 +11:00
Daniel Buckmaster
bddc27c693 Add a temporary local copy of stdint.h for VS2008. 2015-02-22 11:25:19 +11:00
Daniel Buckmaster
e9a0975208 Merge pull request #1204 from John3/development 
little typo
 2015-02-22 10:49:00 +11:00
Daniel Buckmaster
d069534bde Default to building navmeshes in the background. 2015-02-22 10:47:29 +11:00
Ben Payne
3205fea936 Add a comment about an incorrect condition that I'm not sure how to fix 2015-02-20 18:42:34 -05:00