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
9d84372dc8
Intel OpenGL - fix a crash/shader compile error when you activate Vertex Lit from Material Editor
2015-01-19 20:56:02 +01:00
Anis
32b2564cd5
Jeff faust fix also on openGL.
2015-01-19 18:04:31 +01:00
Anis
ee4f0df69a
Update gfxGLDevice.win.cpp
2015-01-19 17:44:48 +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
LukasPJ
a3f08df9e3
Fix for fuzzy borders
2015-01-12 17:03:52 +01:00
Azaezel
b8c750dd56
extraneous mipmap generation prune
...
OR spits out quite a few pointless mips for non square textures, which can lead to it triggering that AssertFatal(mNumMipLevels <= c_maxMipLevels, "GBitmap::allocateBitmap: too many miplevels"); entry
2015-01-11 17:45:29 -06:00
Jeff Hutchinson
f615802ba2
Fixed defines for shadergen. Defines were "defining" structure properties out for IN structures.
...
example:
// struct VertexData
// {
// vec3 position;
// vec3 normal;
// vec3 T;
// vec3 B;
// vec2 texCoord;
// vec2 texCoord2;
// } IN;
//
// varying vec4 _TEXCOORD2_;
//
// #define texCoord2 OUT_texCoord2
// #define OUT_outVpos _TEXCOORD2_
2015-01-11 01:30:58 -05: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
Daniel Buckmaster
33a0579735
Merge pull request #1093 from eightyeight/fix-setextent
...
Fix setExtent
2015-01-02 19:40:00 +11:00
Daniel Buckmaster
f1da30f285
Those are ints, not floats.
2015-01-02 19:38:05 +11:00
Daniel Buckmaster
7ab6731f51
Merge branch 'development' into walkabout
...
Conflicts:
Templates/Empty/game/tools/worldEditor/scripts/editors/creator.ed.cs
Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
2015-01-02 14:45:20 +11:00
Daniel Buckmaster
2410f4b899
Redid nav editor icons.
2015-01-02 14:42:18 +11:00
Daniel Buckmaster
37159bf9ad
Take object scale into account.
2015-01-02 13:59:16 +11:00
Daniel Buckmaster
93b0179019
Merge pull request #1002 from Winterleaf/Fix-ScatterSky-Zindex
...
Z Offset for Scattersky to fix the rendering issue at high altitudes.
2015-01-02 13:04:24 +11:00
Daniel Buckmaster
e446502bbc
Merge pull request #1090 from eightyeight/anon-functions
...
Anonymous functions in Torquescript
2015-01-02 12:50:08 +11:00
Daniel Buckmaster
dd9e416b00
Regenerate flex/bison files.
2015-01-01 10:33:50 +11:00
Daniel Buckmaster
5a66f00697
Use a buffer on the stack.
2015-01-01 10:33:35 +11:00
Daniel Buckmaster
170a4ea08f
Add anonymous functions before other statements.
2014-12-29 22:44:57 +11:00
Daniel Buckmaster
412247c401
Regenerate lex/bison files.
2014-12-29 21:50:11 +11:00
Daniel Buckmaster
1204b81a78
Added anomymous functions as in Konrad Kiss's resource.
2014-12-29 21:49:52 +11:00
Daniel Buckmaster
40b871e652
Add profiling to StringTable.
2014-12-29 20:20:00 +11:00
Daniel Buckmaster
e9308e40ed
Merge pull request #998 from rextimmy/physx3_cpu_dispatcher_fix
...
Fixed issue where physx3 cpu dispatcher was created multiple times
2014-12-29 14:14:05 +11:00
Daniel Buckmaster
cae70a9cd0
Merge pull request #1088 from eightyeight/version-3.6.3
...
Bump version numbers
2014-12-29 12:55:21 +11:00
Daniel Buckmaster
05b8fe4423
Bump version numbers.
2014-12-29 12:32:45 +11:00
Daniel Buckmaster
d7042fb6c3
Merge pull request #1078 from Azaezel/Jeff_Faust_Fixes
...
AFX fixes
2014-12-29 11:40:01 +11:00
Daniel Buckmaster
f85fc550c5
Merge pull request #1038 from stenyak/fix-cursor-show-bug
...
Fix off-by-one error in cursor hiding/showing function
2014-12-28 22:54:41 +11:00