Commit graph

3499 commits

Author SHA1 Message Date
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
Daniel Buckmaster
183fe7dbeb Merge pull request #996 from Winterleaf/Add-new-cpus-AMD-Types
Added support for AMD Chips
2014-12-21 19:04:26 +11:00
Daniel Buckmaster
8a104a5222 Merge pull request #1018 from eightyeight/ghost-scoping
Add the option to limit ghost scoping range
2014-12-21 19:03:02 +11:00
Daniel Buckmaster
7916ff369b Merge pull request #1026 from jamesu/fix_console_stack
Fix issue where console stack values were getting overwritten
2014-12-21 19:02:20 +11:00
LuisAntonRebollo
e5cd80ac87 Merge pull request #1024 from eightyeight/scattersky-flare-fix
Fix ScatterSky flare occlusion
2014-12-19 13:35:48 +01:00
Anis
5c72035e01 virtual processVert also on directx 2014-12-19 12:25:56 +01:00
Anis
30815cb641 fixed also on DirectX 2014-12-19 12:25:18 +01:00
Anis
4bf5aade6e make override processVert on SpecularMap feature 2014-12-19 12:24:03 +01:00
Anis
1751e60734 bugfix #1066
texcoord connector on the vertexshader to avoid link time error
2014-12-19 12:22:36 +01:00
Ben Payne
d1f450a001 Fix malformed flags 2014-12-18 18:29:03 -05:00
rextimmy
97e7e07607 winTime month fix 2014-12-18 14:25:45 +10:00
Daniel Buckmaster
62f880af24 Merge pull request #1061 from Azaezel/glowParticles
Glow particles
2014-12-18 10:15:05 +11:00
Ben Payne
09d1df4bed Fix executable naming for cmake builds 2014-12-17 15:27:02 -05:00
Ben Payne
4b57dde346 Fix broken cmake macro
Only the first config in the list was being seen
2014-12-17 14:03:51 -05:00
Ben Payne
58f07aecb4 Fix CMP0043 cmake warning when using cmake 3.0.2
COMPILE_DEFINITIONS_CONFIG has been deprecated, use generator expressions
with plain COMPILE_DEFINITIONS instead (available since 2.8.10)
2014-12-17 14:03:51 -05:00
Daniel Buckmaster
63b35581c4 Merge pull request #1036 from Areloch/Issue_748
PR for issue #748
2014-12-17 21:02:20 +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
Anis
ca04726ad6 glGenerateMipmap on uncompressed cubemap 2014-12-16 15:14:30 +01:00
LuisAntonRebollo
cf195152d6 Workaround for OpenGL terrain blend on Intel drivers. 2014-12-16 00:30:50 +01:00
Anis
0cf36a8906 mipmap support on DDS for openGL cubemap 2014-12-15 18:59:42 +01:00
LuisAntonRebollo
5d5303cf6d Merge pull request #1055 from BeamNG/fix_cubemap
Fix ShaderGen cubemap feature.
2014-12-15 18:49:53 +01:00
LuisAntonRebollo
15c8922028 Fix ShaderGen cubemap feature. 2014-12-15 18:28:17 +01:00
Daniel Buckmaster
33ff180593 Merge branch 'development' into style-cleanup
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
Daniel Buckmaster
61e106251d Made toolbar resize intelligently. 2014-12-15 11:22:44 +11:00
LuisAntonRebollo
ef2a843dcd Merge pull request #1029 from Lopuska/patch-3
Intel graphics bugfix
2014-12-14 23:45:47 +01:00
Cornee Traas
6cb5496ae6 Add VS2012 support
Files are essentially just copied from the 2010 version with slight
tweaks, works without any warnings or errors.
2014-12-13 22:29:28 +01:00
Ben Payne
8d4679b2b7 Fix potential buffer overflows 2014-12-13 16:12:02 -05:00
Ben Payne
cadc390895 Fix leaked member var 2014-12-13 16:08:48 -05:00
Ben Payne
de7101dec2 Fix mismatched free
Memory was allocated with new on line 304
2014-12-13 16:08:47 -05:00
Ben Payne
98e79f3aec Fix uninitialized member vars 2014-12-13 16:08:47 -05:00
Ben Payne
50238fb2ac Casts are stronger than necessary 2014-12-13 16:08:46 -05:00
Ben Payne
dd297d4dc0 Fix buffer overflow 2014-12-13 16:08:38 -05:00
Anis
2db9aa52ef missing texture format.
To silence a console error on startup (OpenGL)
2014-12-13 15:11:13 +01:00
Areloch
fd186204a2 Fizes #945 2014-12-13 03:11:11 -06:00
LuisAntonRebollo
fe9c30b5bb Lowercase TSStatic fied names. 2014-12-12 22:41:08 +01:00
LuisAntonRebollo
4e936c2101 Merge pull request #1040 from BeamNG/fix_spaces_in_field
Fix spaces in TSStatic fied names.
2014-12-12 22:37:05 +01:00
LuisAntonRebollo
8f4c0ed95d Fix spaces in TSStatic fied names. 2014-12-12 22:36:08 +01:00
Bruno Gonzalez
046f4e4e2d Fix off-by-one error in cursor hiding/showing function
Incorrect API use according to msdn.

Source: http://msdn.microsoft.com/en-us/library/windows/desktop/ms648396%28v=vs.85%29.aspx
"cursor is displayed only if the display count is greater than or equal to 0"
2014-12-12 16:53:07 +01:00
Anis
1131bdd5ab Black screen fix
black screen wasn't properly fixed in certain situation.
Now it's fixed!
2014-12-12 15:27:49 +01:00
Daniel Buckmaster
763d178704 Merge pull request #1032 from eightyeight/issue-694
Fix a crash when change a material reclect cubemap
2014-12-12 21:49:41 +11:00
Daniel Buckmaster
4210c002bb Merge pull request #991 from Winterleaf/BitAlign-ServerQuery.cpp
Bit  Alignment of variables in serverQuery.cpp
2014-12-12 21:47:40 +11:00
Daniel Buckmaster
9fca02b2f8 Merge pull request #1017 from eightyeight/aiplayer-triggers-fix
AIPlayer trigger fix
2014-12-12 21:45:57 +11:00
Daniel Buckmaster
38f8c79b3e Merge pull request #1033 from eightyeight/guishapenamehud-maths-fix
Fix GuiShapeNameHud maths
2014-12-12 21:45:14 +11:00
Areloch
8518c85e80 PR for issue #748 2014-12-11 22:17:55 -06:00
Ben Payne
a3f4adacc3 Replace obsolete calling convention 2014-12-11 20:08:45 -05:00
Ben Payne
dc780ddcae Fix use-after-delete 2014-12-11 19:09:02 -05:00
Ben Payne
68b5e7b517 Fix more use-after-delete errors 2014-12-11 19:09:01 -05:00
Ben Payne
c50c88d071 Fix use-after-delete errors 2014-12-11 19:09:01 -05:00
Ben Payne
d97d44f66f Fix more misc uninitialized vars 2014-12-11 18:25:29 -05:00
Ben Payne
a10e6e99d4 Fix read past end of array 2014-12-11 18:22:14 -05:00