Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-26 08:18:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34462 commits 25 branches 0 tags 1.1 GiB
Commit graph

13746 commits

Author SHA1 Message Date
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
Howard Stearns
2e05ede524 Merge pull request #5920 from hyperlogic/tony/oculus-judder-fix 
Fix for Oculus timewarp judder introduced by 20d784ba39
 2015-09-28 15:57:47 -07:00
Anthony J. Thibault
c51ce79205 Updated comment on MyAvatar::updateFromHMDSensorMatrix() 2015-09-28 15:30:21 -07:00
Seth Alves
4179e4aa74 merge from upstream 2015-09-28 15:28:10 -07:00
Ryan Huffman
1a9cd59339 Fix ClipboardScriptingInterface to call methods on main app thread 2015-09-28 15:05:48 -07:00
Ryan Huffman
dde1c8b42f Fix use of EntityTree in import/export operations 
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
 2015-09-28 15:05:48 -07:00
Anthony J. Thibault
e32eb38c3b Fix for Oculus timewarp judder introduced by 20d784ba39 
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().

We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
 2015-09-28 14:38:03 -07:00
Howard Stearns
e6b9cbacf7 Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements 
Fix for Head when switching between HMD and Desktop mode
 2015-09-28 14:13:03 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Anthony J. Thibault
5a24a020ca Fix for HMD rotation sticking between 2d & HMD mode 
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
 2015-09-27 17:44:54 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Thijs Wenker
14fc39ffa3 Added JS access to the variables 
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
 2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Andrew Meadows
4f0bd08b62 Merge pull request #5900 from ZappoMan/batchOptimizations 
more work on batch optimzation
 2015-09-25 09:00:38 -07:00
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Howard Stearns
266c69fc70 Disable the old-school Rig::inverseKinematics during reset. 2015-09-24 15:33:52 -07:00
Howard Stearns
426ccabba7 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-24 14:19:58 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
2eaeb26b2a fix GetVersionEx warning 2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
5e82b9c433 more warning fixes 2015-09-24 08:26:56 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Anthony J. Thibault
6b47373bcb Fix for precision error in AnimPose(glm::mat4) constructor. 
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
 2015-09-23 15:38:56 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Anthony J. Thibault
0d7eae2d64 Fix slight translation error when rendering debug animation skeleton. 2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a9848cd157 Merge branch 'master' into tony/lean-threshold 2015-09-23 10:54:12 -07:00
Howard Stearns
401f83135a Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-23 09:15:21 -07:00
Brad Hefta-Gaub
ec9bf0791b Merge pull request #5875 from ctrlaltdavid/20689 
Don't run Script Editor scripts from the cache
 2015-09-23 08:52:30 -07:00
Brad Hefta-Gaub
8d8035a418 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning 
Conflicts:
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/Model.h
 2015-09-22 20:54:25 -07:00
Anthony J. Thibault
9ce43a57f1 Better head IK when in an HMD. 
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
 2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b Added shared DebugDraw singleton. 2015-09-22 19:57:23 -07:00
Howard Stearns
a9460b9b41 Merge pull request #5881 from AndrewMeadows/ik-repairs-004 
remove underpose attenuation from IK relaxation step
 2015-09-22 19:45:40 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Andrew Meadows
2edffaf91a remove unused variables 2015-09-22 17:20:13 -07:00
David Rowe
eda12fd3af Don't look straight ahead in fullscreen mirror 2015-09-22 16:15:54 -07:00
Howard Stearns
7bd395a4d4 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-22 15:06:43 -07:00
Brad Hefta-Gaub
5bcce50b98 Merge pull request #5846 from bob-long/master 
Display the face blend coefficients and update the value in real time.
 2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2 Merge pull request #5825 from thoys/20655 
CR for Job #20655 - Add ability to close one script from another script
 2015-09-22 14:52:39 -07:00
David Rowe
fed5e8e573 Don't run Script Editor scripts from the cache 2015-09-22 11:35:34 -07:00
Howard Stearns
c8960e23ec Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-22 10:55:26 -07:00
Andrew Meadows
7060befd1c Merge pull request #5862 from howard-stearns/user-specified-animation-graph 
user-specified animation graph
 2015-09-22 10:48:28 -07:00
Philip Rosedale
c09ac51d75 Merge pull request #5871 from ctrlaltdavid/20688 
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
 2015-09-22 10:17:28 -07:00
Thijs Wenker
f38bb77d0a less calls to QHash 2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7 - added MyAvatar.audioListenerModeChanged signal , for registering changes. 
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
 2015-09-22 15:38:53 +02:00
