Commit graph

160 commits

Author SHA1 Message Date
LuisAntonRebollo 1dacf7b04e Fix torqueConfig.h TORQUE_FRAME_SIZE. 2015-01-31 19:34:14 +01: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
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
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
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
Luis Anton Rebollo 9eb05b2bdc Merge pull request #1083 from BeamNG/opengl_intel_WIP
Fix/walkaround for OpenGL on Intel
2014-12-27 01:13:14 +01:00
Daniel Buckmaster 7d376386d1 Merge pull request #1074 from Azaezel/AccuVolumes_2
Accumulation volumes
2014-12-26 13:18:00 +11:00
LuisAntonRebollo 4e530f413e Fix glowBlurP.glsl shader. 2014-12-25 19:40:42 +01:00
Daniel Buckmaster c85ac03c16 Merge pull request #1020 from eightyeight/simdictionary-improvement
SimDictionary improvement
2014-12-24 09:54:54 +11:00
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
Azaezel c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06: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 cf195152d6 Workaround for OpenGL terrain blend on Intel drivers. 2014-12-16 00:30:50 +01:00
Daniel Buckmaster 61e106251d Made toolbar resize intelligently. 2014-12-15 11:22:44 +11:00
LuisAntonRebollo 0718875ac3 OpenGL Intel - Fix a error on DOF_DownSample_P.glsl. 2014-12-11 22:58:02 +01:00
LuisAntonRebollo b0efd865d9 Use factor of ambient light with camera direction for allow normals on shadowed surfaces. 2014-12-09 19:46:06 -05:00
LuisAntonRebollo 5e4a0fbaa1 Merge pull request #1005 from BeamNG/revert_terrain_opengl
Revert terrain opengl
2014-12-10 00:08:35 +01:00
Daniel Buckmaster 116276a105 Tweaks so I'm happy with it.
* Change #define usage
 * Fix tabs
2014-12-08 10:20:38 +11: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
Daniel Buckmaster add9f990f7 Removed GuiFlexibleArrayControl. 2014-12-01 23:31:43 +11:00
Daniel Buckmaster 2ed175b52c Moved some scripts and made global flags preferences. 2014-12-01 18:05:34 +11: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
Daniel Buckmaster c1419d28d1 Fixed NavMesh auto sizing. 2014-11-29 13:18:08 +11: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
Daniel Buckmaster 163b14fac1 Added editor. 2014-11-29 01:07:05 +11:00
Anis A. Hireche 18213a7fa9 missing some file 2014-11-27 20:56:25 +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
Vincent Gee f0a16bb9e3 More comments added, move #include 2014-11-05 16:47:07 -05: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
Vincent Gee a91e5a2590 Improvements to SimDictionary for when you have a large number of objects in the game. Under light load (i.e. under 5000 objects) this code actually runs slower that the stock simdictionary. When you exceed 5000 objects, the template class actually runs faster and more consistently. 2014-11-04 06:30:35 -05:00