TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-20 07:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1955 commits 5 branches 33 tags 959 MiB
Commit graph

1270 commits

Author SHA1 Message Date
Azaezel
7a60056365 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 16:07:51 -06:00
Anis
304c33e525 removed tabs 2016-02-21 22:55:45 +01:00
Anis
2a1f81d3aa removed tabs 2016-02-21 22:48:10 +01:00
Anis
4c0d3bbc34 removed tabs 2016-02-21 22:41:35 +01:00
Anis
8ec2e534dc removed tabs 2016-02-21 22:36:27 +01:00
Azaezel
bc433e7c30 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 15:31:09 -06:00
Azaezel
ca2ffea6cd Merge branch 'development' of https://github.com/GarageGames/Torque3D into ColorPickerAdvanced 2016-02-21 15:30:54 -06:00
Azaezel
554a871df9 Merge branch 'development' into navMess2 
Conflicts:
	Engine/source/navigation/navMesh.cpp
 2016-02-21 15:27:12 -06:00
Anis
5c2bfbf82e Update guiColorPicker.h 2016-02-21 22:10:17 +01:00
Anis
aed2e0b5b6 Update guiColorPicker.cpp 2016-02-21 22:09:14 +01:00
Anis
494922d9ed fixed the not working text edit RGB field on color picker. 2016-02-21 18:14:41 +01:00
rextimmy
2383e8e43e Fix for TerrainFeatGLSL getProcessIndex() signed mismatch 2016-02-21 22:24:05 +10:00
rextimmy
36daca8d8e Corrected FeatureSet::getNextFeatureIndex and ShaderFeature::getProcessIndex signed mismatch. 2016-02-21 15:10:58 +10:00
Anis
6a2d394d90 Merge pull request #1348 from hpvb/intel-mesa-compile-fix 
Fix running on Linux / Intel Mesa drivers
 2016-02-20 14:50:22 +01:00
Azaezel
612d932372 Revert "Update navMesh.cpp" 
This reverts commit f3ff199554.
 2016-02-19 17:34:27 -06:00
Anis
cebfc81d7f Merge pull request #1496 from camporter/linux_compat_fixes 
Fix case sensitivity and Platform::fileDelete
 2016-02-19 16:50:27 +01:00
Anis
92e5cb3528 Merge pull request #1381 from Azaezel/debugdraw 
From Dušan Jocić: additional debugdraw entries.
 2016-02-19 16:29:29 +01:00
Anis
9acf487f03 Merge pull request #1332 from Azaezel/guiRelativeYresizes 
initial aspect ratio maintaining relative gui scaling
 2016-02-19 00:46:20 +01:00
Anis
6f47cb7dfa Update guiControl.h 2016-02-19 00:34:07 +01:00
Anis
df283a2709 Update guiTypes.cpp 2016-02-18 23:33:46 +01:00
Anis
3ca67b3148 Update guiTypes.h 2016-02-18 23:32:19 +01:00
Anis
c4590f6e3d Update guiTextEditCtrl.cpp 2016-02-18 23:30:09 +01:00
Anis
9a2a5b2a90 compile fix. 2016-02-18 16:49:06 +01:00
Anis
d08c0df85d Merge pull request #1512 from Lopuska/OpenGL_FullScreen_Clean 
[OpenGL - Win32] This fix a bug during resolution change.
 2016-02-18 15:26:21 +01:00
Anis
fe5bf90153 Merge pull request #1102 from Azaezel/mipmap_emission 
extraneous mipmap generation prune
 2016-02-17 19:02:15 +01:00
Anis
664f6c0639 Merge pull request #1518 from Azaezel/mathUtilsMangle 
http://stackoverflow.com/questions/8461832/explicit-qualification-in-…
 2016-02-16 19:19:19 +01:00
Areloch
4ccef9acf7 Merge pull request #1517 from Azaezel/AccessGranted 
Looks good.
 2016-02-16 09:34:50 -06:00
Anis
09ae25a567 Merge pull request #1516 from Azaezel/vsprintf_Variant 
vsprintf replacement with engine vairant
 2016-02-16 14:55:47 +01:00
Areloch
cb22357eb2 Merge pull request #1461 from Azaezel/textureLinearization 
Diffuse/albedo texture linearization
 2016-02-16 01:23:16 -06:00
Areloch
98b3d3294d Merge of PR #855 2016-02-16 00:23:02 -06:00
Azaezel
f8c4dd9d1d http://stackoverflow.com/questions/8461832/explicit-qualification-in-declaration 2016-02-15 19:08:03 -06:00
Azaezel
db4755a00f namespace conflict resolution 2016-02-15 19:05:09 -06:00
Azaezel
d25b03cd52 vsprintf replacement with engine vairant 
resolves first issue in
https://github.com/GarageGames/Torque3D/issues/1515#issuecomment-184446719
 2016-02-15 18:12:56 -06:00
Anis
f30aac3655 Merge pull request #1424 from rextimmy/fmod_crash_fix 
Changed order of fmodex library unload.
 2016-02-16 00:26:47 +01:00
Anis
168a2fe029 Merge pull request #1419 from irei1as/patch-1 
mQuat.h change to fix QuatF::angleBetween
 2016-02-16 00:22:39 +01:00
irei1as
6891d348af Update mQuat.h 2016-02-15 18:50:18 +01:00
irei1as
39613c0d87 Optimized 
You're right. If the normalized quaternions are in a variable or something for normal uses it's just a waste to force the change hidden inside again.
 2016-02-15 18:43:56 +01:00
Anis
74c189681c Merge pull request #1504 from Lopuska/patch-16 
ResourceLeakFix for OpenGL
 2016-02-15 14:08:44 +01:00
Anis
b009d678fa Merge pull request #1505 from Azaezel/OcclusionQueryFixGL_Clean 
courtessy @Lopuska: opengl occlusion query fix
 2016-02-15 14:07:09 +01:00
Anis
7aeec65a3b Update win32Window.cpp 2016-02-13 20:27:30 +01:00
Anis
f3ff199554 Update navMesh.cpp 2016-02-13 18:50:11 +01:00
Areloch
eebb1852f0 Merge pull request #1507 from RoundedIcon/PlayerScalingFix 
Works  nicely.
 2016-02-13 11:17:28 -06:00
RoundedIcon
7924f056bd Fix for collision issues with scaled players 
Players scaled after their creation have collision issues with terrain.
Changing this bit of code fixes those issues for downsized players, even
when shrunk to 10% of their original size.
 2016-02-01 16:58:39 -07:00
Azaezel
0f173df0d4 setDetailFromDistance aspect ratio friendly adjustment 2016-01-28 00:42:08 -06:00
Azaezel
23c4b52e1f courtessy @Lopuska: opengl occlusion query fix 2016-01-18 00:28:09 -06:00
Anis
e2d789e87d Update gfxGLTextureTarget.cpp 2016-01-18 06:17:20 +01:00
Anis
ca31ef3f1a Update gfxGLWindowTarget.cpp 2016-01-18 06:15:07 +01:00
Anis
500a237892 Update gfxGLWindowTarget.h 2016-01-18 05:56:00 +01:00
Anis
c3ef59e39c Update gfxGLWindowTarget.cpp 2016-01-18 05:55:48 +01:00
Anis
0728282287 Update gfxGLTextureTarget.cpp 2016-01-18 05:55:36 +01:00