Thijs Wenker
617f048883 Added JS interface to change audio listening position / orientation in Interface 
- MyAvatar.audioListenerMode  change using:   MyAvatar.FROM_HEAD    , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition   and  MyAvatar.customListenOrientation are for manual listening positions
 2015-09-22 13:40:33 +02:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621 Code tidying 2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098 Fix HMD 3rd person view 2015-09-21 21:08:13 -07:00
Howard Stearns
71b7f9ee38 Apostrophe key resets animation state. 2015-09-21 19:14:24 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Davis
7b5cbbf758 Merge pull request #5868 from ctrlaltdavid/20687 
Fix HMD fullscreen mirror view
 2015-09-21 17:07:31 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4 Forgot to actually persist. 2015-09-21 15:06:11 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
43d96afc89 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-21 13:23:54 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Howard Stearns
237628e4cd Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph 2015-09-21 11:24:25 -07:00
Howard Stearns
8b701b8a5b Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec. 
Takes effect when you save (if you have enabled the anim graph under developer->avatar).
An empty string gives you the default behavior.
 2015-09-21 10:26:04 -07:00
Stephen Birarda
5ebc8d6036 fix for file upload to ATP on Windows 2015-09-21 10:24:11 -07:00
samcake
d6d95ff86b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-20 14:33:23 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -07:00
samcake
8941741508 Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap 2015-09-18 18:47:18 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
Seth Alves
da74d4b1e1 Merge pull request #5830 from ZappoMan/entityScriptsReload 
add reload all support for entity scripts
 2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Anthony J. Thibault
5aeebba90e Renamed AnimController to AnimManipulator, Removed offsets on IK targets 2015-09-16 15:49:47 -07:00
Sam Gateau
d45547aa1a Merge and update 2015-09-16 13:46:07 -07:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
BOB LONG
efc321bc10 Display face blend coefficients 
Display the face blend coefficients and update the value in real time.
 2015-09-16 00:40:26 -07:00
Anthony J. Thibault
70f5835278 Updated left hand point and grab State Machine and animations 2015-09-15 18:00:13 -07:00
Thijs Wenker
9992f4b5c5 Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: 
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
 2015-09-16 01:16:58 +02:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines 
Added point and grab support to the AnimGraph
 2015-09-15 15:47:19 -07:00
Anthony J. Thibault
f13c839f4a Removed comment 2015-09-15 15:19:11 -07:00
Anthony J. Thibault
1948829ca8 Improved state machine for right hand. 
The hand state machine has the following features

* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.

Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
 2015-09-15 15:09:08 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Anthony J. Thibault
90f46ba2c8 Added hand state machines to AnimGraph. 
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
  the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
 2015-09-14 18:54:12 -07:00
Brad Davis
d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix 
Hifi 3 d connexion cmake fix
 2015-09-14 18:53:39 -07:00
MarcelEdward
64a8f7ebb4 Update 3DConnexionClient.h 2015-09-15 00:30:11 +02:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Ryan Huffman
71456eee5e Add UploadDialog error for NetworkError 2015-09-14 11:19:47 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
414d9162ef change type of MAX_LOG_SIZE rather than cast its only use 2015-09-14 08:47:14 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer 
Fixing some entity race condition crashes
 2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747 Merge pull request #5786 from AndrewMeadows/ik-with-constraints 
inverse kinematics works with rotation constraints
 2015-09-11 17:34:50 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings 
Rationalize rig settings
 2015-09-11 16:56:44 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Andrew Meadows
e85cdad8c7 remove DependencyManager fetch of backpointer 2015-09-11 16:27:50 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Andrew Meadows
c589f0e58e fix logic around rendering of hand targets 2015-09-11 13:42:17 -07:00
Andrew Meadows
ebadebbc87 render wireframe sphere for debug finger tip 2015-09-11 13:22:11 -07:00
Andrew Meadows
5296ddade9 remove unused menu item 2015-09-11 13:22:11 -07:00
Andrew Meadows
8d5106b072 improved debug render of hand coordinates 
also cleaned up includes in Hand.h
 2015-09-11 13:22:11 -07:00
Howard Stearns
f8f2a067a1 whitespace 2015-09-11 12:59:07 -07:00
Sam Gateau
5cc5609e87 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 12:05:02 -07:00
Howard Stearns
02fba12a48 Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d Fixing bad merge 2015-09-11 11:40:57 -07:00
Brad Davis
244795b629 Merge branch 'homer' into temp 
Conflicts:
	interface/src/Application.cpp
 2015-09-11 11:21:29 -07:00
Seth Alves
218225e4a5 Merge pull request #5781 from hyperlogic/tony/head-ik 
Added head target to AnimGraph IK node.
 2015-09-11 10:58:53 -07:00
