Commit graph

115 commits

Author SHA1 Message Date
Daniel Buckmaster
9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11: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
Ben Payne
c50c88d071 Fix use-after-delete errors 2014-12-11 19:09:01 -05:00
LuisAntonRebollo
d97bccb798 Fix AMD render problem with missed meshes. 2014-12-09 17:34:16 -05:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee
9907c4592e Fixed bad string compares and simdictionary 2014-11-04 19:51:13 -05:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster
d12310602d Increment vertex pointer by 3, not 1. 2014-11-02 07:35:39 +11:00
Daniel Buckmaster
b507dc9555 Merge branch 'master' into console-func-refactor
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
2014-10-14 15:09:11 +11:00
LuisAntonRebollo
42386b3f6f Merge pull request #795 from BeamNG/T3D_x64
Support for Windows x64 builds
2014-10-02 01:31:07 +02:00
LuisAntonRebollo
fcf7bee64a Fix x64 problems for WIN64. 2014-09-14 21:42:51 +02:00
rextimmy
1829deb432 - Added check in tsMesh::createTangents to check size of incoming normals 2014-08-27 11:55:59 +10:00
Daniel Buckmaster
cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat
Support for large lists of shape formats.
2014-07-08 14:14:54 +02:00
bank
f3fc84738b Use fixed buffer size var when allocating return buffer from console.
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
Thomas Fischer
cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Andrew Mac
eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
bank
bcb0b8e088 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSThread 2014-05-13 16:44:16 +04:00
bank
a310983e49 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSSortedMesh 2014-05-13 16:33:37 +04:00
bank
75755e42c0 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSStaticPolysoupConvex 2014-05-13 16:15:36 +04:00
bank
69dbaf5b85 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape 2014-05-13 14:08:42 +04:00
bank
2112c81446 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSSkinMesh 2014-05-13 12:45:42 +04:00
bank
e2545c359c Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSMesh 2014-05-13 12:43:01 +04:00
bank
1778a8d7f2 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShapeLoader 2014-05-13 12:15:47 +04:00
bank
9aeb4389f3 Rename all member variables to follow the style guidelines (prefixed with the 'm') - ColladaExtensions 2014-05-13 11:40:56 +04:00
bank
733347fd61 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct ImportOptions (ColladaUtils) 2014-05-12 19:23:25 +04:00
bank
40037b8b51 Rename all member variables to follow the style guidelines (prefixed with the 'm') - ColladaUtils (struct AnimChannels, struct AnimData, struct AnimatedElement) 2014-05-12 19:11:45 +04:00
bank
9ccf5baf94 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class ColladaPrimitive 2014-05-12 19:03:16 +04:00
bank
1619e194e1 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class _SourceReader (ColladaUtils) 2014-05-12 18:58:38 +04:00
bank
a53580ca60 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class MeshStreams 2014-05-12 18:41:30 +04:00
bank
7c1544317b Rename all member variables to follow the style guidelines (prefixed with the 'm') - class ColladaAppMesh 2014-05-12 18:37:22 +04:00
bank
9e3eab7551 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct VertTuple (used in class ColladaAppMesh) 2014-05-12 18:32:39 +04:00
bank
aefa796056 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class AppMesh 2014-05-12 18:20:59 +04:00
bank
6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
bank
b0fcc91058 Fix: removed 'virtual' for classes which doesn't have child. 2014-05-06 12:40:47 +04:00
bank
e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +04:00
Daniel Buckmaster
87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
Thomas Fischer
7239c791f2 Merge pull request #581 from tdev/vs2012_fixes
Visual Studio 2012 32Bit Level 4 Warning fixes
2014-03-17 10:02:19 +01:00
Thomas Fischer
fec4cc8acd Merge pull request #538 from Azaezel/Tangent_Basis_Floor
Tangent Basis Cleanup
2014-03-17 00:12:03 +01:00
Thomas Fischer
489106ae5e replaced UNUSED and assert combination by a fixed up assert macro - thanks luis! :) 2014-03-15 12:50:38 +01:00
Thomas Fischer
2844ab6912 more VS2012 L4 warning fixes 2014-03-15 11:51:36 +01:00
Andrey Syrokomsky
939061ef59 Fixed issue #256: "$pref::TS::smallestVisiblePixelSize doesn't work". 2014-01-21 18:45:02 +02:00
Azaezel
ecbcf5eb3a Simply early-outing from denominators near zero was causing tangeants to be filled with garbage data. This alters the functionality to set a floor distance so the rest get's filled out properly. 2013-11-13 20:40:20 -06:00
DavidWyand-GG
7e4cbc56f5 Fix for DTS Vertex Paint and 2nd UV with LODs
Fix game from https://github.com/GarageGames/Torque3D/issues/230
2013-11-05 16:50:25 -05:00
DavidWyand-GG
1923838f63 Fix TSMesh::castRay() and small collision mesh
This is the fix outlined in
https://github.com/GarageGames/Torque3D/issues/485
2013-11-05 15:40:48 -05:00
DavidWyand-GG
f10a860bba Changes for MaskNodeHandsOff
This is a rework of the Pull Request
https://github.com/GarageGames/Torque3D/pull/453 based on my own
understanding of the issue.  The details may be found in the description
of the original Pull Request.
2013-10-22 18:18:02 -04:00
cpusci
7a8f46b19f Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx 2013-08-04 16:58:59 -05:00
cpusci
4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Thomas Fischer
53abbe066d added checks for valid pointers after locking 2013-06-30 17:51:38 +02:00
DavidWyand-GG
e4df92a7bc Theora texture for cloned material fix
When a TSShapeInstance makes a copy of its own materials through
cloneMaterialList() (such as done with client side ShapeBase objects),
the reference to a named diffuse render target was being lost.  This
affected using a TheoraTextureObject on a ShapeBase derived object
(StaticShape, etc.).
2013-05-13 16:49:12 -04:00
DavidWyand-GG
30144a9f98 TheoraTextureObject
Places a theora video onto a named texture surface that may be used by
any material.  Allows for the video to play, pause, stop, loop, and for
the source video to be changed at any time.

Based on this resource:
http://www.garagegames.com/community/resources/view/21019
2013-04-23 11:24:05 -04:00