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

2033 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Azaezel
496b6a3ea8 truncation warning cleanups dx side (was also causing cornercase crashes gl side) 2016-02-26 00:21:01 -06:00
Anis
443cd2d607 Merge pull request #1231 from J0linar/platformNet_PR 
+proper buffer size for udp socket
 2016-02-25 18:38:47 +01:00
Anis
8f4295879d Merge pull request #1413 from Azaezel/LittleLeakLost 
partial reversion for #1333
 2016-02-25 18:29:50 +01:00
Anis
7418fbfbbd fixed memory leak in proper way 2016-02-25 18:26:15 +01:00
Anis
8c50cc70c3 Merge pull request #1186 from MusicMonkey5555/tcp-additions 
Tcp additions
 2016-02-25 16:28:34 +01:00
Anis
63e56ec666 Merge pull request #1432 from Azaezel/extract-reactive_rigids 
Backend correction for the rigid vs rigid collision resolver:
 2016-02-25 16:06:39 +01:00
Anis
a31dea224c Merge pull request #1525 from TheDushan/ImmutableBuffers 
Added immutable vertex and index buffers.
 2016-02-25 15:38:07 +01:00
Anis
740c999c19 compile fix 2016-02-25 15:26:52 +01:00
Anis
f39f7a80c8 Update gfxGLDevice.cpp 2016-02-25 15:26:25 +01:00
irei1as
988bd47d52 Visibility change as sugested by dottools 2016-02-24 09:02:07 +01:00
irei1as
c3b1aaae5a New script function to edit created decals 
TorqueScript function to edit decals created with decalManagerAddDecal.
 2016-02-23 17:17:54 +01:00
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