Sam Gateau
c9ec65fd65 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 09:51:43 -07:00
Anthony J. Thibault
7996a02bd8 Added head target to AnimGraph IK node. 
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
  default to the underlying pose position.
 2015-09-11 09:48:48 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol 
Asset server node JSON stats
 2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745 Remove accidentally added header 2015-09-11 14:21:55 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1 Can't promote readlock to writelock 2015-09-10 22:52:40 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d Fixing some entity race condition crashes 2015-09-10 20:43:41 -07:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Howard Stearns
0870c5ed87 Merge pull request #5768 from hyperlogic/tony/ik-and-controllers 
AnimInverseKinematics and AnimController node
 2015-09-10 15:38:53 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Anthony J. Thibault
68076ccf45 updated anim graph url to use ik-avatar.json 2015-09-10 10:57:30 -07:00
Andrew Meadows
35b894872d Merge pull request #5753 from ctrlaltdavid/20671 
Terminate DDE earlier during shut-down and always at start-up
 2015-09-10 07:46:53 -07:00
David Rowe
fdcfa9657c Rework and clarify stopping an existing DDE process 2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a Merge pull request #5755 from jherico/lisa 
Fix possible hang when switching out of Oculus mode
 2015-09-09 19:24:00 -07:00
Howard Stearns
da6444a776 Start anim graph in the right saved state on startup. 2015-09-09 17:02:55 -07:00
Howard Stearns
bcf16e52af Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup 2015-09-09 16:04:15 -07:00
Howard Stearns
5e8fe29674 Remove unused declaration. 2015-09-09 15:09:06 -07:00
Howard Stearns
c1d68e058e Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does). 2015-09-09 15:02:11 -07:00
Brad Davis
382de2b4aa Fix possible hang when switching out of Oculus mode 2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2 Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. 2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Howard Stearns
3f5744712f Remove optional "parent" argument. 
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
 and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
 2015-09-09 11:04:17 -07:00
Howard Stearns
5572840133 Convert isHMD reference. 2015-09-09 10:39:36 -07:00
Howard Stearns
73a5714d66 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-09 10:37:11 -07:00
Howard Stearns
f081631075 Explicit cast. 2015-09-09 10:36:52 -07:00
Howard Stearns
24f1387579 Consistently use brace initialization in class headers. 2015-09-09 10:34:08 -07:00
Howard Stearns
f818ac2b74 Merge pull request #5744 from hyperlogic/tony/enable-lean-flag 
Added a flag to enable and disable lean.
 2015-09-09 10:18:12 -07:00
Howard Stearns
74c92af8e0 Merge pull request #5741 from AndrewMeadows/brokenCapsules 
fix for bad bounding capsules for avatars
 2015-09-09 09:33:57 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Andrew Meadows
614c0be59a HACK so legless avatars don't drag their knuckles 2015-09-08 17:09:37 -07:00
Seth Alves
e06461ea15 Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements 
AnimDebugDraw Improvements
 2015-09-08 17:07:51 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Anthony J. Thibault
387d50c217 Added a flag to enable and disable lean. 
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
 2015-09-08 16:35:06 -07:00
Howard Stearns
2c856e4b08 Work around animation cache misbehavior wrt threads. 2015-09-08 16:22:06 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! 
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
 2015-09-08 14:49:58 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305 Checkpoint smoother. 2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -07:00
James B. Pollack
670c5ee484 Merge pull request #5723 from jherico/lisa 
Toggle mute while holding the hydras
 2015-09-06 21:45:47 -07:00
David Rowe
6923e3ce70 Fix logging of intentionally crashing Interface 2015-09-06 16:28:55 -07:00
Anthony Thibault
083c5b6738 Merge pull request #5721 from howard-stearns/default-avatar-for-animations 
avatar animation defaults
 2015-09-04 17:06:53 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Anthony J. Thibault
69e463bbfd AnimDebugDraw Improvements 
* Now always works, regardless of whether or not Rig or AnimGraph animations
  are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
 2015-09-04 16:01:05 -07:00
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium 
fix collision shape of avatars
 2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2 Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound 
Change default avatar collision sound
 2015-09-04 08:48:30 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Howard Stearns
41daea7d92 Merge pull request #5710 from sethalves/fix-stuck-avatars 
Fix stuck avatars
 2015-09-03 16:26:07 -07:00
Anthony J. Thibault
85cb503152 Made Enable Anim Graph menu option dynamic. 
It will load the anim graph when enabled and destroy
the anim graph when disabled.
 2015-09-03 14:46:44 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Howard Stearns
d53c1d0fba Change default avatar collision sound. 
Note that this only used when Interface.ini does not already have a setting, and the empty string is a valid setting.
To reset to default, either delete Interface.ini or the line in it that begins with collisionSoundURL=, or just set
Interface|Edit->Preferences->Avatar collision sound URL to
https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav
 2015-09-03 13:22:04 -07:00
