Commit graph

1879 commits

Author SHA1 Message Date
Anis
7b8df19a33 Merge pull request #1 from GarageGames/development
development updates
2016-02-13 20:25:22 +01:00
Areloch
eebb1852f0 Merge pull request #1507 from RoundedIcon/PlayerScalingFix
Works  nicely.
2016-02-13 11:17:28 -06:00
Areloch
94653fdbac Merge pull request #1506 from Azaezel/pixelScaleAdjust
Seems to work fine for me. May be able to use some additional refinement later, but this seems more reliable than the hardcoded value that's in there now.
2016-02-04 13:23:40 -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
Areloch
6235f63deb Merge pull request #1395 from Azaezel/AssertDivNULL
credit to @MusicMonkey5555 for spotting. asserts for Div/NULLs
2016-01-16 17:53:00 -06:00
Areloch
32ec7f0ef6 Merge pull request #1474 from Azaezel/navMess
mDirtyTiles changed from std::queue to a vector
2016-01-16 17:21:49 -06:00
Areloch
41038ec9ae Merge pull request #1502 from Lopuska/patch-1
Glow buffer graphic corruption fix on OpenGL.
2016-01-16 13:07:06 -06:00
Areloch
ff2df5c43f Merge pull request #1478 from Areloch/VolFog2
Volumetric Fog Take 2
2016-01-15 11:22:25 -06:00
Anis
cae97cac37 Glow buffer graphic corruption fix on OpenGL.
Caused by a wrong target size. (probably it was ok on the very old OpenGL 1.5 version)
Before fix, wrong behaviour:
http://goo.gl/dik7Ia
After fix, all right:
http://goo.gl/IsrckM
2016-01-14 23:51:35 +01:00
Areloch
45a19453ee Merge pull request #1469 from Areloch/recurseDumpDirectories_fix
Recurse dump directories fix
2016-01-08 00:20:04 -06:00
Areloch
c2da755dc2 Fix for the directory scan for modules so it doesn't trim off characters in the path.
Resubmitted to clear the excess history entries.
2016-01-08 00:19:11 -06:00
Areloch
c44d827c41 Merge pull request #1490 from rextimmy/drawRectFill_fix
Fix for OpenGL/D3D11 bottom border offset
2015-12-28 11:31:56 -06:00
rextimmy
e3b228db8b Fix for OpenGL/D3D11 bottom border offset 2015-12-28 09:17:14 +10:00
Areloch
24dc8e6990 Merge pull request #1473 from Tribes2-SCP/tinyXMLFix
Fix TinyXML Build errors
2015-12-21 01:10:15 -06:00
Areloch
d30529bbeb Merge pull request #1459 from Azaezel/dangedDecalDatablocks
corrects ghosted decal datablock lookup flaw
2015-12-20 02:17:56 -06:00
Areloch
10ee9c4e97 Merge pull request #1484 from Bloodknight/MinorHeaderPathFixes
Updated paths for collada tdictionary.h
2015-12-20 01:52:51 -06:00
Marc Chapman
ac7d6e6691 Updated paths for collada tdictionary.h 2015-12-13 03:33:39 +00:00
Areloch
e94bdba318 Merge pull request #1480 from Ragora/fixEditorCrashes
Fix NULL pointer Crashes in WorldEditor::selectObject & unselectObject
2015-12-08 18:59:53 -06:00
Robert MacGregor
d6226a71ca Fix NULL pointer deref crashes in WorldEditor::selectObject & WorldEditor::unSelectObject 2015-12-02 01:47:29 -05:00
Areloch
21be97d206 Missed a few files. 2015-12-01 00:49:37 -06:00
Areloch
a90eb9762b Re-submission of the Volumetric Fog PR, with cleanup. 2015-12-01 00:10:13 -06:00
Azaezel
b0b39b5f83 mDirtyTiles changed from std::queue to a vector
allows us to leverage  .push_back_unique(&foo); and .clear();
2015-11-27 16:17:30 -06:00
Areloch
272e3138a0 Merge pull request #1470 from Azaezel/waterIsNotStatic
As I nor az have been able to find any issues with this so far, I'll push this through. We can handle any emergent problems as they come up, but so far it looks solid.
2015-11-26 12:37:20 -06:00
Robert MacGregor
d3c7edfe42 Fix TinyXML Build errors 2015-11-22 02:45:25 -05:00
Azaezel
b6bd8c863c removes StaticObjectType flag from water objects.
https://github.com/GarageGames/Torque3D/issues/1458
2015-11-20 10:52:57 -06:00
Areloch
703fff01fb Merge pull request #1460 from Azaezel/FileFallbackFoulups
fillin for fallbacks for filesystem funcs
2015-11-16 21:42:22 -06:00
Areloch
113bb6b62d Merge pull request #1463 from Azaezel/bulletBreak3
missed a convexSweepTest early-out check.
2015-11-14 16:12:57 -06:00
Areloch
00ca1e8692 Merge pull request #1464 from Azaezel/bulletModule
bullet module
2015-11-14 15:40:59 -06:00
Azaezel
b48802c6c4 bullet module
verified extract from https://github.com/GarageGames/Torque3D/pull/1146
2015-11-14 11:28:21 -06:00
Azaezel
74a194a277 missed a convexSweepTest early-out check. 2015-11-14 11:26:42 -06:00
Areloch
498ed63f0b Merge pull request #1438 from Azaezel/rektRadius
explosion cover miscalc
2015-11-14 00:43:49 -06:00
Areloch
dbe870f8e5 Merge pull request #1433 from Azaezel/CommandControl
The TypeCommand type brings up a full notepad-esque interface.
2015-11-13 00:31:22 -06:00
Areloch
1a009d6dd3 Merge pull request #1443 from Areloch/TAM_Implementation
TAML, Assets and Modules implementation
2015-11-12 23:54:27 -06:00
Areloch
92aa785bb2 Merge pull request #1442 from Azaezel/shadow_caching
This all seems to work pretty well.
2015-11-12 12:49:58 -06:00
Azaezel
f719731c52 fillin for fallbacks for filesystem funcs 2015-11-09 19:40:30 -06:00
Areloch
51b6469922 Merge pull request #1439 from Azaezel/initTextureSpace
ensures opengl texSpaceMat is initialized from the get-go
2015-11-09 10:55:10 -06:00
Areloch
9d726bb9ed Merge pull request #1453 from blackwc/playJournal-template-fix
playJournal fix and removed depcrecated command line options
2015-11-09 10:24:30 -06:00
Areloch
c2e5eb82af Merge pull request #1457 from Azaezel/meshRoadMats
hooks meshroads up to the material system for castrays
2015-11-09 10:01:37 -06:00
Azaezel
b1fccc848c corrects ghosted decal datablock lookup flaw 2015-11-07 09:04:47 -06:00
Azaezel
f4d40bf1b0 hooks meshroads up to the material system for castrays (at a minimum, sound playback) 2015-11-05 10:18:17 -06:00
Areloch
bc44aba31c Merge pull request #1428 from Azaezel/hashHorking
cuts the shadergen hashkey generator down from a 64 bit to a 32 bit key.
2015-11-05 00:12:03 -06:00
Azaezel
b778121fc4 castDynamicShadows defaults to false, flipped it over to true for materials on mobile/animated assets. 2015-11-02 23:06:51 -06:00
Azaezel
24f7dc8314 rtparams(#) needs to match the ssaomask register 2015-11-02 23:01:43 -06:00
Areloch
165cdb64e9 Merge pull request #1322 from Areloch/String_isEmpty_Convert
Replace uses of dStrIsEmpty with new String::isEmpty
2015-10-31 23:40:13 -05:00
Areloch
db7363df12 Merge pull request #947 from eightyeight/trigger-inheritance
Make Trigger friendlier towards inheritance
2015-10-29 22:06:59 -05:00
blackwc
ca37e9f84e fix playJournal instruction in comments 2015-10-28 22:52:16 -04:00
blackwc
bba604a043 playJournal fix and removed depcrecated command line options 2015-10-28 22:46:17 -04:00
Areloch
000649e840 Merge pull request #1452 from rextimmy/skybox_vertex_format_fix
Corrected SkyBox vertex format
2015-10-27 01:00:24 -05:00
Areloch
48d38ca803 Merge pull request #1447 from blackwc/radioButton-image-new
improved radio button
2015-10-27 00:26:21 -05:00