Commit graph

1076 commits

Author SHA1 Message Date
GuyAllard
bc230be8a2 Added scriptable move triggers for AIPlayers. Fixes an issue where AIPlayers were setting move trigger states from invalid memory. Enables the use of player poses and actions. 2014-12-04 16:21:57 +01:00
Areloch
7097ce6466 Merge pull request #995 from Winterleaf/Fix-threadPool.cpp
Looks good.
2014-12-02 13:50:52 -06:00
Vincent Gee
48ba106667 Just cleaned up some code 2014-11-30 20:28:40 -05:00
LuisAntonRebollo
5e74a465a9 Merge pull request #988 from BeamNG/clean_opengl_fragment_out
Clean GLSL fragment shader out.
2014-12-01 01:28:05 +01:00
LuisAntonRebollo
7bf99e38ec Merge pull request #989 from BeamNG/fix_opengl_formating
Fix OpenGL changes formating.
2014-11-30 23:57:18 +01:00
LuisAntonRebollo
3500ff3bb3 Merge pull request #990 from BeamNG/fix_opengl_ci
Fix CI server.
2014-11-30 23:42:06 +01:00
LuisAntonRebollo
a5d2455e2e Fix CI server. 2014-11-30 23:34:33 +01:00
LuisAntonRebollo
1d3f3fdfe4 Fix OpenGL changes formating. 2014-11-30 23:09:11 +01:00
LuisAntonRebollo
ed0febea39 Clean GLSL fragment shader out. 2014-11-30 23:00:18 +01:00
LuisAntonRebollo
87f34e3c4f Merge pull request #986 from BeamNG/fix_color_mrt
Fix GLSL out fragment shader color.
2014-11-30 05:44:25 +01:00
LuisAntonRebollo
4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo
80482753e1 Merge pull request #985 from BeamNG/fix_member_decl
Clean PlaneReflector member variables declaration.
2014-11-30 05:28:33 +01:00
LuisAntonRebollo
adc7c72caa clean PlaneReflector member variables declaration. 2014-11-30 05:16:56 +01:00
LuisAntonRebollo
a0d5dc25cd Merge pull request #962 from BeamNG/fix_opengl_new_terrain_blend
Fix OpenGL new terrain blend
2014-11-30 05:12:06 +01:00
LuisAntonRebollo
fb08fafc9c Fix terrFeatureGLSL.cpp for GCC. 2014-11-30 05:03:30 +01:00
LuisAntonRebollo
32e8725931 Merge pull request #983 from Azaezel/stray_mSamplerNames
DeferredMinnaert feautre was missing samplernames
2014-11-30 04:59:24 +01:00
LuisAntonRebollo
c916e7de7c Merge pull request #984 from Azaezel/mBitsPerChannel_match_DX_OGL
const U64 maxValPerChannel = (U64)1 << mBitsPerChannel;
2014-11-30 04:58:33 +01:00
Azaezel
bea3563c3d const U64 maxValPerChannel = (U64)1 << mBitsPerChannel; 2014-11-29 21:50:02 -06:00
LuisAntonRebollo
ff83e8c209 Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend 2014-11-30 04:47:38 +01:00
Azaezel
2e112802e5 DeferredMinnaert feautre was missing samplernames 2014-11-29 21:44:05 -06:00
LuisAntonRebollo
a6054fea85 Merge pull request #982 from BeamNG/fix_php_project_generator_opengl
Fix PHP ProjectGenerator for OpenGL.
2014-11-30 04:38:13 +01:00
LuisAntonRebollo
0a31af06f5 Fix PHP ProjectGenerator for OpenGL. 2014-11-30 04:37:10 +01:00
LuisAntonRebollo
8b25a5e90e Merge pull request #981 from BeamNG/fix_opengl_x64
Fix x64 builds.
2014-11-30 04:02:24 +01:00
LuisAntonRebollo
a4bf61f07b Fix x64 builds. 2014-11-30 04:00:58 +01:00
LuisAntonRebollo
98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support
Add/Activate OpenGL render.
2014-11-30 02:48:13 +01:00
LuisAntonRebollo
3067c3f0b2 Merge pull request #924 from BeamNG/remove_disableshader
Remove GFXDevice::disableShader
2014-11-30 02:47:46 +01:00
LuisAntonRebollo
0747a0efe9 Remove GFXDevice::disableShader becouse we are going to remove Fixed Function Pipeline and we need a shader for render. 2014-11-30 02:36:21 +01:00
LuisAntonRebollo
7184e36928 Merge pull request #961 from BeamNG/fix_opengl_fullscreen
Fix OpenGL fullscreen on win32
2014-11-30 02:24:19 +01:00
LuisAntonRebollo
f1aff86510 Merge pull request #965 from eightyeight/opengl-project-manager
Added OpenGL module with some additions to the project generator
2014-11-30 02:24:04 +01:00
LuisAntonRebollo
04d069daa0 Merge pull request #939 from BeamNG/templates_opengl
Templates changes for OpenGL shaders.
2014-11-30 02:23:37 +01:00
LuisAntonRebollo
50fab23cb0 Merge pull request #938 from BeamNG/remove_old_opengl
Remove old/unused OpenGL files.
2014-11-30 02:23:29 +01:00
LuisAntonRebollo
ad5ecee46d Merge pull request #937 from BeamNG/increase_frame_buffer_size
Increase FrameBuffer size for use on OpenGL.
2014-11-30 02:23:23 +01:00
LuisAntonRebollo
29e2a481bb Merge pull request #936 from BeamNG/glew
GLEW library for OpenGL.
2014-11-30 02:23:16 +01:00
LuisAntonRebollo
70a63dd9d2 Merge pull request #935 from BeamNG/fix_imposter_capture
Fix imposter capture on OpenGL.
2014-11-30 02:23:07 +01:00
LuisAntonRebollo
a4c8e1d881 Merge pull request #934 from BeamNG/postfx_opengl
Changes on PostFX for OpenGL.
2014-11-30 02:23:02 +01:00
LuisAntonRebollo
82315a9960 Merge pull request #933 from BeamNG/shadergen_glsl
Changes on ShaderGen for generate GLSL shaders.
2014-11-30 02:22:58 +01:00
LuisAntonRebollo
b731f3cbe5 Merge pull request #932 from BeamNG/reduce_RT_changes
Reduce innecesary changes on Render Target textures.
2014-11-30 02:22:52 +01:00
LuisAntonRebollo
9c66aa0681 Merge pull request #931 from BeamNG/terrain_layer_format
Set correct terrain layer texture format.
2014-11-30 02:22:39 +01:00
LuisAntonRebollo
b632d06c97 Merge pull request #930 from BeamNG/separate_opengl_from_os
Separate OpenGL code from Linux or Mac.
2014-11-30 02:22:28 +01:00
LuisAntonRebollo
2f8d18c0c0 Merge pull request #929 from BeamNG/remove_old_opengl_code
Remove unnecesary code for handle OpenGL.
2014-11-30 02:22:24 +01:00
LuisAntonRebollo
98926b1ae1 Merge pull request #928 from BeamNG/renderparticlemanager_sampler_names
Change RenderParticleMgr for use sampler names
2014-11-30 02:22:19 +01:00
LuisAntonRebollo
07b0ea9ca6 Merge pull request #927 from BeamNG/setupgenericshader
Add GFXDevice::setupGenericShader for fix render on non FFP.
2014-11-30 02:22:13 +01:00
LuisAntonRebollo
60f4d4f282 Merge pull request #926 from BeamNG/primbuild_for_non_ffp
Fix PrimBuild with non Fixed Function Pipeline.
2014-11-30 02:21:36 +01:00
LuisAntonRebollo
03ffa1ddd3 Merge pull request #925 from BeamNG/shaderdata_samplernames
Add sampler names to ShaderData
2014-11-30 02:21:30 +01:00
LuisAntonRebollo
3e7c7b3e49 Merge pull request #622 from BeamNG/texel_pixel_offset
Handle texel-pixel offset with diferents graphics APIs.
2014-11-30 02:20:45 +01:00
LuisAntonRebollo
15c3be683c Merge pull request #620 from BeamNG/add_RenderPassData_mSamplerNames
Add RenderPassData::mSamplerNames for OpenGL code. Not used on DX9.
2014-11-30 02:20:37 +01:00
LuisAntonRebollo
8af6a16e3a Merge pull request #618 from BeamNG/clouds_shader_sampler_reg
Use shader data for get sampler register in CloudLayer and BasicClouds.
2014-11-30 02:20:31 +01:00
LuisAntonRebollo
ac31cf18b7 Merge pull request #611 from BeamNG/templates_shader_data_decl
Add sampler names to Templates ShaderData declarations necesary for OpenGL.
2014-11-30 02:20:24 +01:00
LuisAntonRebollo
1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
LuisAntonRebollo
fab2bb46c5 Changes for get necesary sampler names for OpenGL shaders. 2014-11-30 02:18:28 +01:00