Daniel Buckmaster
caf036633a
Merge pull request #1170 from eightyeight/fix-vs2008
...
Fix VS2008
2015-02-10 15:00:52 +11:00
Daniel Buckmaster
7d4aeb8779
Merge pull request #1175 from Azaezel/linkNamespacesDebugOutput
...
feedback for *which* namespace is already linked.
2015-02-10 14:55:14 +11:00
Azaezel
fb79d1fec7
formatting
2015-02-09 21:53:44 -06:00
Daniel Buckmaster
01a219b694
stdint.h doesn't exist in VS2008, so add an inline replacement for it.
2015-02-09 09:59:04 +11:00
Luis Anton Rebollo
44da177b75
Merge pull request #1167 from eightyeight/no-web-deploy
...
Remove default web deployment
2015-02-08 15:59:53 +01:00
Daniel Buckmaster
6a96894a9c
Merge pull request #1157 from eightyeight/linux-no-splash
...
Show the canvas immediately in unix because the splash doesn't work
2015-02-08 20:19:31 +11:00
Daniel Buckmaster
50c52a1cdb
Remove default web deployment.
2015-02-08 20:11:23 +11:00
Daniel Buckmaster
a6702d1331
Show the canvas immediately in unix because the splash doesn't work.
2015-02-08 19:31:02 +11:00
Luis Anton Rebollo
b1ad72692c
Merge pull request #1164 from BeamNG/remove_gl_shadegen_dead_code
...
Remove some dead code from OpenGL shadergen.
2015-02-07 23:50:41 +01:00
LuisAntonRebollo
c78f38fe0b
Remove some dead code from OpenGL shadergen.
2015-02-07 22:49:58 +01:00
Luis Anton Rebollo
d90baad6fa
Merge pull request #1100 from JeffProgrammer/glslShadergenDefineFix
...
Fixed define bug for OpenGL shadergen.
2015-02-07 22:46:13 +01:00
Luis Anton Rebollo
25a790103e
Merge pull request #1116 from Lopuska/patch-16
...
Intel OpenGL - fix a crash/shader compile error when you activate Vertex...
2015-02-07 22:24:55 +01:00
Luis Anton Rebollo
2d3f711443
Merge pull request #1128 from Azaezel/cloudlayer
...
cloudlayer hdr packing
2015-02-07 20:50:29 +01:00
Luis Anton Rebollo
d26c846c31
Merge pull request #1140 from Lopuska/patch-18
...
ambient normal on GLSL
2015-02-07 20:43:08 +01:00
Luis Anton Rebollo
1097e957a3
Merge pull request #1048 from Lopuska/patch-11
...
missing texture format.
2015-02-07 18:04:46 +01:00
Luis Anton Rebollo
514579c39b
Merge pull request #1161 from BeamNG/fix_x64_2
...
More x64 fixes - 2
2015-02-07 17:05:23 +01:00
LuisAntonRebollo
5d49771136
Fix FIELDOFFSET for OSX.
2015-02-07 16:41:55 +01:00
LuisAntonRebollo
6d1ef41c69
Changed some size_t to uintptr_t.
2015-02-07 16:41:54 +01:00
Luis Anton Rebollo
cc9be50422
Merge pull request #1121 from bpay/fix-buffer-overflows
...
Fix buffer overflows
2015-02-02 20:15:51 +01:00
Luis Anton Rebollo
9a0247f780
Merge pull request #1147 from BeamNG/templates_frame_allocator_size
...
Fix torqueConfig.h TORQUE_FRAME_SIZE.
2015-01-31 19:35:25 +01:00
LuisAntonRebollo
1dacf7b04e
Fix torqueConfig.h TORQUE_FRAME_SIZE.
2015-01-31 19:34:14 +01:00
Luis Anton Rebollo
c1b137f041
Merge pull request #1145 from BeamNG/dynamic-CMake-modules
...
Make CMake project load all .cmake files from the module folder Updated.
2015-01-30 18:33:59 +01:00
LuisAntonRebollo
744e7d4745
Merge remote-tracking branch 'GG-Github/development' into dynamic-CMake-modules
...
Conflicts:
Tools/CMake/torque3d.cmake
2015-01-30 18:24:38 +01:00
LuisAntonRebollo
41cb63ec0e
Fix testimg.ppm
2015-01-30 18:22:42 +01:00
LuisAntonRebollo
e5bb684c0e
Update gitattributes with some text files for avoid EOF problems with Git.
2015-01-30 18:20:50 +01:00
Daniel Buckmaster
29c2b98c47
Merge pull request #1092 from eightyeight/walkabout
...
Walkabout navigation editor
2015-01-30 09:00:11 +11:00
Daniel Buckmaster
0d1f1aeeb9
Base navmesh size 1x1x1.
2015-01-29 22:23:26 +11:00
Daniel Buckmaster
bd437cda1c
Merge branch 'development' into walkabout
...
Conflicts:
Engine/source/T3D/aiPlayer.cpp
2015-01-29 21:38:20 +11:00
Daniel Buckmaster
d7111bc851
Fix missing scripts and incorrect variable.
2015-01-29 21:23:16 +11:00
Daniel Buckmaster
014b566014
Merge remote-tracking branch 'gg/development-3.6' into development
...
Conflicts:
Engine/source/T3D/gameFunctions.cpp
2015-01-29 21:17:38 +11:00
Daniel Buckmaster
cb047bd7f0
Rename all instances of Walkabout.
2015-01-29 21:09:32 +11:00
Daniel Buckmaster
7b75a528fd
Delete settings.xml
2015-01-29 21:07:32 +11:00
Daniel Buckmaster
75bb3303d4
Merge pull request #1137 from eightyeight/moveselection
...
Fix changes to moveSelection API
2015-01-29 19:56:09 +11:00
Daniel Buckmaster
1467fa4e55
Merge pull request #1133 from GarageGames/nettest-conflict
...
Rename netTest.cpp to netExamples.cpp
2015-01-29 19:41:58 +11:00
Anis
40edb6b7d4
Update vectorLightP.glsl
2015-01-28 23:48:20 +01:00
Anis
bfbfed6d66
Update vectorLightP.glsl
2015-01-28 23:47:44 +01:00
Anis
1c5ab1371e
Update lighting.glsl
2015-01-28 23:47:02 +01:00
Anis
3937afdc19
Update vectorLightP.glsl
2015-01-28 23:43:29 +01:00
Anis
9e090a2ef7
Update lighting.glsl
2015-01-28 23:36:43 +01:00
Daniel Buckmaster
0605f056e3
Fix changes to moveSelection API.
2015-01-28 21:25:15 +11:00
Daniel Buckmaster
68d3e84c08
Merge pull request #1115 from Lopuska/patch-14
...
Jeff Faust's terrain fix also in OpenGL
2015-01-28 21:04:33 +11:00
Daniel Buckmaster
bc12f13e9a
Rename netTest.cpp to netExamples.cpp
2015-01-28 09:53:04 +11:00
Daniel Buckmaster
70d2ec6718
Merge pull request #1124 from eightyeight/forest-wind-emitter
...
Forest wind emitter rendering improvement
2015-01-27 08:58:12 +11:00
Ben Payne
47950382f7
...and update the profiler strings
2015-01-26 16:52:07 -05:00
Ben Payne
ae94fc4e46
Fix mem leak discovered during previous commit
2015-01-26 16:52:07 -05:00
Ben Payne
fcf52fb5e0
Rename the memory allocating versions to make prev error less likely
...
The behavior is different enough that these shouldn't be overloaded
with the non-allocating verions. Also makes it more obvious what is
going on to the caller.
2015-01-26 16:52:06 -05:00
Ben Payne
d669eb6ee7
Fix unintentionally deleted param
2015-01-26 16:52:05 -05:00
Ben Payne
6e45643b28
Add descriptions
2015-01-26 16:52:04 -05:00
Ben Payne
4694b0a8ed
Fix buffer size larger than necessary
2015-01-26 16:52:04 -05:00
Ben Payne
2cc4801974
Remove a dead function
2015-01-26 16:52:03 -05:00
