TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
2053 commits 5 branches 33 tags 958 MiB
Commit graph

2053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
2cc08c6664 Merge pull request #1570 from Areloch/SimPathTempRollback 
Roll back the changes to simPath temporarily in order to merge in DX11
 2016-03-29 00:09:13 -05:00
Areloch
4d190b1982 Roll back the changes to simPath temporarily in order to merge in DX11 2016-03-29 00:08:18 -05:00
Areloch
b9b11047bf Merge pull request #1569 from Areloch/SimPathDX11Fix 
Fix for SimPath to make DX11 compatible.
 2016-03-28 22:48:24 -05:00
Areloch
b9d8df5a4a Includes a formatting fix for the SimPath change to make it compatible with DX11. 2016-03-28 22:47:22 -05:00
Areloch
1db77b728f Merge pull request #1566 from JeffProgrammer/vs2015dxfix 
Looks good.
 2016-03-25 09:05:54 -05:00
Jeff Hutchinson
e9efc05ebb fix release build compile with MSVC 2015 (finally) 2016-03-24 14:22:45 -04:00
Anis
25e8cf4711 Merge pull request #1554 from Azaezel/MagicalSkyBox 
from @rextimmy automatically adds a sky feature to  skies. (render so…
 2016-03-22 12:59:09 +01:00
Anis
935bddca35 Merge pull request #1556 from Azaezel/splineSpelunking 
Path editor display augmentations.
 2016-03-22 12:57:49 +01:00
Anis
7ccac9b9b7 Merge pull request #1550 from Azaezel/ResetGFX 
new method: ResetGFX();
 2016-03-22 12:53:02 +01:00
Anis
e0133384e0 Merge pull request #1552 from Azaezel/aLovelyGlow 
should actually let HDR have a say for glows.
 2016-03-21 19:31:21 +01:00
Anis
1d5a22cfea Merge pull request #1553 from Azaezel/MRTMangle 
turns out independent sized render targets was causing lighting artif…
 2016-03-21 19:28:49 +01:00
Anis
a769cda71a Merge pull request #1560 from rextimmy/GL_FP_format_fix 
GL floating point format fix.
 2016-03-21 19:18:04 +01:00
rextimmy
8667bd3ca2 GL floating point format fix. 2016-03-21 22:49:47 +10:00
Azaezel
e475b3060b won't need that any more after this 2016-03-20 16:51:24 -05:00
Azaezel
ed264e4e12 from @rextimmy automatically adds a sky feature to skies. (render sorting and orientation. previously required setting in script.) 2016-03-16 18:10:07 -05:00
Azaezel
74e3ee5214 turns out independent sized render targets was causing lighting artifacting. 2016-03-16 00:45:57 -05:00
Azaezel
fd961db215 should actually let HDR have a say for glows. 2016-03-15 22:33:32 -05:00
Azaezel
067caec4a4 docstring. do note best practices is to internally trigger this kind of thing, but this way folks have a test-case to see if that is in fact the flaw for their derivatives. 2016-03-15 19:19:12 -05:00
Azaezel
cc618ce2e0 new method: ResetGFX(); 
exposes the GFX->beginReset(); method to script to allow folks to force the gbuffer to reinitialize (if, say a custom element is holding on to data in a buffer and it needs a cleaning, to name one example)
 2016-03-15 18:04:11 -05:00
Anis
7bba3ee2de pushed a forgotten feature on OpenGL terrrain. 
added this: 69f2efab8f on OpenGL
 2016-03-04 22:51:09 +01:00
Anis
87f62c427c removed triangle fan draw on color picker 2016-03-04 22:18:12 +01:00
Anis
eb20b9e614 Merge pull request #1541 from Alex-doc/fix_crash_callOnChildren 
Fix crash callonchildren
 2016-03-04 18:15:16 +01:00
Alex Piola
07cf85143b fixes crash when callOnChildren 
Anis and me managed to fix this: #1508
 2016-03-04 18:03:21 +01:00
Alex Piola
e9b0e966a3 Merge remote-tracking branch 'refs/remotes/GarageGames/development' into development 2016-03-04 15:10:20 +01:00
Anis
0e44147d62 Merge pull request #1540 from Alex-doc/zip_dts_loading 
Fix zipped dts loading
 2016-03-04 15:05:21 +01:00
Alex Piola
d2d5b8d834 Fix zipped dts loading 2016-03-04 10:45:55 +01:00
Anis
61bae52c89 Merge pull request #1481 from Azaezel/AIExtracts 
Extacted AI tweaks:
 2016-03-03 23:43:21 +01:00
Azaezel
262cc4bac1 Merge branch 'development' of https://github.com/GarageGames/Torque3D into AIExtracts 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
 2016-03-02 10:59:10 -06:00
Anis
570c3c9acf Merge pull request #1539 from Azaezel/channelSwapShennanigans 
addresses https://github.com/GarageGames/Torque3D/issues/1537 via the…
 2016-03-02 17:26:34 +01:00
Azaezel
9472bfd3ca addresses https://github.com/GarageGames/Torque3D/issues/1537 via the following: 
908be4818f/Engine/source/materials/materialDefinition.cpp (L261) denotes power as sharpness, reflected in the size/falloff of a highlight halo *

908be4818f/Engine/source/materials/materialDefinition.cpp (L264) denotes strength as overall brightness of highlights. **

*and sharpness of reflection if using a cubemap.
**  reflected in cubemapped objects as also degree of 'reflection' vs diffuse/albedo coloration.
 2016-03-01 20:25:52 -06:00
Anis
c90dcdf54b Merge pull request #1536 from Azaezel/flagFix 
opengl crashfix pow(x,y) needed to be passed matching vartypes.
 2016-02-29 06:50:02 +01:00
Azaezel
1c854b6009 opengl crashfix pow(x,y) needed to be passed matching vartypes. 2016-02-29 04:17:42 -06:00
Areloch
908be4818f Merge pull request #1519 from Azaezel/deferredShading 
Deferred shading
 2016-02-27 15:08:20 -06:00
Areloch
c0e29d4a22 Correction for 2 of the render bin settings, as well as correcting the water shader over-exposing it's reflections. 2016-02-27 13:13:12 -06:00
Anis
fa5a6f3eae Merge pull request #1535 from GarageGames/AbstractConObjects 
[CLONE] Add support for abstract ConObjects
 2016-02-27 02:38:39 +01:00
Anis A. Hireche
49443d3167 conflict resolution 2016-02-27 02:16:07 +01:00
Anis
1286a517d5 Merge pull request #1497 from Azaezel/soundEnumExtendability 
footstep and impact enum extension support
 2016-02-27 01:10:23 +01:00
Anis
a34cf9e3f9 Merge pull request #1185 from MusicMonkey5555/script-improvements 
Improved file open dialogue
 2016-02-26 23:01:24 +01:00
Anis
9efe22649b Merge pull request #1533 from GarageGames/pr/1334 
New color picker - #1334 clone
 2016-02-26 22:02:07 +01:00
Anis A. Hireche
b3662d801a Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1334 
# Conflicts resolved:
#	Engine/source/console/consoleFunctions.cpp
 2016-02-26 21:58:01 +01:00
Anis A. Hireche
e7bee6585d Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-26 20:15:55 +01:00
Anis A. Hireche
2ff18cfc3f Merge remote-tracking branch 'refs/remotes/GarageGames/development' into ColorPickerAdvanced 2016-02-26 20:15:33 +01:00
Anis
973e5a6c02 Update consoleFunctions.cpp 2016-02-26 20:11:27 +01:00
Anis
794f1b9536 Merge pull request #1532 from GarageGames/pr/1143 
[CLONE] More consolefunctions #1143
 2016-02-26 18:57:49 +01:00
Anis A. Hireche
0fb62de4b8 restored old signature of mRound as it's used from scripts. 2016-02-26 18:41:29 +01:00
Anis
3984a4ec09 Merge pull request #1530 from GarageGames/AiPlayerPoses 
Steve Acaster's Ai Poses
 2016-02-26 16:10:28 +01:00
Anis A. Hireche
f701228a37 Steve Acaster's Ai Poses 2016-02-26 15:53:20 +01:00
Anis
42f7ee3930 Merge pull request #1528 from irei1as/patch-1 
New script function to edit script-created decals
 2016-02-26 14:57:18 +01:00
Anis
9085bb2178 Merge pull request #1529 from GarageGames/pr/1153 
Asserts cleanup PR with conflicts resolved.
 2016-02-26 14:49:48 +01:00
Anis A. Hireche
10cb6ab9c4 Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1153 2016-02-26 14:39:38 +01:00