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

1047 commits

Author SHA1 Message Date
RichardRanft
3ddd9b8a4c Add static String::isEmpty(const char*) method and use it to verify path for Forest::saveDataFile() is not empty. 2015-05-06 15:39:02 -07:00
James Urquhart
3a457749ec Oculus VR DK2 Support 
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
 2015-05-06 23:09:51 +01:00
Areloch
b3170bcddf Merge pull request #1286 from Azaezel/NoMRBit 
crash out on net stream leaks.
 2015-04-28 00:38:33 -05:00
Areloch
2f69ffd2d4 Fixes issue #1277 
Adds the file path to the saveDataFile call (missionpath\missionname.forest as the format)

This correctly utilizes the forest object's datafile field if it's set.
If not, it will create a new forest item with the missionPath\missionName.forest convention.

This also removes the checks for the hardcoded "theForest" forest object name, so that if it is renamed for some reason, it doesn't break.

Lastly, this corrects a minor semi-related bug, where if you are in the forest editor and have a brush selected, and then click to paint, but no forest object currently exists, it prompts to create one. Once the forest object is created, it would trigger the editor to inspect the newly made forest object. If you attempted to paint the currently selected brush, there was a mis-match in the inspector information, and it would trigger a crash.

This has been corrected by re-initializing the forest editor's selected tool mode so it can be utilized immediately after the forest object is created.
 2015-04-27 21:45:57 +10:00
Daniel Buckmaster
2fbf6bdb9d Removed a space. 2015-04-27 21:30:09 +10:00
Daniel Buckmaster
98fa3d02df Merge remote-tracking branch 'Azaezel/decal_rot_mangle' into development 2015-04-27 21:28:42 +10:00
Azaezel
6201e48501 crash out on net stream leaks. 
causes a fatal assertion when bitstream is passed an int value it cannot transmit given the provided bit length, and reports what the value and count were, respectively
 2015-04-26 20:25:40 -05:00
Azaezel
f8d41a2b96 Merge pull request #1283 from Azaezel/randiiiiiii 
corrects getrandom to behave as documented.
 2015-04-26 11:27:03 +10:00
Areloch
6e681dd82f Merge pull request #1239 from bpay/asan-fixes 
Fix errors flagged by address sanitizer
 2015-04-16 21:12:21 -05:00
Azaezel
1ce643cbc8 fix for https://github.com/GarageGames/Torque3D/issues/1262 passes along mAppliedForce found 74a05854d5/Engine/source/T3D/shapeBase.cpp (L1600) like the rest of the classes. mGravityMod left as an exercise to someoone actually working on a vehicle game at present. 2015-03-24 22:59:56 -05:00
Ben Payne
fbcc79dcd0 Don't call strlen on data that might not be null-terminated 2015-03-17 11:31:18 -04:00
Luis Anton Rebollo
68efa70d9c Merge pull request #1245 from BeamNG/fix_glsl_include 
Fix GLSL include when file is empty.
 2015-03-14 13:31:10 +01:00
LuisAntonRebollo
17f08e9f86 Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode. 2015-03-14 13:01:05 +01:00
Azaezel
6fa44a4e92 further insurance that shadow split stay within bounds. 2015-03-10 06:03:40 -05:00
Ben Payne
29934cdc27 Fix comment 2015-03-08 20:12:14 -04:00
LuisAntonRebollo
e6b7cf108b Fix GLSL include when file is empty. 2015-03-08 23:25:23 +01:00
Luis Anton Rebollo
825912e800 Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations 
DeferredBumpFeat order of operations corrections
 2015-03-08 22:49:27 +01:00
LuisAntonRebollo
ae3128b28b DeferredBumpFeat order of operations corrections. Clean. 2015-03-08 22:30:03 +01:00
Luis Anton Rebollo
7e7025d1ca Merge pull request #1238 from Azaezel/defaultNormal 
https://github.com/GarageGames/Torque3D/issues/770 resolution
 2015-03-08 22:12:24 +01:00