Brad Davis
70ffe10057 Use a constant log file and rollover accumulated logs to a new file based on startup, time or size 2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2 Merge pull request #5689 from jherico/lisa 
Adding 'web3d' overlay type
 2015-09-02 21:31:38 -07:00
Anthony J. Thibault
30264e9c3d Added animation debug draw items to menu. 
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
  Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
 2015-09-02 21:04:29 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Brad Davis
b6ef2e314f Adding 'web3d' overlay type 2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
b199e9e593 Merge pull request #5703 from jherico/marge 
Support HTML colors in overlays
 2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23 Improved default avatar.json state machine. 
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
 2015-09-02 17:28:06 -07:00
Howard Stearns
389e752b6e Merge pull request #5695 from AndrewMeadows/dysprosium 
avoid bad joints when computing avatar bounding capsule
 2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea fix typo that broke build and remove warning 2015-09-02 11:31:05 -07:00
Anthony J. Thibault
4a749a0403 Updated MyAvatar to use animGraph from gist instead of local host. 2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Andrew Meadows
b7d892cfcd Merge pull request #5691 from ctrlaltdavid/display-names-in-front 
Only render display names if in front of camera
 2015-09-01 19:59:06 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Andrew Meadows
a7d57d7c60 cleanup whitespace 2015-09-01 14:31:47 -07:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Andrew Meadows
7410baedf0 merge highfidelity/master into andrew/copernicium 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
 2015-09-01 11:08:01 -07:00
Anthony J. Thibault
2401e6cc4b Merge branch 'master' into ajt/new-anim-system 2015-09-01 10:58:38 -07:00
David Rowe
2b17eafef4 Only render display names in front of camera 2015-09-01 10:24:50 -07:00
Seth Alves
7b6d267c06 Merge pull request #5675 from AndrewMeadows/darmstadtium 
remove PhysicsEntity class
 2015-09-01 10:06:01 -07:00
Andrew Meadows
bdcc68ce36 fix bug: allow IK to iterate more than once 
also changed name of parentTransform to be rootTransform
for more correctness
 2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52 remove menu items for legacy IK options 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Anthony J. Thibault
0d98ab3365 Normalize scale on AnimSkeleton bind pose. 2015-08-31 17:27:23 -07:00
Anthony J. Thibault
9786954585 Added support for onDone and onLoop triggers. 2015-08-31 12:13:05 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Stephen Birarda
fa0abe2972 resolve conflicts on merge with upstream/master 2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6 Merge branch 'master' into ajt/new-anim-system 2015-08-31 10:47:50 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Anthony J. Thibault
9d983e0614 Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader. 
Also updated avatar.json to test nested graphs under a SM.
 2015-08-28 17:16:32 -07:00
Sam Gateau
4e944645fe more cleaning for showing a cleaner pr 2015-08-28 16:58:36 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -07:00
Brad Davis
b7dd47efcb Merge pull request #5674 from birarda/master 
cleanup of some warnings
 2015-08-27 23:34:43 -07:00
Ryan Huffman
4dadfb8ea6 Merge pull request #5668 from ctrlaltdavid/20648 
Auto refresh entities list upon display of Entities tab
 2015-08-27 21:50:11 -07:00
Anthony J. Thibault
19e91bb392 Added basic interpolation support to AnimStateMachine 2015-08-27 21:26:31 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine. 
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
 2015-08-27 20:41:53 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892 remove PhysicsEntity class 2015-08-27 18:22:12 -07:00
Stephen Birarda
43d2c0653d return correct ATP url from upload dialog 2015-08-27 16:06:54 -07:00
Stephen Birarda
549c514400 fix upload leak, return error for failed load 2015-08-27 15:12:08 -07:00
Stephen Birarda
46990184d6 AssetUploadDialogFactory constructor should be private 2015-08-27 15:07:15 -07:00
Stephen Birarda
777e6c3c2d use existing AssetUploadDialogFactory ref 2015-08-27 15:03:13 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
59775e5756 actually add the additional error to the dialog 2015-08-27 14:40:12 -07:00
Stephen Birarda
26757eae7a immediately show permission denied error if applicable 2015-08-27 14:37:44 -07:00
Stephen Birarda
f238c1b167 include the extension in upload confirmation 2015-08-27 14:29:42 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Howard Stearns
2429134b37 Lock both myavatar activities, not one. 2015-08-27 13:44:19 -07:00
David Rowe
c9d799f5e0 Auto refresh entities list upon display of Entities tab 2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Howard Stearns
96c74ebbd5 Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. 
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
 2015-08-27 12:25:40 -07:00
