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
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
Luis Anton Rebollo
d6beb3594a
Merge pull request #1130 from BeamNG/fix_opengl_performance
...
Remove a get* OpenGL function causing CPU-GPU sync point.
2015-01-26 12:11:35 +01:00
LuisAntonRebollo
52d8aa3a97
Remove a get* OpenGL function causing CPU-GPU sync point (bad performance).
2015-01-26 01:56:13 +01:00
Daniel Buckmaster
540e68aadb
Undid changes to Point3F.
2015-01-26 00:16:38 +11:00
Luis Anton Rebollo
6492028bb2
Merge pull request #1035 from bpay/memfixes
...
Memfixes
2015-01-25 13:42:32 +01:00
Vincent Gee
c1203c1cea
Dev forest wind emitter improvement
...
So the problem is that when your inside the sphere it won't render so it might make someone
think that it's not working right. So what I did was determine if the camera is inside the sphere.
If the camera is inside the sphere, then I find the distance from the center of the sphere to the camera
Round down and use that as the radius to draw the sphere.
That way if someone zooms in or out, their screen is still showing the sphere.
2015-01-25 22:50:36 +11:00
Luis Anton Rebollo
79df1a1b3a
Merge pull request #1089 from eightyeight/profile-stringtable
...
Add profiler regions for StringTable functions
2015-01-25 10:56:20 +01:00
Luis Anton Rebollo
c9a818797a
Merge pull request #1123 from BeamNG/fix_linux_ci
...
Fix for CI server on gcc Linux.
2015-01-24 23:44:33 +01:00
LuisAntonRebollo
5583e73ca5
Fix for CI server on gcc Linux.
2015-01-24 23:28:12 +01:00
Luis Anton Rebollo
84d072f25c
Merge pull request #1027 from bpay/ambient-normals
...
Allow normals on shadowed surfaces
2015-01-24 23:05:51 +01:00
Luis Anton Rebollo
94f5e6d9dc
Merge pull request #1080 from eightyeight/netevent-reference-counting
...
Use a strong reference instead of more manual reference counting
2015-01-24 23:03:33 +01:00
Luis Anton Rebollo
ea0e3fd683
Merge pull request #1096 from bpay/fix-include-guards
...
Fix include guards
2015-01-24 23:02:13 +01:00
Luis Anton Rebollo
be84142502
Merge pull request #1118 from Lopuska/patch-17
...
fix #1117
2015-01-24 22:59:06 +01:00
Luis Anton Rebollo
ca382f56a6
Merge pull request #1119 from Lopuska/patch-18
...
OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox wi...
2015-01-24 22:58:47 +01:00
Luis Anton Rebollo
b3bce32685
Merge pull request #1111 from BeamNG/Linux
...
Linux
2015-01-24 22:26:17 +01:00
LuisAntonRebollo
4e9034854d
Linux implementation. Include changes for gcc x64.
2015-01-24 22:08:26 +01:00
Luis Anton Rebollo
4e52824a42
Merge pull request #1110 from BeamNG/changesForLinux
...
Changes for linux
2015-01-24 21:53:23 +01:00
LuisAntonRebollo
a7002c0ecc
Changes for Linux.
2015-01-24 21:52:46 +01:00
Luis Anton Rebollo
6beefc2ba6
Merge pull request #1109 from BeamNG/PlatformSDL
...
PlatformSDL
2015-01-24 21:50:01 +01:00
LuisAntonRebollo
d1ec326aeb
Merge remote-tracking branch 'GG-Github/development' into PlatformSDL
...
Conflicts:
Engine/source/platformX86UNIX/x86UNIXStub.dedicated.cpp
2015-01-24 21:48:22 +01:00
Luis Anton Rebollo
0f87e44527
Merge pull request #1108 from BeamNG/changes_for_sdl
...
Modified files for SDL2.
2015-01-24 21:40:24 +01:00
Anis
4ccf89ba8e
fix to avoid a missing sampler name declaration
2015-01-21 14:39:05 +01:00
Anis
5d392e373e
Update shaderFeatureGLSL.cpp
2015-01-20 19:13:25 +01:00
Anis
c9116dd4a4
OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox without a diffuse map
2015-01-20 19:07:29 +01:00
Anis
f05b1b5cbd
fix #1117
2015-01-20 17:02:56 +01:00
Anis
32b2564cd5
Jeff faust fix also on openGL.
2015-01-19 18:04:31 +01:00
LuisAntonRebollo
3336bffad2
Changes for Linux.
2015-01-19 01:44:36 +01:00
LuisAntonRebollo
aa35157eef
PlatformSDL implementation.
2015-01-19 01:17:37 +01:00
LuisAntonRebollo
21d58bb191
Modified files for SDL2.
2015-01-19 00:33:23 +01:00
Luis Anton Rebollo
d08db6cc54
Merge pull request #1107 from BeamNG/lib_sdl2
...
Add library SDL2
2015-01-19 00:19:49 +01:00
LuisAntonRebollo
475f218bcd
Modified files for SDL2.
2015-01-18 22:52:29 +01:00
LuisAntonRebollo
674133ac86
Add library SDL2
2015-01-18 21:05:38 +01:00
Ben Payne
b2b950c84a
Add missing include guards to some headers
2015-01-06 00:42:33 -05:00
Ben Payne
3574ef838b
Fix erroneous include guards
2015-01-06 00:42:09 -05:00