Commit graph

57 commits

Author SHA1 Message Date
Areloch
36db8eacc3
Merge pull request #2236 from Azaezel/memberMess
cleans up all 'hides' warnings (at time of writing)
2018-05-30 20:36:43 -05:00
Azaezel
99aa6263e6 layer, and playerControllerComponent shadowvar cleanups 2018-03-14 13:12:26 -05:00
Azaezel
0079899281 new method: TSShapeInstance::resetMaterialList(). Sets all object-instance mapto values back to initial state. reskin now does so to avoid having to track origional values independently. (so say, if you've already got skin1 plugged in to one, and nothing in to another, no need to set skin1=skin2 on the first and skin2 or base=skin2 on the second to swap both on over to skin2).
also by request, went ahead and killed case sensitivity for mapto string replacement when reskinning.
2017-11-12 23:58:34 -06:00
Marc Chapman
31f1d27a49 player-look -- modified player head and arm control
player-movement -- mods allowing manipulation of player movement.
player-puppet -- mods allowing manipulation of player via contraints.
foot-switch -- mods for overriding built-in footstep sounds, decals, and dust.
2017-07-27 01:48:16 +01:00
Marc Chapman
9682ba318b triggers -- exposes trigger states to other code. 2017-07-27 01:34:44 +01:00
Marc Chapman
4b90b21d7d anim-clip -- sequence selection by afx effects 2017-07-27 00:31:43 +01:00
Marc Chapman
442b200ef6 obj-select -- object selection functionality
is-camera -- Adds a test for determining if object is a camera.
cam-speed -- added method for getting the camera movement speed.
zoned-in -- connection is flagged as "zoned-in" when client is fully connected and user can interact with it.
2017-07-26 23:59:44 +01:00
Marc Chapman
01340843b2 core -- heartbeat call to arcaneFX::advanceTime() from within clientProcess().
misc  -- various other function references
2017-07-26 20:01:44 +01:00
Areloch
0801a3cca8 Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Thomas "elfprince13" Dickerson
27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Azaezel
dd071484da Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe
Conflicts:
	Engine/source/T3D/staticShape.cpp
2016-12-20 22:50:28 -06:00
Areloch
e8aff85322 Merge pull request #1808 from Azaezel/consistentCallbacks1
clang: consistent callbacks
2016-10-24 01:25:09 -05:00
Anis
60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Azaezel
5e1b6cbc48 clang: trailing else 2016-10-18 08:58:15 -05:00
Azaezel
5f5466d90d clang: consistent callbacks 2016-10-16 16:54:11 -05:00
Azaezel
1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel
c57b1a8b70 clang reports: unclear || + && and &+| mixes. 2016-10-14 17:26:13 -05:00
James Urquhart
212ac36cc1 Tidy up indentation in openvr changes 2016-09-11 22:51:00 +01:00
James Urquhart
e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +01:00
James Urquhart
ba91478fad Baseline working openvr code 2016-09-11 22:42:42 +01:00
Duion
0336a681ab fixes footsteps missing when no impactSoundId
fix  for this issue https://github.com/GarageGames/Torque3D/issues/1709
2016-07-31 20:15:46 +02:00
OTHGMars
037ee82982 Player Mounting
Removes the z axis rotation for consistency with other mounted object types.
2016-06-17 10:36:35 -05: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 A. Hireche
f701228a37 Steve Acaster's Ai Poses 2016-02-26 15:53:20 +01: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
c60be9a17e suggested revisions 2016-01-13 15:08:21 -06:00
Azaezel
62506214d0 footstep and impact enum extension support
Removes hardcoded case statements in favor of an offset-driven approach.
2016-01-11 22:23:13 -06:00
Areloch
11398bb04e Issue found with PVS-Studio:
A lot of instances where some function args are not actually modified in any way, meaning that it is better for performance to convert them into const references. This prevents an additional copy, which can help performance.
2015-07-16 22:02:18 -05: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
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
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
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
Daniel Buckmaster
a87a891cfc Prevent crash when loading Player with no shape. 2014-10-31 10:04:32 +11:00
Daniel Buckmaster
fd3d44c755 Removed annoying warning. 2014-09-15 07:30:51 +10:00
Daniel Buckmaster
3f687d8f43 Make use of PlayerData::swimForce 2014-07-01 18:14:08 +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
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
a7756b5591 Renamed local variable so it doesn't interfere with the provided argument.
String errorStr should be filled in only when ::preload returns false.
2014-05-06 15:35:52 +04:00
bank
9f2d44966e Fix: Some compilers do not auto-cast String and Path classes to (char *). 2014-05-06 12:40:43 +04:00
bank
b2e6895554 Fix: preload() method on datablocks should always set errorStr when returning false.
Otherwise it will dump the previous error message (content of the errorStr).
2014-05-06 12:40:40 +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
DavidWyand-GG
710d616d0f Revert Player Buoyancy Change
This reverts the change made by
https://github.com/GarageGames/Torque3D/pull/490  It actually goes
further and comments out the Player's buoyancy calculation rather than
just the change in velocity.
2013-11-05 14:49:47 -05:00
SilentMike
0e1ed4683b Merge pull request #490 from Azaezel/buoyancy
Buoyancy
2013-10-27 13:48:09 -07:00
SilentMike
5ca66697b1 Merge pull request #427 from eightyeight/arm-range-fix
Arm range fix
2013-10-21 10:19:51 -07:00
Azaezel
6879f1b328 re-enables boyancy as per: http://www.garagegames.com/community/blogs/view/22403#comments 2013-10-03 04:35:42 -05:00
cpusci
4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Daniel Buckmaster
284d96e510 Fixed air acceleration going wild. 2013-07-03 19:07:35 +10:00