LuisAntonRebollo
1067da284f Add error msg to Shadergen when GBufferConditioner?LSL::processVert don't have normals defined. 2015-03-08 22:10:22 +01:00
Ben Payne
16af2a126e Add a comment 2015-03-06 15:36:22 -05:00
Ben Payne
27c9e79906 Inline asm is not yet supported by clang 2015-03-05 14:57:58 -05:00
Ben Payne
608a43ba2a Don't define String operator bool when compiling w/ clang on windows 
Fixes compile errors building with clang-cl, which doesn't define __GNUC__
in MS compatibility mode.
 2015-03-04 19:25:12 -05:00
Ben Payne
7f1f6a5e8b Fix for link error when building with clang-cl 2015-03-04 19:25:11 -05:00
Ben Payne
4386ababbe Character type fixes for building with clang-cl 2015-03-04 19:25:10 -05:00
Ben Payne
01471c9ef3 Fix member function visibility 2015-03-04 19:25:10 -05:00
Ben Payne
da4078c707 Fix passing of non-primitive types to varargs functions 2015-03-04 19:25:09 -05:00
Ben Payne
7d809a0d28 Fix ill-formed sizeof's 2015-03-04 19:25:08 -05:00
Ben Payne
27e6649413 Fix ill-formed #else 2015-03-04 19:24:55 -05:00
Ben Payne
bd49fe3cb0 Don't call strncpy when src == dest 
This fixes an error flagged by address sanitizer
 2015-03-04 19:13:53 -05:00
Ben Payne
eabff49a6a Fix buffer underrun found with address sanitizer 
When subpath is the empty string, the code was reading from subPath[-1]
 2015-03-04 19:13:49 -05:00
Ben Payne
62fa40380b Fixes for "incomplete type" errors when compiling with clang-cl 2015-03-04 19:10:56 -05:00
Ben Payne
6040a8d855 Fix macro token pasting errors when compiling with clang-cl 2015-03-04 19:10:53 -05:00
Azaezel
bc32da74ca https://github.com/GarageGames/Torque3D/issues/770 resolution suggested by @LuisAntonRebollo 2015-03-03 23:10:47 -06:00
Daniel Buckmaster
84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Azaezel
c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06:00
Daniel Buckmaster
33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
 2015-03-01 22:30:22 +11:00
Daniel Buckmaster
baf594aee7 Merge pull request #1006 from BeamNG/fix_lighting_with_zero_lights 
Fix lighting errors when all lights are disabled.
 2015-03-01 21:06:34 +11:00
Daniel Buckmaster
57eed9c8e4 Amend console stack fixes to work with gcc in Ubuntu x64. 2015-03-01 20:34:16 +11:00
Daniel Buckmaster
6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development 
Conflicts:
	Engine/source/console/console.cpp
 2015-03-01 20:33:29 +11:00
Daniel Buckmaster
497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning 
Fix some issues flagged by cppcheck
 2015-03-01 18:27:40 +11:00
Daniel Buckmaster
5118d4bc63 Merge pull request #1230 from Azaezel/notSoShocking 
removal of  un-implemented ShockwaveData entries from explosion.
 2015-03-01 18:27:21 +11:00
Nathan Bowhay
bc31d79da1 Changed type to NetSocket 
Changed some S32 types to use the typedef NetSocket since they are a
socket.
 2015-03-01 17:20:48 +11:00
Daniel Buckmaster
6822a78fcf Merge pull request #1067 from Lopuska/patch-13 
bugfix #1066
 2015-03-01 14:17:59 +11:00
Daniel Buckmaster
4aeaad91e7 Merge pull request #1218 from eightyeight/revert-1036 
Revert "PR for issue #748"
 2015-03-01 14:14:00 +11:00
Daniel Buckmaster
18cc91000e Merge pull request #1220 from eightyeight/fix-#396 
Fix #396
 2015-03-01 14:13:50 +11:00
Azaezel
0c10ba6833 removal of un-implemented ShockwaveData entries from explosion. 2015-02-27 20:24:47 -06:00
Azaezel
9f15b740ea stops names showing through statics 2015-02-27 20:14:57 -06:00
Azaezel
54e1cceda9 Con::executef trampoline had mismatched argc values for the high end 2015-02-26 14:28:21 -06:00
Dennis Brakhane
6d5571e233 Fix preprocessor directive 2015-02-25 21:12:01 +01:00