Commit graph

1558 commits

Author SHA1 Message Date
Duion
f886481937 Version number update 2015-05-03 02:47:05 +02:00
duion
3def8cc221 Merge branch 'GarageGames/development' into ueberengine-dev 2015-05-01 22:05:21 +02:00
Areloch
b3170bcddf Merge pull request #1286 from Azaezel/NoMRBit
crash out on net stream leaks.
2015-04-28 00:38:33 -05:00
Daniel Buckmaster
2fbf6bdb9d Removed a space. 2015-04-27 21:30:09 +10:00
Daniel Buckmaster
98fa3d02df Merge remote-tracking branch 'Azaezel/decal_rot_mangle' into development 2015-04-27 21:28:42 +10:00
Azaezel
6201e48501 crash out on net stream leaks.
causes a fatal assertion when bitstream is passed an int value it cannot transmit given the provided bit length, and reports what the value and count were, respectively
2015-04-26 20:25:40 -05:00
duion
fffe154528 Merge branch 'GarageGames/release-3.7' into ueberengine-dev 2015-04-26 17:09:54 +02:00
Azaezel
f8d41a2b96 Merge pull request #1283 from Azaezel/randiiiiiii
corrects getrandom to behave as documented.
2015-04-26 11:27:03 +10:00
Duion
20484b58eb linux compile error missing polyhedral include fix 2015-04-25 00:20:22 +02:00
duion
cc50147ebc Merge branch 'development' into ueberengine-dev 2015-04-24 23:00:29 +02:00
Daniel Buckmaster
656c04abc7 Merge pull request #1278 from eightyeight/tweak-vagrant
Tweak Vagrant
2015-04-20 10:27:30 +10:00
Daniel Buckmaster
4a705c875c Move the Vagrant config into a distro-specific folder. 2015-04-19 16:18:03 +10:00
Areloch
6e681dd82f Merge pull request #1239 from bpay/asan-fixes
Fix errors flagged by address sanitizer
2015-04-16 21:12:21 -05:00
Areloch
b50814df2a Merge pull request #1263 from Azaezel/thatEscalatedQuickly
fix for https://github.com/GarageGames/Torque3D/issues/1262
2015-04-16 21:07:52 -05:00
Areloch
c784cde9bf Merge pull request #1264 from John3/development
Two equal lines in init.cs
2015-04-16 21:02:18 -05:00
duion
da34c84df9 camerashake first person weapon recoil fix 2015-04-13 01:24:52 +02:00
Daniel Buckmaster
fac856c053 Merge pull request #1269 from eightyeight/add-vs2012-to-empty
Added missing VS2012 template files to Empty template
2015-04-08 12:23:08 +10:00
Daniel Buckmaster
21443df641 Added missing VS2012 template files to Empty template. 2015-04-07 18:15:47 +10:00
John3
3f191ede5f Two equal lines in init.cs 2015-03-25 18:48:35 -06:00
Azaezel
1ce643cbc8 fix for https://github.com/GarageGames/Torque3D/issues/1262 passes along mAppliedForce found 74a05854d5/Engine/source/T3D/shapeBase.cpp (L1600) like the rest of the classes. mGravityMod left as an exercise to someoone actually working on a vehicle game at present. 2015-03-24 22:59:56 -05:00
Luis Anton Rebollo
8f94614a6e Merge pull request #1169 from eightyeight/add-vagrant
Add Vagrant config
2015-03-15 01:26:18 +01:00
Luis Anton Rebollo
19534b1312 Merge pull request #1255 from BeamNG/php_gen_vs2012
Missing files for PHP genetator VS2012
2015-03-14 22:46:52 +01:00
LuisAntonRebollo
b5378d226d Add VS2012 support. Missing files 2015-03-14 22:46:15 +01:00
Luis Anton Rebollo
c73355bcd6 Merge pull request #1049 from cornytrace/VS2012-Support
Add VS2012 support to projectgenerator
2015-03-14 22:43:37 +01:00
Luis Anton Rebollo
68efa70d9c Merge pull request #1245 from BeamNG/fix_glsl_include
Fix GLSL include when file is empty.
2015-03-14 13:31:10 +01:00
Luis Anton Rebollo
24307947ef Merge pull request #1252 from BeamNG/fix_alt_enter
Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode.
2015-03-14 13:03:41 +01:00
LuisAntonRebollo
17f08e9f86 Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode. 2015-03-14 13:01:05 +01:00
Luis Anton Rebollo
3c12325e97 Merge pull request #1249 from Azaezel/shadow_safeties
further insurance that shadow split stay within bounds.
2015-03-10 12:39:51 +01:00
Azaezel
6fa44a4e92 further insurance that shadow split stay within bounds. 2015-03-10 06:03:40 -05:00
Daniel Buckmaster
67e9119101 Merge pull request #1246 from BeamNG/fix_obj_editor_lod
Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files.
2015-03-09 11:32:27 +11:00
LuisAntonRebollo
a5497e51a7 Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files. 2015-03-08 23:51:13 +01:00
LuisAntonRebollo
e6b7cf108b Fix GLSL include when file is empty. 2015-03-08 23:25:23 +01:00
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
Ben Payne
16af2a126e Add a comment 2015-03-06 15:36:22 -05:00
Ben Payne
bd49fe3cb0 Don't call strncpy when src == dest
This fixes an error flagged by address sanitizer
2015-03-04 19:13:53 -05:00
Ben Payne
eabff49a6a Fix buffer underrun found with address sanitizer
When subpath is the empty string, the code was reading from subPath[-1]
2015-03-04 19:13:49 -05:00