Commit graph

1027 commits

Author SHA1 Message Date
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
Daniel Buckmaster
244c2ec82b Merge pull request #977 from rextimmy/physx3_projects_xml
Support for physx3 in projects.xml
2014-11-30 08:30:32 +11:00
rextimmy
1b65252539 - Fixed typo in physx3 module 2014-11-29 23:25:36 +10:00
rextimmy
fbdc385afd projects.xml fix for physx3 2014-11-29 23:23:01 +10:00
rextimmy
e74a7025db Support for physx3 in projects.xml 2014-11-29 22:46:17 +10:00
Daniel Buckmaster
a0e1fca057 Merge pull request #685 from rextimmy/physx3_basic
Physx3 Physics Plugin
2014-11-29 20:05:08 +11:00
Daniel Buckmaster
e47b95ee5d Merge pull request #971 from Azaezel/revert-794-euler_to_quat_revert
turret tracking correction, again
2014-11-29 14:00:04 +11:00
LuisAntonRebollo
823b413c1f Handle texel-pixel offset with diferents graphics APIs. 2014-11-27 00:59:17 +01:00
Daniel Buckmaster
c08413ffde Merge pull request #919 from lukaspj/Network-BaseTexFormat-Fix
BaseTexFormat was not networked properly.
2014-11-26 10:30:20 +11:00
LuisAntonRebollo
a7434635cb Fix TAB vs Spaces on Engine/source/gfx/primBuilder.cpp 2014-11-25 22:43:22 +01:00
Daniel Buckmaster
9150afe81a Merge pull request #902 from Winterleaf/Types.h
Cleaning up and streamlining Types.h,
2014-11-24 11:09:02 +11:00
Daniel Buckmaster
2546eec014 Merge pull request #877 from GarageGames/revert-794-euler_to_quat_revert
Revert "Euler to quat reversion"
2014-11-24 11:02:00 +11:00
Daniel Buckmaster
ae00e3046f Merge pull request #955 from Azaezel/EvalReturn_issue_953
Eval return issue 953 and trace buffer 952
2014-11-24 10:57:14 +11:00
Daniel Buckmaster
826b81fc20 Merge pull request #889 from Winterleaf/mEase-Improvements
Improvements to the math in mEase
2014-11-22 18:21:01 +11:00
Azaezel
4ea051a939 tabs 2014-11-20 14:38:17 -06:00
Azaezel
1c4cc888f8 fix for issue #953, courtesy of @jamesu. trace buffer was truncating values. 2014-11-20 14:20:54 -06:00
Azaezel
3039f4399d eval(methodWithReturnValue) wasn't passing along it's return value though the stringstack.fix courtessy of @jamesu 2014-11-20 14:17:59 -06:00
Vincent Gee
98f718552d Fixed mAsin back to mSin 2014-11-17 21:18:52 -05:00
Thomas Fischer
e7a4d61772 Merge pull request #894 from Winterleaf/Dev---Volume.cpp
Added Sanity Check for out of memory
2014-11-17 18:03:21 +01:00
Thomas Fischer
469fe3afa7 Merge pull request #758 from eightyeight/meshroad_physics_collision
Implemented physics collision for MeshRoad
2014-11-17 17:45:00 +01:00
Areloch
b5ce3fa8ad Merge pull request #903 from Winterleaf/MissionMarker
Looks good, don't see any problems. Merged.
2014-11-13 21:48:58 -06:00
Daniel Buckmaster
895cf59500 Merge pull request #890 from Winterleaf/Dev-depthSortList.cpp
Minor Improvement to depthSortList.cpp
2014-11-12 09:52:50 +11:00
Daniel Buckmaster
1f0209db78 Merge pull request #917 from jamesu/fix_audio_print
Fix bug where console stack was incorrectly used to print audio devices
2014-11-12 09:37:16 +11:00
LuisAntonRebollo
54c0ef9821 GLEW library for OpenGL. 2014-11-08 19:00:32 +01:00
LuisAntonRebollo
259030de47 Fix imposter capture on OpenGL. 2014-11-08 18:57:45 +01:00
LuisAntonRebollo
eb200c988c Changes on PostFX for OpenGL. 2014-11-08 18:56:39 +01:00
LuisAntonRebollo
61d3e52ad1 Changes on ShaderGen for generate GLSL shaders. 2014-11-08 18:40:33 +01:00
LuisAntonRebollo
c0b2e6536b Reduce innecesary changes on Render Target textures. 2014-11-08 18:34:21 +01:00
LuisAntonRebollo
1ac8fab884 Changes for get necesary sampler names for OpenGL shaders. 2014-11-08 18:31:14 +01:00
LuisAntonRebollo
b81ebaa386 Set correct terrain layer texture format. 2014-11-08 18:19:14 +01:00
LuisAntonRebollo
7f183ef9e5 Separate OpenGL code from Linux or Mac. 2014-11-08 18:15:49 +01:00
LuisAntonRebollo
f101fbe820 Remove unnecesary code for handle OpenGL. 2014-11-08 18:11:35 +01:00
LuisAntonRebollo
53ac49ee91 Change RenderParticleMgr for use sampler names instead of harcoded locations for allow OpenGL. 2014-11-08 18:03:49 +01:00