TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-20 04:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
1126 commits 5 branches 33 tags 978 MiB
Commit graph

185 commits

Author SHA1 Message Date
Daniel Buckmaster
450a6c6c80 Merge pull request #969 from eightyeight/options-for-godrays 
Added settings for god-ray PostFX.
 2014-12-22 14:52:09 +11:00
Daniel Buckmaster
4af7227559 Fixed some ranges. 2014-12-21 23:20:48 +11:00
Daniel Buckmaster
154be2ae0e Merge pull request #974 from Azaezel/sound_provider_fallback_request 
re-orders sound device provider wieghting
 2014-12-21 19:06:06 +11:00
Azaezel
98048fd974 Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles 
Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
 2014-12-16 18:48:28 -06:00
LuisAntonRebollo
5e4a0fbaa1 Merge pull request #1005 from BeamNG/revert_terrain_opengl 
Revert terrain opengl
 2014-12-10 00:08:35 +01:00
LuisAntonRebollo
c20f29c672 Merge pull request #1003 from Lopuska/ribbon_opengl 
Ribbon port for opengl
 2014-12-05 22:58:38 +01:00
Anis A. Hireche
d16a236937 ribbon_opengl 2014-12-03 22:19:02 +01:00
LuisAntonRebollo
f3e737e001 3 textures blending fix for OpenGL. 2014-12-03 21:59:53 +01:00
LuisAntonRebollo
7962eef7dd Revert - Merge pull request #962 Fix OpenGL new terrain blend 
from BeamNG/fix_opengl_new_terrain_blend (reverted from commit a0d5dc25cd)
 2014-12-03 21:54:57 +01:00
LuisAntonRebollo
ed0febea39 Clean GLSL fragment shader out. 2014-11-30 23:00:18 +01:00
LuisAntonRebollo
4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo
ff83e8c209 Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend 2014-11-30 04:47:38 +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
04d069daa0 Merge pull request #939 from BeamNG/templates_opengl 
Templates changes for OpenGL shaders.
 2014-11-30 02:23:37 +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
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
Azaezel
55c3717ffa re-orders sound device provider wieghting to preffer xaudio over directsound as d-sound is getting tossed soon. 2014-11-29 05:20:46 -06:00
LukasPJ
30a8401d14 Add support for rendering particles to the glow buffer 2014-11-28 23:34:26 +01:00
ChelaruCatalin
cea768a3b1 Improved God Ray 
Add control for the number of samples and other controls for God Rays
shader.
 2014-11-29 07:53:31 +11:00
Anis A. Hireche
18213a7fa9 missing some file 2014-11-27 20:56:25 +01:00
Anis
09b6a06bbc wrong merge fix 2014-11-27 20:56:24 +01:00
Anis A. Hireche
a954daa43f terrain_blending_opengl_port_from_lukas_code 2014-11-27 20:56:23 +01:00
LuisAntonRebollo
dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
LuisAntonRebollo
5bcd1458c4 Templates changes for OpenGL shaders. 2014-11-08 20:19:50 +01:00
LuisAntonRebollo
2103fd40c4 Increse FrameBuffer size for use on OpenGL. 2014-11-08 19:01:46 +01:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6 
Version 3.6.2
 2014-11-05 20:28:01 +11:00
Daniel Buckmaster
9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix 
3 textures blending fix
 2014-11-04 17:06:04 +11:00
Daniel Buckmaster
be75d5eaab Merge pull request #886 from eightyeight/fix-postfx-manager 
Reduce minimum tab width in PostFX manager
 2014-11-04 14:20:03 +11:00
Daniel Buckmaster
719fcd7d2d Reduce minimum tab width in PostFX manager. 2014-11-04 14:16:32 +11:00
Daniel Buckmaster
ed820f2dd4 Merge pull request #761 from J0linar/PostFx_Vignette 
Added Vignette PostFx
 2014-11-04 13:30:47 +11:00
Daniel Buckmaster
f3b08501c0 Enable gamepad input when the startup GUI wakes. 2014-10-31 08:07:19 +11:00
Daniel Buckmaster
ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation 
Ribbon and RibbonNode
 2014-10-28 15:19:17 +11:00
Daniel Buckmaster
e02e542717 Merge pull request #749 from lukaspj/MixedParticleRendering 
Re-enable Mixed particle rendering
 2014-10-28 09:50:02 +11:00
unkown
c527313284 Fixed a crash when ribbons are loaded 2014-10-20 21:09:41 -06:00
Daniel Buckmaster
b9ebe479a3 Disable all post effects by default. 2014-10-19 20:45:27 +11:00
Daniel Buckmaster
effa335c26 Merge pull request #693 from 'Azaezel/Metrics_Keybind' 2014-10-12 15:06:56 +11:00
Daniel Buckmaster
a8d9f6c499 Fixed Full template art a bit. 
Player can now swim properly, and the physical zone elevator is a bit
more helpful (i.e. it sends you to the landing rather than leaving you
floating in midair). Fiddled some more with PostFX settings.
 2014-10-06 12:58:32 +11:00
Daniel Buckmaster
e5bc07010c Fixed minor issues with Outpost level. 
* Black spots caused by wrongly named images.
 * HDR settings tweaked to be a bit brighter.
 2014-10-04 20:30:27 +10:00
Daniel Buckmaster
5103ba22e2 Merge pull request #807 from eightyeight/az_outpost 
Added Outpost testing level by Azaezel
 2014-10-03 09:34:30 +10:00
Areloch
099a91553a Merge pull request #723 from Azaezel/lightRay_Cleanup 
Light ray cleanup
 2014-10-01 22:34:23 -05:00
Daniel Buckmaster
599ad823b0 Added Outpost testing level by Azaezel. 2014-10-02 10:51:39 +10:00
Daniel Buckmaster
0a9b393e23 Merge pull request #775 from Azaezel/soldier_triggers 
player triggers.
 2014-10-02 10:22:34 +10:00
LuisAntonRebollo
535f56af6e Merge pull request #801 from eightyeight/gtest-tests 
Googletest tests
 2014-10-02 01:31:13 +02:00
Daniel Buckmaster
2a9e6ef5e6 Renamed default ribbon datablocks. 2014-09-24 08:27:03 +10:00
LukasPJ
35f88a77b1 Script integration for Ribbons 2014-09-23 15:44:55 +02:00
Azaezel
9318f8faf3 player triggers. these are what determine the timing ffor when footprint decals and a sound are played based on material configurations during a given animation. 2014-09-05 23:10:08 -05:00
Azaezel
ae55b5f552 Adds material definitions for groundcover referencing. 2014-09-01 19:39:29 -05:00
Daniel Buckmaster
5a430af051 Merge remote-tracking branch 'gg/development' into gtest-tests 2014-08-30 17:51:41 +10:00
Lukas Joergensen
53f241974b Doing a hard compare instead of using step for blending factors 2014-08-25 21:08:39 +02:00
J0linar
83c8274952 -added Vignette PostFx 
-added vignette to the Full and Empty Template
-added vignette to the PostEffect Manager
-added vignette Shader and .cs File
 2014-08-20 06:22:10 +02:00