Stephen Birarda
229015a5da don't allow asset-server upload if no server present 2015-08-27 12:21:38 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -07:00
Stephen Birarda
b3bd94c8db show a QMessageBox if not connected to asset-server 2015-08-27 11:37:27 -07:00
Stephen Birarda
f92ee597e5 fix width of asset upload dialog to fit ATP url 2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612 Merge pull request #5649 from larsnaesbye/master 
Move i18n to own dir, update FA
 2015-08-27 10:46:29 -07:00
Stephen Birarda
513cae0d40 thread the AssetUpload so it doesn't take over main 2015-08-27 10:23:02 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02 REfining th eTextureMap design but still with the issue of the lightmapped model 2015-08-27 09:52:07 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Stephen Birarda
c277584f2e Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-27 09:17:25 -07:00
Seth Alves
435863d1f0 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 17:33:59 -07:00
Anthony J. Thibault
b7a9b54628 Better AnimDebugDraw rendering 2015-08-26 16:42:08 -07:00
Stephen Birarda
5b5941fea2 move asset upload to AssetUploadDialogFactory 2015-08-26 16:30:09 -07:00
Howard Stearns
8e3d8cd31c Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d Sprinkle locks everywhere. 2015-08-26 16:08:07 -07:00
Ryan Huffman
4105b7369c Remove AssetScriptingInterface 2015-08-26 15:55:29 -07:00
Ryan Huffman
59b32751f0 Cleanup AssetScriptingInterface 2015-08-26 15:54:02 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Seth Alves
d2eb3108d5 Merge pull request #5644 from howard-stearns/eye-correction-application 
eye correction correction
 2015-08-26 14:46:48 -07:00
Ryan Huffman
aed1ba31c4 Fix bugs in Menu.cpp 2015-08-26 12:26:24 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Howard Stearns
0e18395fd0 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 12:04:28 -07:00
Howard Stearns
54877cdd47 Use GenericThread, and use usleep instead of QTimer (which is incompatible with GenericThread). 2015-08-26 11:59:12 -07:00
Howard Stearns
b0734a06f3 snapshot 2015-08-26 11:14:09 -07:00
Anthony J. Thibault
46c1e008bc Merge branch 'master' into ajt/new-anim-system 2015-08-26 10:37:39 -07:00
Seth Alves
23dbbcc7bb Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 09:42:20 -07:00
Ryan Huffman
d90ceb200a Add asset uploader to Menu 2015-08-26 09:27:50 -07:00
Brad Hefta-Gaub
aa80fc9127 Merge pull request #5653 from jherico/homer 
Remove items from the VR menu properly
 2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie 
Fixing problems reported by static analysis tool
 2015-08-26 08:31:05 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub
b19f1e0631 Merge pull request #5658 from ctrlaltdavid/20653 
Add Desktop object to JavaScript with width and height properties
 2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d Merge pull request #5657 from birarda/master 
fix for 0 entity avg ping
 2015-08-25 22:27:44 -07:00
Howard Stearns
38bc8634de displayPlugin is not thread safe, and switch from simulate rate to interval in prep for sleep. 2015-08-25 21:26:46 -07:00
Anthony J. Thibault
0c02a338f2 Added support for setting Variants in the json file. 
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
 2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63 AnimVariantMap is used in eval, MyAvatar loads avatar.json via url 2015-08-25 20:28:17 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Howard Stearns
b8ca604bf8 Checkpoint before GenericThread. 2015-08-25 16:17:50 -07:00
David Rowe
9d3d104ec3 Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
Ryan Huffman
dc5d5cbb63 Add asset server ping to stats 2015-08-25 15:06:40 -07:00
David Rowe
1f541832b6 Reword dialog 2015-08-25 14:24:15 -07:00
Seth Alves
0708fabddf Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-25 13:13:55 -07:00
Stephen Birarda
6f14eb2206 fix for 0 entity avg ping 2015-08-25 12:35:34 -07:00
Anthony J. Thibault
496c706bba Added AnimVariantMap argument to evaluate. 2015-08-25 11:59:24 -07:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00
David Rowe
7c8ff4dcbd If Interface.ini doesn't contain crash option value assume default 2015-08-25 11:07:55 -07:00
Howard Stearns
2ca4768766 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-25 10:44:54 -07:00
Howard Stearns
2ed6900c7e Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in. 2015-08-25 09:55:04 -07:00
Seth Alves
91254245e4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-24 20:21:24 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController 
Fix a couple crashes in the Controller scripting interface
 2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
34e32ddaeb Merge pull request #5636 from howard-stearns/marketplace-avatars 
marketplace avatars
 2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a Merge pull request #5628 from ctrlaltdavid/webwindow-external-links 
Make WebWindow hyperlinks with target="_blank" open in user's browser
 2015-08-24 17:45:35 -07:00
