Commit graph

1202 commits

Author SHA1 Message Date
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
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
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 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 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 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
Luis Anton Rebollo f4b3d1e4cb Merge pull request #1064 from bpay/cmake-fixes
CMake fixes
2014-12-27 03:18:26 +01:00
Luis Anton Rebollo 39bd99a61a Merge pull request #1056 from Lopuska/patch-12
mipmap support on OpenGL cubemap
2014-12-27 03:18:16 +01:00
LuisAntonRebollo 6789270789 OpenGL: Mipmaps for GFXGLCubemap. Fix dynamic cubemaps. 2014-12-27 03:03:33 +01: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
Luis Anton Rebollo fa27fc51b2 Merge pull request #1084 from BeamNG/fix_win_glew_php_generator
OpenGL: Add project define for GLEW with php generator.
2014-12-27 01:12:54 +01:00
LuisAntonRebollo 29e610fbad OpenGL: Add project define for GLEW with php generator. 2014-12-27 00:39:47 +01:00
LuisAntonRebollo c2c9cf4a2d OpenGL: Mipmaps for GFXGLCubemap. Fix compressed textures. 2014-12-27 00:01:21 +01:00
LuisAntonRebollo 2f8f89d486 OpenGL: Mipmaps for GFXGLCubemap. Fix mipmaps size. 2014-12-26 21:28:31 +01:00
LuisAntonRebollo 9150c7f5ab OpenGL: Mipmaps for GFXGLCubemap. 2014-12-26 21:03:54 +01:00
Daniel Buckmaster 59a5261b02 Merge pull request #1072 from eightyeight/defineconsolemethod
Make more use of DefineConsoleMethod
2014-12-27 00:56:24 +11:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Daniel Buckmaster 7d376386d1 Merge pull request #1074 from Azaezel/AccuVolumes_2
Accumulation volumes
2014-12-26 13:18:00 +11:00
Daniel Buckmaster 4f9c4ea538 Merge pull request #1081 from eightyeight/opengl-project-manager
Added OpenGL to projects.xml
2014-12-26 12:18:11 +11:00
Daniel Buckmaster 7b8197a13a Added OpenGL to projects.xml. 2014-12-26 12:04:37 +11:00
LuisAntonRebollo 4e530f413e Fix glowBlurP.glsl shader. 2014-12-25 19:40:42 +01:00
Daniel Buckmaster f9cd778b3b Fixed tricky overloaded sfx* functions. 2014-12-24 10:04:44 +11:00
Daniel Buckmaster c85ac03c16 Merge pull request #1020 from eightyeight/simdictionary-improvement
SimDictionary improvement
2014-12-24 09:54:54 +11:00
LuisAntonRebollo 8f80ccc15a Merge pull request #1077 from BeamNG/fix_underwater
Fix persistent underwater effect.
2014-12-23 23:49:25 +01:00
Daniel Buckmaster 859514a792 Guard against null pointers and remove unnecessary include. 2014-12-24 08:34:30 +11:00
LuisAntonRebollo 7453610563 Fix persistent underwater effect. 2014-12-23 22:32:21 +01:00
Daniel Buckmaster 57cbc4d375 Revert changes to uses of setExtent.
This reverts part of commit 9907c4592e.
2014-12-23 20:59:08 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +11:00
LuisAntonRebollo cd993e0607 Merge pull request #970 from Lopuska/patch-5
clamp value fix on vorbis decoding
2014-12-22 23:20:44 +01:00
LuisAntonRebollo e58beba4a5 Merge pull request #1025 from bpay/fix-amd-mesh-render
Fix AMD render problem with missed meshes.
2014-12-22 23:10:43 +01: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