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

618 commits

Author SHA1 Message Date
Areloch
4378cb181d Merge pull request #1297 from jamesu/oculus_dk2 
Oculus VR DK2 Support
 2015-05-27 09:29:47 -05:00
Areloch
b30b5d9076 Merge pull request #1229 from Azaezel/guiShapeNameHud_filterFix 
stops names showing through statics
 2015-05-12 15:20:56 -05:00
Daniel Buckmaster
1cb5f0f160 Fixed constructor order in ShapeBase. 2015-05-09 23:06:30 +10:00
James Urquhart
12d435c341 Remove value constructors for ConsoleValueRef & fix callbacks which use them. Fixes issue #1289 2015-05-08 09:04:04 +10: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
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
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
62fa40380b Fixes for "incomplete type" errors when compiling with clang-cl 2015-03-04 19:10:56 -05:00
Daniel Buckmaster
84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11: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
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
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
Daniel Buckmaster
02c88201c6 Merge remote-tracking branch 'GuyAllard/aiPlayerTweaks' into development 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
	Engine/source/T3D/aiPlayer.h
 2015-02-22 21:51:56 +11:00
Ben Payne
0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
LuisAntonRebollo
2eca491961 Fix Bullet compilation. 2015-02-15 12:33:00 +01:00
James Urquhart
f44a3f27d6 Fix stack balancing problems by refactoring execution calls 
- Con::executef now uses a template
- All public execution functions now restore the console stack upon return
- Fixed bad parameters on some callbacks
- Reverts get*Arg behavior
 2015-02-08 00:08:18 +00:00
LuisAntonRebollo
57698599e0 Add missing <cfloat> and <limits> 2015-02-07 20:30:07 +01:00
Ben Payne
c19a70814c Tidy up and fix the various Assert macros 
Rephrase the macros so that they can be used in expressions, and
properly require semicolons. And add the semicolons where missing.
 2015-02-02 18:37:48 -05:00
Daniel Buckmaster
bd437cda1c Merge branch 'development' into walkabout 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
 2015-01-29 21:38:20 +11:00
Daniel Buckmaster
014b566014 Merge remote-tracking branch 'gg/development-3.6' into development 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
 2015-01-29 21:17:38 +11:00
Luis Anton Rebollo
6492028bb2 Merge pull request #1035 from bpay/memfixes 
Memfixes
 2015-01-25 13:42:32 +01:00
Luis Anton Rebollo
ea0e3fd683 Merge pull request #1096 from bpay/fix-include-guards 
Fix include guards
 2015-01-24 23:02:13 +01:00
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo
3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
Ben Payne
3574ef838b Fix erroneous include guards 2015-01-06 00:42:09 -05:00
Daniel Buckmaster
7ab6731f51 Merge branch 'development' into walkabout 
Conflicts:
	Templates/Empty/game/tools/worldEditor/scripts/editors/creator.ed.cs
	Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
 2015-01-02 14:45:20 +11:00
Daniel Buckmaster
e9308e40ed Merge pull request #998 from rextimmy/physx3_cpu_dispatcher_fix 
Fixed issue where physx3 cpu dispatcher was created multiple times
 2014-12-29 14:14:05 +11:00
Daniel Buckmaster
ae284a89ec Merge branch 'development' into defineconsolemethod 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
 2014-12-26 13:22:16 +11:00
Daniel Buckmaster
3ab048c5b0 Fixes after feedback from Luis. 
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
 2014-12-23 18:48:02 +11:00
Azaezel
ee808bb848 Merge branch 'AFXFIX7_PlayerDivNULL' into Jeff_Faust_Fixes 2014-12-22 18:10:37 -06:00
Azaezel
5900fa0dde Merge branch 'AFXFIX6_ParticleOrientation' into Jeff_Faust_Fixes 2014-12-22 18:10:21 -06:00
Azaezel
dbd8c6b37b Player Networking DIVNULL error correction 
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // avoids a divide-by-zero when maxEnergy is set to zero.
 2014-12-22 18:08:05 -06:00
Azaezel
8c979a6d7b Oriented Particles UV Correction 
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // this fix re-orders the UV coords to produce a consistent orientation
   // with oriented particles in TGE.
 2014-12-22 18:05:43 -06:00
Azaezel
c76b44bb91 Ref Count Catch 
With Permission from Jeff Faust.

         // AFX CODE BLOCK (bug-fix) <<
(no text, self evident)
 2014-12-22 18:03:52 -06:00
Daniel Buckmaster
84430a46a8 Merge pull request #1046 from Areloch/Issue_945 
Fixes #945
 2014-12-22 14:53:27 +11:00
Azaezel
c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
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
8a104a5222 Merge pull request #1018 from eightyeight/ghost-scoping 
Add the option to limit ghost scoping range
 2014-12-21 19:03:02 +11:00
LuisAntonRebollo
e5cd80ac87 Merge pull request #1024 from eightyeight/scattersky-flare-fix 
Fix ScatterSky flare occlusion
 2014-12-19 13:35:48 +01:00
Azaezel
98048fd974 Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles 
Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
 2014-12-16 18:48:28 -06: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
Areloch
fd186204a2 Fizes #945 2014-12-13 03:11:11 -06:00
LuisAntonRebollo
fe9c30b5bb Lowercase TSStatic fied names. 2014-12-12 22:41:08 +01:00
LuisAntonRebollo
8f4c0ed95d Fix spaces in TSStatic fied names. 2014-12-12 22:36:08 +01:00
Daniel Buckmaster
9fca02b2f8 Merge pull request #1017 from eightyeight/aiplayer-triggers-fix 
AIPlayer trigger fix
 2014-12-12 21:45:57 +11:00
Ben Payne
c50c88d071 Fix use-after-delete errors 2014-12-11 19:09:01 -05:00
Ben Payne
d97d44f66f Fix more misc uninitialized vars 2014-12-11 18:25:29 -05:00