David Rowe
b27d25b46e Implement crash option that retains only login and avatar information 2015-08-24 16:41:25 -07:00
Lars Christensen
110ba131a6 moved translation efforts into subdir 2015-08-25 01:36:19 +02:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Howard Stearns
828509e8eb Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-24 15:01:46 -07:00
Howard Stearns
476ca36460 final 2015-08-24 15:01:01 -07:00
Anthony J. Thibault
9457794d9e fix whitespace offset due to merge conflict 2015-08-24 14:50:02 -07:00
Anthony J. Thibault
fa5256eefd Merge branch 'master' into ajt/new-anim-system 2015-08-24 14:32:28 -07:00
David Rowe
110e7a773b Implement crash option that deletes Interface.ini 2015-08-24 13:36:03 -07:00
David Rowe
f6cf77ae68 Add Developer > Display Crash Options menu item 
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
 2015-08-24 13:24:31 -07:00
David Rowe
9c782f6a6d Display dialog of crash handling options at startup if Interface crashed 
Default option and Esc continue without taking any action.
 2015-08-24 12:45:35 -07:00
Howard Stearns
57e4ff182d Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction-application 2015-08-24 11:27:52 -07:00
Howard Stearns
484db87abc Set head pitch before making downstream eye corrections. 2015-08-24 11:10:29 -07:00
David Rowe
63ad972576 Write and delete "application is running" marker file 2015-08-24 11:09:41 -07:00
David Rowe
07c9a0e2bb Add Developer > Crash Interface menu item 2015-08-24 10:48:58 -07:00
Brad Davis
78a08ed7c7 Merge pull request #5641 from thoys/20660 
CR for Job #20660 - Render the world Axis markers into negative space, add view option
 2015-08-24 10:16:56 -07:00
Andrew Meadows
1d7d5071ae Merge pull request #5633 from howard-stearns/restore-body-indicators 
Restore body indicators (e.g., lookAt vectors).
 2015-08-23 15:46:57 -07:00
Thijs Wenker
bbd6f25ff7 style fixes 2015-08-23 20:01:58 +02:00
Thijs Wenker
0f8cf80d45 Merge branch 'master' of https://github.com/worklist/hifi into 20660 2015-08-23 19:53:50 +02:00
Thijs Wenker
63f0173665 extend world boundaries 2015-08-23 19:52:29 +02:00
Brad Davis
b7237fb5ca Fixing build problem with 3d connexion 2015-08-23 09:32:58 -07:00
Nex Pro
53a63fed79 Changed constants red, green, blue and grey to uppercase as per style guide. 2015-08-23 17:16:23 +01:00
Thijs Wenker
748625399e "View -> World Axes" menu option 2015-08-23 17:59:58 +02:00
Thijs Wenker
b7f9bc13da Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-23 17:52:51 +02:00
Nex Pro
0ef2def56e changed default DASH_LENGTH and GAP_LENGTH to 1.0f 2015-08-23 16:52:12 +01:00
Thijs Wenker
9de35511fc Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-23 17:50:28 +02:00
Nex Pro
3e8970cc1e corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide. 2015-08-23 16:49:39 +01:00
Thijs Wenker
90c8200d66 Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-23 17:44:43 +02:00
Nex Pro
ad315cf68a Merge branch '20660' of github.com:thoys/hifi into 20660 
Conflicts:
	interface/src/Util.cpp
 2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369 Modified the world box to render axes in negative space 
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
 2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
53f9815f69 Merge pull request #5639 from jherico/maggie 
Stereo rendering work
 2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00
Howard Stearns
74fd640f16 Restore the ability to change avatars from the edit.js marketplace button. 2015-08-21 16:49:07 -07:00
Howard Stearns
b579b996c3 There was a hidden (and inappropriate) dependency on face model loading. 2015-08-21 15:07:39 -07:00
Seth Alves
fdad8fc651 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 13:19:19 -07:00
David Rowe
6ee22055fa More temporary logging to track down cause of assert 2015-08-21 12:48:08 -07:00
Howard Stearns
e84cc03bcc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 11:35:42 -07:00
samcake
66087872a3 Merge pull request #5621 from highfidelity/stereo 
New stereo rendering mechanism
 2015-08-21 11:23:14 -07:00
Seth Alves
105470bf26 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 11:02:16 -07:00
Seth Alves
6db0442fda allow for asynchronous building of collision shape 2015-08-21 10:48:26 -07:00
David Rowe
b1db7e5ed2 Make WebWindow hyperlinks with target="_blank" open in user's browser 2015-08-21 10:28:47 -07:00
Brad Davis
b8b0917d9d Attempting to fix judder issues 2015-08-21 10:01:11 -07:00
ZappoMan
a0552050b0 set vsync on startup 2015-08-21 08:23:18 -07:00
Howard Stearns
ae3e052e72 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 08:13:44 -07:00
Brad Davis
1e074ab81c Remove superfluous clear 2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828 Fix culling calculations in HMD with new stereo mechanism 2015-08-21 00:29:27 -07:00
Brad Davis
476e5edb32 Fixing HMD wobble 2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Brad Davis
89d2fc35ff Merge pull request #5613 from howard-stearns/eye-correction 
HMD eye correction
 2015-08-21 00:20:00 -07:00
Brad Davis
c3991dbb8c Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor 
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
 2015-08-20 23:57:16 -07:00
ZappoMan
bd29fb2474 fix ifdef 2015-08-20 19:33:39 -07:00
ZappoMan
06b2a88fb6 toggle menu near top of window 2015-08-20 19:33:22 -07:00
ZappoMan
9f501d4d72 first cut at attempting to hide menu in full screen 2015-08-20 19:33:06 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Howard Stearns
642e569033 Uncomment code that was commented out to simplify debugging. 2015-08-20 17:38:49 -07:00
Howard Stearns
ea02583875 Cleanup. 2015-08-20 17:33:10 -07:00
Howard Stearns
7a79abd278 Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction 2015-08-20 16:54:52 -07:00
Howard Stearns
05f4145acb Checkpoint. Working? 2015-08-20 16:28:40 -07:00
David Rowe
e9b3d48165 Add menu item that disables adjusting eyelids to follow pupil 
Developer > Avatar > Disable Eyelid Adjustment
 2015-08-20 16:10:31 -07:00
Howard Stearns
f26849c7e1 Proper HMD scaling. 2015-08-20 12:34:50 -07:00
Ryan Huffman
0a290da529 Merge branch 'ordered-sending' into atp-server 2015-08-20 11:50:06 -07:00
ZappoMan
cd050b2e60 don't show hmd tools for direct mod HMDs 2015-08-20 09:53:58 -07:00
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02:00
Brad Davis
9faf452196 Make sure that items added via plugins can be removed as well 2015-08-20 00:32:25 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Seth Alves
537b690d60 Merge pull request #5566 from howard-stearns/recapitate 
Get rid of separate head/body avatar
 2015-08-19 10:46:05 -07:00
Philip Rosedale
d9425100b6 Merge pull request #5595 from sethalves/fix-inviso-av 
possible fix for invisible other's-avatar bug
 2015-08-18 21:24:15 -07:00
Philip Rosedale
eef556eeb2 Merge pull request #5593 from thoys/20528 
CR for Job #20528 - Tool window unavailable in Windows Client.
 2015-08-18 21:23:14 -07:00
Seth Alves
940390ee46 make enable-avatar-collisions menu item work again 2015-08-18 19:31:05 -07:00
Howard Stearns
2819f3ac1b constant 2015-08-18 16:39:30 -07:00
Seth Alves
5fcbd37e43 possible fix for invisible other's-avatar bug 2015-08-18 15:45:17 -07:00
Howard Stearns
c90845dfcb Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-18 15:38:14 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 
And update with current code.
 2015-08-18 15:35:37 -07:00
Brad Hefta-Gaub
a00eb0ca5d Merge pull request #5592 from jherico/homer 
Remove keyboard focus highlight on delete entity
 2015-08-18 15:25:52 -07:00
Brad Davis
944734fed2 Remove focus highlight on delete entity 2015-08-18 13:59:39 -07:00
Brad Hefta-Gaub
5c1364ca2a Merge pull request #5590 from ctrlaltdavid/20649 
Add further temporary debug for tracking down invalid scale value assert
 2015-08-18 13:31:23 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
David Rowe
00aa336a2b Add further temporary debug for tracking down invalid scale value assert 2015-08-18 10:01:00 -07:00
Thijs Wenker
44399da41c Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever. 2015-08-18 14:54:21 +02:00
Seth Alves
e29bb9183b minimize diff 2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9 only update simRate once per second 2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Brad Davis
3cbbb5fb79 Fix crash on mouse click 2015-08-18 00:05:02 -07:00
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -07:00
Howard Stearns
9ed418f7b6 Simple frequencey decoupling. Still same thread. 2015-08-17 19:19:11 -07:00
Brad Davis
cb5f80bf78 Add highlighting of keyboard focused items 2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120 Merge pull request #5583 from ZappoMan/clickToFocusWebEntity 
make web entity focus click based
 2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors 
Synchronize eye joint and debugging vectors
 2015-08-17 16:56:01 -07:00
ZappoMan
49cf29ce8f cleanup debugging and dead code 2015-08-17 15:57:20 -07:00
ZappoMan
47b0e2fda6 more hacking on click to focus 2015-08-17 14:02:24 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Seth Alves
296a6b1cb8 re-enabled ctrlaltdavid's eye calibration code 2015-08-17 12:20:46 -07:00
Howard Stearns
941b966dc7 Force eyeball update even when not looking at me. 2015-08-17 11:57:08 -07:00
ZappoMan
8cf450cb67 first cut at making focus click based 2015-08-17 11:41:54 -07:00
Brad Hefta-Gaub
494fd6035a Merge pull request #5569 from ctrlaltdavid/webwindow-extras 
Add size and position properties, methods, and events to WebWindow
 2015-08-15 11:23:59 -07:00
Brad Davis
9706a44ca1 Merge pull request #5571 from ZappoMan/hmdToolsRedux 
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
 2015-08-14 20:11:27 -07:00
Howard Stearns
eeeaa8050d Fix the rush jobs, so gustavo can build build for me... 2015-08-14 18:58:49 -07:00
Brad Hefta-Gaub
a0e92e71a5 Merge pull request #5562 from AlexanderOtavka/overlay-docs 
Documentation for overlay changes.
 2015-08-14 18:53:34 -07:00
Brad Hefta-Gaub
65b9c7bed8 Merge pull request #5522 from huffman/fix-billboard-url 
Fix BillboardOverlay breaking when changing url
 2015-08-14 18:10:22 -07:00
Brad Davis
dc2ddd0303 switch statement spacing 2015-08-14 17:12:00 -07:00
Howard Stearns
d28c555a79 Synchronize eye joint and debugging vectors when the other avatar is looking at me. 2015-08-14 16:47:34 -07:00
Brad Davis
db95657455 PR comments 2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2 remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd 2015-08-14 16:27:50 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
ZappoMan
65864b1876 only draw axis for HALF_TREE_SCALE 2015-08-14 15:30:16 -07:00
Ryan Huffman
fec460886b Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-url 2015-08-14 15:18:40 -07:00
David Rowe
bb2c48e3ed Add size and position properties, methods, and events to WebWindow 2015-08-14 14:42:32 -07:00
Brad Hefta-Gaub
ea685f4587 Merge pull request #5563 from huffman/fix-image3d-rotation 
Fix rotation of image3d overlays
 2015-08-14 11:14:18 -07:00
Brad Hefta-Gaub
31a49a551a Merge pull request #5556 from jherico/bart 
QML framerate improvments
 2015-08-14 11:11:14 -07:00
ZappoMan
7c6a9b131d some CR cleanup 2015-08-14 10:17:48 -07:00
ZappoMan
5fdd7304aa Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-14 09:33:53 -07:00
Howard Stearns
6b27f854b2 Eyelid position is on sender side and should use lookAt spot, not the receiver side. 2015-08-14 07:51:04 -07:00
Howard Stearns
1133e053d1 Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging. 2015-08-14 07:33:36 -07:00
Howard Stearns
f00d3c037d whitespace 2015-08-13 17:36:03 -07:00
Howard Stearns
0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate 2015-08-13 15:56:13 -07:00
Howard Stearns
63608d8012 Undo avatar choice if the whole preferences dialog is cancelled. 2015-08-13 15:55:43 -07:00
Howard Stearns
722c024f61 Remove obsolete code. 2015-08-13 15:08:26 -07:00
Howard Stearns
7d4c96cc29 avartar => avatar 2015-08-13 14:53:12 -07:00
Howard Stearns
74dc6a3dc5 updateMotionBehavior => updateMotionBehaviorFromMenu 2015-08-13 14:43:39 -07:00
Howard Stearns
a8a064990f apperance => appearance 2015-08-13 14:42:37 -07:00
Howard Stearns
2756a00638 Get default avatar url from resources. 2015-08-13 14:23:34 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Howard Stearns
4dae01a69c Provide a consistent avatar default for the empty string. 2015-08-13 12:54:16 -07:00
Howard Stearns
62941c0914 Remove dead code. 2015-08-13 12:39:30 -07:00
Howard Stearns
ea834609c2 Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog. 2015-08-13 10:33:31 -07:00
Ryan Huffman
0daa9d4871 Remove extra rotation in image3d 2015-08-13 09:38:21 -07:00
Zander Otavka
dc68e12963 Improve documentation for overlay changes. 2015-08-12 22:04:06 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
David Rowe
6a0a08eafb Consolidate identical code paths 2015-08-12 15:25:34 -07:00
David Rowe
7298fa7e2c Log successful start of eye tracker streaming 2015-08-12 15:22:24 -07:00
David Rowe
9fe1aaf182 Disable saving / loading eye tracker calibrations so can use old SDK 2015-08-12 15:21:06 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00