overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 15:39:03 +02:00

Author	SHA1	Message	Date
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master Spacemouse migration	2015-11-04 19:15:35 -08:00
Brad Davis	20d1035821	Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 15:54:50 -08:00
Anthony J. Thibault	d46d521d81	Added #else branch to #if 0	2015-11-04 15:10:23 -08:00
Seth Alves	4ab727c47c	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-04 13:57:59 -08:00
Thijs Wenker	42cbccc725	fix stretchy HMD view on entity camera	2015-11-04 21:39:22 +01:00
Thijs Wenker	ee218faf5e	Merge branch '20724' of github.com:thoys/hifi into 20724	2015-11-04 21:21:57 +01:00
Anthony J. Thibault	69f1cfbcb9	Fixes for Mac build and crash on startup For some reason the qt code gen is getting confused by the #if 0 in 3DConnextionClient.h, so I added a stub implementation. In Application.cpp the change of moving idle into paintGL had a sideeffect of calling OffscreenGlCanvas before it was initialized. To work around this I added a guard to prevent calling idle before all the gl windows/widgets have been initialized.	2015-11-04 12:04:34 -08:00
Atlante45	d9cd986db2	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-04 11:26:16 -08:00
Anthony Thibault	275b248547	Merge pull request #6302 from AndrewMeadows/fix-avatar-drift fix slow drift of avatar when wearing HMD	2015-11-04 11:19:45 -08:00
samcake	ce5e89ce66	removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file	2015-11-04 10:53:53 -08:00
$U-GAPOS\andrew$ U-GAPOS\andrew	9de5721a48	set _hmdFollowVelocity to zero when done following	2015-11-04 10:23:55 -08:00
Seth Alves	f2be71d1a5	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-04 09:32:21 -08:00
Seth Alves	270b4b97fc	remove a left-over kludge that was causing the appearence of frame-lag in held objects	2015-11-04 02:26:02 -08:00
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Atlante45	3a545399e3	Remove our idle() from paintGL now that it's in master	2015-11-03 17:56:40 -08:00
Thijs Wenker	d7279e4c88	Support for Camera Entities. - New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.). - New CameraMode: CameraEntity - Example script using the new cameraEntity - Updated edit.js to use the CameraEntities (with button to preview the camera)	2015-11-04 02:51:23 +01:00
Atlante45	55894f2eee	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 17:46:24 -08:00
Atlante45	eb990c9c1c	More basebal test code	2015-11-03 17:45:01 -08:00
Seth Alves	ffb0317a50	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-03 16:53:00 -08:00
Seth Alves	fbaa86426c	re-remove the _nextPosition stuff	2015-11-03 16:52:46 -08:00
Brad Hefta-Gaub	71e4092276	Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render Remove idleTimer and call idle directly from paintGL.	2015-11-03 16:38:43 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Anthony J. Thibault	31f361d49c	Moved fps timing to beginning of paintGL This should improve accuracy. However the fps displayed can still sometimes be slightly greater then the vsync, this is either due to timer accuracy problems or QTimer delay within OpenGLDisplayPlugin.	2015-11-03 15:51:18 -08:00
$U-GAPOS\andrew$ U-GAPOS\andrew	d544b7a645	fix bug: avatar can't walking when HMD at rest	2015-11-03 13:59:15 -08:00
Andrew Meadows	4215ce5d25	Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds Don't play other avatar's collision sounds.	2015-11-03 13:40:27 -08:00
Andrew Meadows	498cec3abd	Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd fix hydra sensor matrix when no HMD is attached	2015-11-03 13:37:03 -08:00
Seth Alves	dba9eb7046	merge from upstream	2015-11-03 13:35:17 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
Atlante45	0508091130	Rebase fixes	2015-11-03 11:37:57 -08:00
Andrew Meadows	e160e2a7ae	the minimal fix	2015-11-03 11:37:30 -08:00
Brad Davis	4c076d8b12	Disabling billboard rendering, source of the evil black rectangles	2015-11-03 11:34:05 -08:00
Andrew Meadows	12ff9734e0	init _bodySensorMatrix in ctor	2015-11-03 11:26:49 -08:00
Anthony J. Thibault	c139b62217	fps calculation now based on moving average fps stat is now calcualted the same way as simRate and avatarRate are calculated, based on a moving average that is sampled once a second. Also, Removed unused constants and renamed Application::checkFPS to Application::ping	2015-11-03 11:19:49 -08:00
Clément Brisset	c63fc8557c	More baseball test code	2015-11-03 11:14:59 -08:00
Clément Brisset	40ce2416e8	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:13:57 -08:00
Ryan Huffman	03a338dfe6	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-03 11:13:56 -08:00
Stephen Birarda	8cd41b9383	resolve conflicts on merge with huffman/baseball	2015-11-03 11:13:15 -08:00
Ryan Huffman	55789fed99	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:11:26 -08:00
Ryan Huffman	ccb25f4b63	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:10:45 -08:00
Ryan Huffman	afffe7f5c6	Merge branch 'master' of github.com:Atlante45/hifi into baseball	2015-11-03 11:10:14 -08:00
Atlante45	f2ff0b40f7	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 11:06:19 -08:00
Clément Brisset	31d92fd90a	Baseball test code	2015-11-03 11:00:35 -08:00
EdgarPironti	603405ad61	Do not merge - Spacemouse	2015-11-02 23:29:15 -08:00
Brad Davis	764ecba2a8	Adding diagnostics to track down the 'black rectangles of death'	2015-11-02 21:55:35 -08:00
Anthony J. Thibault	0c12bb5a4e	Remove idleTimer and call idle directly from paintGL.	2015-11-02 18:47:18 -08:00
Seth Alves	310a5c9bfb	don't initialize SMI sdk unless we need it	2015-11-02 13:42:12 -08:00
Stephen Birarda	017cee6961	make shouldRenderLocally do the right thing	2015-11-02 11:59:09 -08:00
$U-GAPOS\andrew$ U-GAPOS\andrew	a77f888f15	more correct HMD offset correction velocity	2015-11-02 11:29:17 -08:00
$U-GAPOS\andrew$ U-GAPOS\andrew	a545d770d8	fix bug preventing avatar motion in 2D mode	2015-11-02 11:07:43 -08:00
Andrew Meadows	9799693135	remove extra whitespace	2015-11-02 11:07:41 -08:00
Andrew Meadows	fd557c4e52	route HMD-following through the physics simulation	2015-11-02 11:07:40 -08:00
Howard Stearns	fc63fa6f7b	Update comments, and don't continue through collisions after finding one for our avatar.	2015-11-01 18:55:43 -08:00
Howard Stearns	ea2971a24f	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-11-01 17:02:59 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub	9c23f2551d	Merge pull request #6207 from jherico/pluginSupport Support for runtime plugins (DLLs)	2015-11-01 14:57:13 -08:00
Brad Davis	cfb2fd1523	Support for runtime plugins (DLLs)	2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub	e899229cde	tweaks to how VrMenu is shown	2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub	05dea847be	add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu	2015-10-31 15:47:40 -07:00
Howard Stearns	79f05c63e5	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-10-31 11:23:18 -07:00
Seth Alves	896ed3927c	merge from upstream	2015-10-30 19:17:43 -07:00
Anthony J. Thibault	085282db4f	Crash fix for AvatarManager when iterating over _avatarHash The main problem is that a null shared pointer was inserted into the _avatarHash via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d) will insert an empty smart_ptr into the hash.	2015-10-30 16:13:04 -07:00
Andrew Meadows	f652e983a9	flag kinematic objs when changed in stepSimulation()	2015-10-30 14:53:29 -07:00
Howard Stearns	28246c1951	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub	8839458d54	Merge pull request #6242 from highfidelity/controllers New Controller interfaces/api	2015-10-30 12:47:51 -07:00
Seth Alves	93503d0a21	make kinematic grab set entities kinematic in bullet and update entity position	2015-10-30 11:03:13 -07:00
Howard Stearns	792fed0090	We weren't setting type for avatar motion states.	2015-10-29 22:15:26 -07:00
samcake	f72146c35d	FIxing the mac build	2015-10-29 14:17:52 -07:00
samcake	d73eafddd1	COmfort mode working with the COntroller system observing the menu state	2015-10-29 13:48:16 -07:00
samcake	e902e5e97a	Introduce the concept of loading the default Mapping	2015-10-29 13:05:29 -07:00
Howard Stearns	3c6d4f9c22	Thread safety per #6154 .	2015-10-29 11:02:24 -07:00
Howard Stearns	6e4d0043c9	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-29 10:32:12 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Seth Alves	ac1055c3e0	Merge pull request #6214 from howard-stearns/goToPosition Don't go to wrong position on startup/teleport.	2015-10-29 10:15:26 -07:00
Seth Alves	10717dc364	Merge pull request #6154 from howard-stearns/safe-avatar-list-access Safe avatar list access	2015-10-29 10:12:34 -07:00
Andrew Meadows	d33530f5d0	Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull Don't render avatar's renderBoundingCollisionShapes before data is there	2015-10-29 09:34:26 -07:00
Brad Davis	c4e82a85d9	Remove DeviceProxy in favor of InputDevice	2015-10-29 09:32:56 -07:00
Andrew Meadows	f9012d5051	Merge pull request #6187 from sethalves/fix-actions-ttl fix actions bug	2015-10-29 09:30:21 -07:00
Howard Stearns	c47d246987	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-29 08:27:12 -07:00
Howard Stearns	d79d0bc5c5	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-29 08:25:41 -07:00
Brad Hefta-Gaub	21decaaf8e	Merge pull request #6218 from ctrlaltdavid/20719 20719 Fix audio stats dialog box not being sized properly	2015-10-29 08:16:56 -07:00
Howard Stearns	697b9fb60b	Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix Fixes locally rendered eye gaze	2015-10-28 21:39:54 -07:00
Anthony J. Thibault	5e73af9272	Rig: Removed dt from updateFromEyeParameters()	2015-10-28 18:10:41 -07:00
David Rowe	568e5536b8	Control bandwidth stats dialog sizing similarly	2015-10-29 13:18:43 +13:00
David Rowe	4cb5ccab90	Fix audio stats dialog not being sized properly	2015-10-29 13:18:27 +13:00
howard-stearns	62e56d3f13	Don't go to wrong position on startup/teleport. This fixes one cause of being in the wrong place. https://app.asana.com/0/32622044445063/61787931469907	2015-10-28 16:44:53 -07:00
Howard Stearns	bc0e14cb71	Don't render avatar's renderBoundingCollisionShapes before the data is there. (Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356)	2015-10-28 13:58:44 -07:00
Brad Davis	570b4a32da	Merge pull request #6206 from samcake/controllers Controllers : Add a new kind onf controller to expose ReadOnly state from the application	2015-10-28 13:42:15 -07:00
Brad Davis	3c1a0930da	Merge remote-tracking branch 'upstream/master' into HEAD Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-10-28 13:38:22 -07:00
samcake	bbc6d9f5e7	Fixing typo and review comments	2015-10-28 12:52:21 -07:00
samcake	b37a6f689a	Fixing typo and review comments	2015-10-28 12:51:22 -07:00
samcake	fc15c7cd98	Adding the ApplicationStateDevice to the APplication class and add one entry ythere	2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub	731fab6ffc	Merge pull request #6196 from jherico/gl Move GL utilities to their own library	2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub	c5e22a62e8	Merge pull request #6182 from Atlante45/script-engine Improved ScriptEngine debug messages	2015-10-28 11:27:30 -07:00
Anthony J. Thibault	6ae5c540fd	SkeletonModel: coding standard fix Replaced glm::vec3(0) with glm::vec3().	2015-10-28 11:09:24 -07:00
Howard Stearns	367175b8a6	Reduce lock time.	2015-10-28 10:49:19 -07:00
Andrew Meadows	afec2a9771	fix whitespace	2015-10-28 09:42:55 -07:00
samcake	57aa89d14f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-28 09:24:24 -07:00
samcake	92ca658aae	Trying to get a state controller to work	2015-10-28 09:23:20 -07:00
Anthony J. Thibault	ae8938cadc	Fix for local eye tracking in AnimGraph Also moved Rig::updateAnimations() now occurs after Rig::updateFromHeadParameters() and Rig::updateFromHandParameters(). This should remove a frame of lag for head and hand IK targets. Rig::updateFromEyeParameters() occurs after Rig::updateAnimations(). But now the eye JointStates are re-computed, this is the actual fix for the local eye tracking issue.	2015-10-27 18:30:35 -07:00
Brad Hefta-Gaub	65eae35433	a little more cleanup	2015-10-27 17:09:43 -07:00
samcake	6ec87086bc	Adding the state controller	2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub	d86f1b50a7	more cleanup	2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub	19743c1f39	gak, build busters and more CR feedback	2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub	eb19364129	CR feedback	2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub	133d48ebee	CR feedback	2015-10-27 15:53:48 -07:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
Andrew Meadows	e35596428c	cleanup comment	2015-10-27 14:43:18 -07:00
Atlante45	32f88f3fb6	Fix for JSConcole	2015-10-27 14:37:39 -07:00
Brad Hefta-Gaub	5a42991e0c	first pass at cleaning up MyAvatars use of PalmData	2015-10-27 13:51:42 -07:00
Andrew Meadows	8b285fd228	recover follow HMD behavior	2015-10-27 13:51:40 -07:00
Andrew Meadows	43aac813da	more prep for shifting avatar during HMD motion	2015-10-27 13:15:38 -07:00
Andrew Meadows	24c2f538a4	keep MyAvatar RigidBody on shape changes	2015-10-27 13:15:38 -07:00
Andrew Meadows	355ebe923d	cleanup and comments	2015-10-27 13:15:38 -07:00
Andrew Meadows	5e59e9595b	fix typo in comments	2015-10-27 13:15:38 -07:00
Andrew Meadows	5f278f9024	name change	2015-10-27 13:15:38 -07:00
Andrew Meadows	a1f1e50431	split CharacterController btw phys and interface	2015-10-27 13:15:38 -07:00
samcake	87cf3b237b	Supporting a InHMD action and using it to enable COmfort mode	2015-10-27 09:59:22 -07:00
Seth Alves	8d0aaed41a	fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'	2015-10-26 13:50:21 -07:00
Howard Stearns	900b07fdee	dead code	2015-10-26 10:00:07 -07:00
Howard Stearns	7b0b77f4d1	getAvatarHash => withAvatarHash	2015-10-23 16:57:27 -07:00
Brad Davis	e8be92cab8	Adding input action event	2015-10-23 13:36:06 -07:00
Brad Hefta-Gaub	f90844449d	fix angular velocity	2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub	4a58eeb810	expose deltaRotation as part of MyAvatar.xxxHandPose	2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub	71dfff7c35	first cut at adding MyAvatar.xxxHandPose	2015-10-23 12:00:40 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Howard Stearns	f0a4e25e89	Name change per comments.	2015-10-22 15:25:14 -07:00
Howard Stearns	ecc920199d	Return id suitable for use with remover, per comments.	2015-10-22 15:24:24 -07:00
Howard Stearns	1d0464ede5	Name change and thread checks per comments.	2015-10-22 15:15:10 -07:00
Seth Alves	f6fe503c51	pass avatar parent information through avatar-mixer	2015-10-22 13:44:04 -07:00
Howard Stearns	0d514ad645	Thread-safe avatar list access	2015-10-22 13:02:08 -07:00
Brad Davis	5227c40298	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-22 12:15:41 -07:00
Seth Alves	264b658132	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
Howard Stearns	a58539be82	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-22 10:39:54 -07:00
Brad Davis	afcec347ff	Wiring yaw action to avatar	2015-10-21 21:35:19 -07:00
Howard Stearns	9fd61907f5	Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.	2015-10-21 20:50:07 -07:00
Brad Davis	044a28212d	Wiring step yaw to the avatar	2015-10-21 20:44:38 -07:00
Brad Hefta-Gaub	68a2985b7a	add tip position as well	2015-10-21 17:14:48 -07:00
Brad Hefta-Gaub	a3900a954b	expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS	2015-10-21 17:03:54 -07:00
Brad Davis	4a1df286fd	Cleanup of enums and JS names	2015-10-21 15:57:37 -07:00
Seth Alves	3944d7be0f	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-21 13:50:17 -07:00
Seth Alves	c0eccca6d3	relay 'kinematic' mode of a hold to other interfaces	2015-10-21 12:29:26 -07:00
Brad Davis	a124d3b433	Moving to InputEndpoint, fixing build problem	2015-10-20 22:00:16 -07:00
Howard Stearns	574a51e831	Use cleaner interface.	2015-10-20 17:02:16 -07:00
samcake	da55011c2a	Trying to merge	2015-10-20 16:38:41 -07:00
Seth Alves	6cb195b335	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-20 15:53:56 -07:00
Howard Stearns	4c6867bb9c	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-20 12:17:00 -07:00
Seth Alves	bc99ef778c	change how render engine is told about model position changes	2015-10-20 12:04:29 -07:00
Brad Davis	bea6fdd890	Working on JSON parsing and cleanup Conflicts: libraries/controllers/src/controllers/Route.cpp libraries/controllers/src/controllers/ScriptingInterface.cpp libraries/controllers/src/controllers/StandardController.cpp libraries/controllers/src/controllers/impl/RouteBuilderProxy.h	2015-10-20 10:20:28 -07:00
Brad Davis	8d0148a1ca	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 10:13:31 -07:00
Andrew Meadows	341bc3666f	Merge pull request #6093 from sethalves/hold-action-changes Hold action changes	2015-10-20 09:19:48 -07:00
Seth Alves	83f69bcb6e	merge from upstream	2015-10-19 19:21:33 -07:00
Brad Hefta-Gaub	9f17f10d6a	fix warning in master	2015-10-19 17:56:38 -07:00
Seth Alves	4feb9dc8c6	prepare for possible future coding standard	2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub	7669f9ed2c	fix several warnings	2015-10-19 17:26:57 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub	56f625d376	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub	0b2bf8bda8	remove some dead code	2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub	110adc5c22	fix model LOD behavior	2015-10-19 15:21:25 -07:00
Seth Alves	46e5bf0435	take entity-server clock-skew into account when handling action expiration times	2015-10-19 11:59:03 -07:00
Brad Davis	a8e707ced2	Correcting update order to fix mouse	2015-10-18 22:46:14 -07:00
Brad Davis	734a39f962	Breaking up UserInputMapper, restoring some mappings	2015-10-18 18:58:03 -07:00
Seth Alves	a78f2a9577	have avatar make use of SpatiallyNestable	2015-10-18 09:48:46 -07:00
Seth Alves	275e77d29e	remove old-style avatar referentials	2015-10-18 07:51:00 -07:00
Brad Davis	57be59935d	Move controller test to app	2015-10-17 19:13:38 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
Howard Stearns	91c2d31118	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-16 15:51:09 -07:00
Howard Stearns	770282ad88	Javascript methods to getAvatars listing and getAvatar from id.	2015-10-16 15:22:43 -07:00
samcake	f0034844e7	Actions working from the Controller layer	2015-10-16 12:24:12 -07:00
Seth Alves	fe709a9397	keep object active in kinematic mode, also	2015-10-16 10:53:33 -07:00
Howard Stearns	f25cc93936	Initial prototype of exposing anim vars to javascript.	2015-10-16 10:48:36 -07:00
Seth Alves	966499b9e5	continually activate (in the bullet sense) a held object	2015-10-16 10:17:17 -07:00
Seth Alves	d2b7e5c4eb	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-16 09:54:26 -07:00
Ryan Huffman	9ddcfdf94d	Cleanup PacketReceier and ReceivedMessage	2015-10-16 09:21:10 -07:00
Seth Alves	b18bb1e076	Merge pull request #6084 from AndrewMeadows/physics-cleanup move DIRTY_FLAGS out of EntityItem namespace	2015-10-16 07:22:40 -07:00
Seth Alves	359a318568	fold kinematic hold into normal hold (disabled by default, an argument enables)	2015-10-15 20:23:06 -07:00
Seth Alves	0964180f2c	code review	2015-10-15 17:10:47 -07:00
Stephen Birarda	e5825daa57	Merge pull request #6090 from ZappoMan/fixStat Add some additional stats for debugging edit lags	2015-10-15 16:00:29 -07:00
Ryan Huffman	421e2a6c21	Merge pull request #6078 from imgntn/top_tool_tabs Move Edit.js Tool Window Tabs to the Top	2015-10-15 15:40:42 -07:00
James B. Pollack	aee11d4c06	cleanup merge	2015-10-15 15:05:34 -07:00
James B. Pollack	112007e5a9	cleanup	2015-10-15 14:58:05 -07:00
Seth Alves	462918ffcf	cleanups	2015-10-15 14:55:17 -07:00
Seth Alves	487131dde1	cleanups	2015-10-15 14:52:38 -07:00
Seth Alves	36a523478f	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-15 14:21:30 -07:00
Seth Alves	4903db45b1	give other avatars an anim-skeleton	2015-10-15 14:21:06 -07:00
James B. Pollack	8b57b3c0ff	fix memory leak	2015-10-15 14:13:07 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Andrew Meadows	3d17c57910	Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes Groundwork for hold action changes	2015-10-15 13:30:02 -07:00
James B. Pollack	e63ed5cf84	Merge pull request #6087 from thoys/20708 CR for Job #20708 - Script Editor Improvements	2015-10-15 12:28:32 -07:00
Brad Davis	80c962a4cc	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub	923e1ed208	add more processing stats	2015-10-15 12:21:36 -07:00
Seth Alves	a70ba4cd5a	add some accessors	2015-10-15 11:42:53 -07:00
Seth Alves	1d8db13f41	switch to low-entity-server traffic hold	2015-10-15 10:56:47 -07:00
Seth Alves	64c5cde2d2	further unmangle branch split	2015-10-15 10:33:58 -07:00
Seth Alves	a78728c96b	further unmangle branch split	2015-10-15 10:29:25 -07:00
Seth Alves	8195145dc7	further unmangle branch split	2015-10-15 10:13:00 -07:00
Seth Alves	d833fb08d7	further unmangle branch split	2015-10-15 10:03:32 -07:00
Andrew Meadows	2ae62de84e	Merge pull request #6026 from birarda/qt-polling-env set bearer poll timeout env for wlan scan in Qt 5.5	2015-10-15 09:58:32 -07:00
Andrew Meadows	fa17b77d70	move DIRTY_FLAGS out of EntityItem namespace	2015-10-15 09:34:09 -07:00
Seth Alves	c96f7562f2	Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes	2015-10-15 09:28:57 -07:00
Seth Alves	7ef5fc9613	remove line that leaked over from other branch	2015-10-15 09:19:47 -07:00
Seth Alves	9f40c7bf8c	fix up AvatarActionHold	2015-10-15 09:13:06 -07:00
Seth Alves	5ebefadda1	remove some debugging	2015-10-15 09:07:35 -07:00
Thijs Wenker	8111432088	Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX	2015-10-15 14:50:20 +02:00
James B. Pollack	c8b6fed0e0	Update ToolWindow.cpp	2015-10-14 21:18:17 -07:00
James B. Pollack	84973c590d	Update ToolWindow.h	2015-10-14 21:17:19 -07:00
James B. Pollack	c18aeef6b3	remove redundant call	2015-10-14 17:29:38 -07:00
James B. Pollack	a1e2292e62	remove title bar from docked tool widgets	2015-10-14 17:27:45 -07:00
Clément Brisset	efd106e68c	Merge pull request #6075 from birarda/default-asset-server add a migrator to move assets to ATP	2015-10-14 17:02:10 -07:00
Brad Davis	e39219c2b5	Fixes and PR comments	2015-10-14 16:51:52 -07:00
Brad Davis	0063f9ae1d	Merging old and new controller interfaces	2015-10-14 15:16:54 -07:00
James B. Pollack	536351e9d5	move set tab position to constructor	2015-10-14 15:10:04 -07:00
Anthony J. Thibault	3e7a6fd490	Change to boom offset for 3rd person HMD camera. Previously the boom offset was computed in HMD sensor space instead of world space, so it did not play well with the vive, or the oculus if you weren't facing the camera directly. Now it is computed in world space, and is always behind the character's position/orientation. This can cause the boom to swing if the character rotation changes but now the avatar rotation in HMD uses comfort mode. It's not that disorienting.	2015-10-14 14:43:59 -07:00
Seth Alves	21519c6418	debugging	2015-10-14 14:13:08 -07:00
Seth Alves	5ce39b74fd	debugging	2015-10-14 13:58:19 -07:00
James B. Pollack	d45f48c8cd	fixbug	2015-10-14 13:55:04 -07:00
James B. Pollack	815b263954	convert tabs to spaces	2015-10-14 13:26:19 -07:00
Thijs Wenker	7df5ba01e6	JSConsole: executeCommand works async now	2015-10-14 22:21:51 +02:00
Seth Alves	9937b6a3ef	quiet some debugging	2015-10-14 13:12:11 -07:00
Seth Alves	d72152da87	more locking	2015-10-14 13:01:56 -07:00
Seth Alves	07a4dc3a7f	more lock fixing	2015-10-14 12:49:06 -07:00
Seth Alves	fa2bf2b2d9	tighten up locking in actions	2015-10-14 11:43:03 -07:00
Thijs Wenker	96b6067d88	ScriptEditor Improvements: - Script restart works proper again - Fixed on and off icon switch - Replaced regular script output box with fully functional JSConsole!	2015-10-14 20:37:47 +02:00
James Pollack	7a8db803eb	move toolwindow tabs to the top	2015-10-14 19:35:37 +01:00
Thijs Wenker	880d34d483	JSConsole improvements - ability to set Script Engine - clear function for clearing the output - only show evaluation output for executeCommand, print() and error output is still being printed	2015-10-14 20:35:15 +02:00
Brad Davis	f051a84dc6	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-14 10:54:32 -07:00
Seth Alves	698a4001a8	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-14 06:18:02 -07:00
Seth Alves	742cc0f511	rename a function	2015-10-14 06:17:55 -07:00
Thijs Wenker	660bf6b3ea	ScriptEditor: single quotes support and spelling fix	2015-10-14 14:47:29 +02:00
Brad Davis	0c31fb1b1b	Merge pull request #6069 from ZappoMan/controllers Hack in NewControllers into the JS layer of interface to allow testing	2015-10-13 19:08:26 -07:00
Anthony J. Thibault	1c1221597d	Merge branch 'master' into tony/turn-hips-while-moving	2015-10-13 18:38:27 -07:00
Anthony J. Thibault	e484a904a2	Rotate the avatar to align with the HMD while moving MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because it was getting quite large and becoming hard to follow. * beginStraighteningLean() - can be called when we would like to trigger a re-centering action. * shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action. for now it encapulates the capsule check. * processStraighteningLean() - performs the actual re-centering calculation. New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises over a threshold. Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis of 100ms. This hysteresis should help smooth over two issues. 1) When the delta position is 0, because the physics timestep was not evaluated. 2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.	2015-10-13 17:36:00 -07:00
Andrew Meadows	073b019458	Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup Don't reload/recenter some avatar data on startup	2015-10-13 17:08:00 -07:00
Stephen Birarda	d84994d8e0	fix casing for ubuntu include failure	2015-10-13 17:04:45 -07:00
Stephen Birarda	2caa7f6d64	change getUrl to getATPUrl, use in ATPAssetMigrator	2015-10-13 16:56:20 -07:00
Stephen Birarda	574089530a	make sure request is not nullptr before using it	2015-10-13 16:49:12 -07:00
Stephen Birarda	d22c602041	use categorized logging in ATPAssetMigrator	2015-10-13 16:44:13 -07:00
Stephen Birarda	cc93767077	remove some extra spaces	2015-10-13 16:38:00 -07:00
Seth Alves	4402242c3c	allow an action to suppress sending of physics related edits to the entity-server	2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub	8a2e23cae4	CR feedback	2015-10-13 16:20:52 -07:00
Seth Alves	2ecb7e8d29	fix bug that was making action deletes fail	2015-10-13 16:19:12 -07:00
Stephen Birarda	1450305390	fix ATP url scheme constant	2015-10-13 16:13:47 -07:00
Stephen Birarda	fc82ea8541	resolve conflicts on merge with upstream/master	2015-10-13 16:12:54 -07:00
Stephen Birarda	549043f255	add an option to bulk upload assets in ATPAssetMigrator	2015-10-13 15:20:37 -07:00
Seth Alves	4fa85441b8	tweak	2015-10-13 15:14:34 -07:00
Brad Hefta-Gaub	ad96d76921	implement comfort mode hack	2015-10-13 15:06:11 -07:00
Seth Alves	257e3845de	get action type correct	2015-10-13 14:45:20 -07:00
Seth Alves	fcbb107bc0	tweak	2015-10-13 14:13:53 -07:00
Seth Alves	8b72f6e7c6	tweak	2015-10-13 13:50:43 -07:00
Howard Stearns	93e908a592	Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.	2015-10-13 12:15:13 -07:00
Seth Alves	7c52849740	change how hold action works	2015-10-13 11:36:58 -07:00
Stephen Birarda	65976f7891	add saving of entity file to ATPAssetMigrator	2015-10-13 10:51:57 -07:00
Stephen Birarda	cf74cfb50e	add an ATPAssetMigrator for bulk ATP migration	2015-10-13 10:38:52 -07:00
James B. Pollack	8d9bcbd793	Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle Remove overlay hiding from middle mouse button.	2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub	8e8ba15aaa	Merge pull request #6065 from sethalves/reorder-sims grab changes	2015-10-13 08:35:38 -07:00
Andrew Meadows	25685f97eb	Merge pull request #6062 from howard-stearns/fix-startup-position-failure fix-startup-position-failure	2015-10-13 08:34:33 -07:00
Ryan Huffman	9a9bdbbc44	hack in mappings to interface	2015-10-12 17:59:58 -07:00
Anthony J. Thibault	6a8ff676ed	Remove overlay hiding from middle mouse button. Because it conflicts with edit.js camera panning. You can still toggle the overlay via the O key.	2015-10-12 17:33:27 -07:00
Seth Alves	ed9907ce66	do avatar simulation before physics simulation so that physics actions can update based on avatar	2015-10-12 16:23:12 -07:00
Howard Stearns	6cbeb6e7c3	Fix my bug, introduced in PR#6012, in which startup position goto got cancelled out.	2015-10-12 15:40:16 -07:00
Atlante45	cfba5752ce	Change checkbox text	2015-10-12 15:03:37 -07:00
Atlante45	51acf07c15	Factor couple methods in AssetUtils	2015-10-12 15:03:37 -07:00
Atlante45	eea89ba010	CR - Rename method	2015-10-12 14:26:28 -07:00
Atlante45	7b41efcf86	All file types eligible for upload to asset server	2015-10-12 13:35:21 -07:00
Thijs Wenker	309b381bab	Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX	2015-10-12 18:51:18 +02:00
Brad Hefta-Gaub	0986f86c34	implement StandardController and expose it to JS as Controller.Standard.*	2015-10-11 14:55:07 -07:00
Thijs Wenker	7d3b300037	Fix set avatar rotations from scripts (different tread)	2015-10-11 14:51:12 +02:00
Brad Hefta-Gaub	ded677e90f	Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface	2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub	25481e0a25	Merge pull request #6038 from Atlante45/asset-drop Asset file drop	2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub	63f3156a61	add Controler.Actions	2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub	f55b6115d6	cleanup sanatize name function	2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub	5c5ee8d699	remove debug code	2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub	d3ee9b0f39	more work on exposing device inputs as JavaScript named constants	2015-10-09 20:58:23 -07:00
Brad Hefta-Gaub	37f530f97f	first cut at wiring up devices and inputs to JS	2015-10-09 16:15:29 -07:00
Anthony J. Thibault	0c489e3afd	MyAvatar: Rename new instance variable after merge.	2015-10-09 14:46:05 -07:00
Anthony J. Thibault	b5ba621f78	Merge branch 'master' into tony/hmd-rest-detection	2015-10-09 14:36:18 -07:00
Howard Stearns	700835a6d1	Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset	2015-10-09 13:13:22 -07:00
Atlante45	ae83dfe041	Move auto-resize to update	2015-10-09 12:23:19 -07:00
Atlante45	e056743621	Check for upload rights	2015-10-09 12:23:19 -07:00
Atlante45	2229f942df	Spawn fbx dropped in front of avatar	2015-10-09 12:23:19 -07:00
Atlante45	a1c154e7be	Fix compile error	2015-10-09 12:23:19 -07:00
Atlante45	b666acdb26	Add fbx upload on drop	2015-10-09 12:23:19 -07:00
Atlante45	2d12b2ba9a	Spacing	2015-10-09 12:23:19 -07:00
Atlante45	327154b0c0	Make _acceptedExtensions static const	2015-10-09 12:23:19 -07:00
Howard Stearns	652376db8a	Kill the stuff we can't do yet.	2015-10-08 21:44:45 -07:00
Stephen Birarda	7987595dcd	set the bearer poll timeout for wlan scan in Qt 5.5	2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub	e1b69a1704	Merge pull request #6022 from jherico/lisa Fix mouse events for entity scripts	2015-10-07 20:43:41 -07:00
Brad Davis	50592a87a6	Fix mouse events for entity scripts	2015-10-07 19:44:08 -07:00
Howard Stearns	bd0d1eaef6	Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset	2015-10-07 18:35:52 -07:00
Brad Hefta-Gaub	a86e34f9f9	Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements Separated AvatarMixer inbound and outbound bandwidth on stats overlay	2015-10-07 16:04:13 -07:00
Andrew Meadows	ef58238c66	Merge pull request #6017 from ZappoMan/animationGroupSettings fix a bunch of warnings	2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub	ae93c020be	Merge pull request #5994 from Atlante45/display_name Display name in terms of arc size not pixels	2015-10-07 15:40:30 -07:00
Anthony J. Thibault	0cebeb7fe9	Separated AvatarMixer inbound and outbound bandwidth on stats overlay Also, small bug fix to BandwidthRecorder. It would incorrectly calculate outbound pps if the input pps was 0.	2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub	c6d50af085	Merge pull request #5999 from AndrewMeadows/save-sixense-settings Save hydra calibration settings	2015-10-07 15:27:06 -07:00
Atlante45	fb284448b5	Raise display name not to collide with heads	2015-10-07 15:21:35 -07:00
Atlante45	efeeaa7ea7	Make display names 25% smaller	2015-10-07 15:14:06 -07:00
Atlante45	14a1860670	Do not change keyhole radius	2015-10-07 14:55:18 -07:00
Atlante45	fd6f0213ef	CR	2015-10-07 14:55:18 -07:00
Atlante45	79b280f733	Update getDisplayNamePosition debug	2015-10-07 14:55:18 -07:00
Atlante45	91b46203f3	Don't take keyhole into account	2015-10-07 14:55:17 -07:00
Atlante45	946d289a99	Display name have a arc size instead of pixel size	2015-10-07 14:55:17 -07:00
Brad Hefta-Gaub	bfd014203e	fix a bunch of warnings	2015-10-07 14:48:42 -07:00
Andrew Meadows	0680be0422	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
Andrew Meadows	039d9a6a98	Merge pull request #6010 from ZappoMan/disableHandMouseByDefault Disable hand mouse by default	2015-10-07 14:15:58 -07:00
Thijs Wenker	ad5a6fac62	- applying of new qApp accessing method. - Some magic constant replacements with Helper "glm::vec3(matrix[3])" -> "extractTranslation(matrix)"	2015-10-07 15:10:40 +02:00
Thijs Wenker	4ab5e0af84	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub	05fd62ac51	Merge pull request #6009 from jherico/homer Enabling programmatic access to the IPD scale	2015-10-07 01:43:10 -07:00
Brad Davis	eff5a4c395	Picking fixes in the HMD	2015-10-06 22:56:48 -07:00
Howard Stearns	1fc305ca6b	Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars.	2015-10-06 20:51:53 -07:00
Anthony J. Thibault	2dabe69341	When HMD is at rest, re-center the body under the avatar. This should help the case when a user avatar is stuck in an uncomfortable pose for a long period of time. If they stop moving their head, the body should recenter itself and appear more natural. Added an AtRestDetector class. That tracks the average and variance of both position and rotation (quaternion logarithms), then detects when the variance falls under a threshold. Also, renamed variables with the straighting prefix to straightening.	2015-10-06 20:37:51 -07:00
Brad Davis	028935f831	Removing deprecated function usage	2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub	6e5847bb1c	make Hand Input Mouse off by default	2015-10-06 19:58:25 -07:00
Brad Davis	bac69c73a8	Fixing bug in application compositor transform	2015-10-06 19:08:44 -07:00
Brad Davis	19fb4e92a6	Enabling programmatic access to the IPD scale Conflicts: interface/src/Application.cpp interface/src/avatar/MyAvatar.cpp interface/src/scripting/HMDScriptingInterface.cpp interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:08:17 -07:00
Thijs Wenker	6e52fcb857	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-07 03:11:24 +02:00
Brad Hefta-Gaub	02bb372c27	Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame IK targets specified in the skeleton's model-frame	2015-10-06 17:34:42 -07:00
Andrew Meadows	224fc55033	put IK targets in skeleton's model-frame	2015-10-06 16:49:29 -07:00
Atlante45	76e0006732	Remove forgotten cursorVisible	2015-10-06 15:58:35 -07:00
Howard Stearns	db955d894f	Align avatar body to head on reset.	2015-10-06 14:52:53 -07:00
Atlante45	8a7871e15b	rebase fix	2015-10-06 14:13:28 -07:00
Atlante45	ed13c02075	Fix rebase	2015-10-06 13:57:51 -07:00
Atlante45	c745050dea	Fix QObject::connect warning	2015-10-06 13:57:51 -07:00
Atlante45	7b25c9d417	More header cleanup	2015-10-06 13:57:50 -07:00
Atlante45	775994f9d0	Fix for 3DConnection	2015-10-06 13:57:49 -07:00
Atlante45	b63df98b8b	More unused	2015-10-06 13:57:49 -07:00
Atlante45	17edd38cb9	Remove unused variables	2015-10-06 13:57:48 -07:00
Atlante45	39e0d0e1dc	Put timers on the stack	2015-10-06 13:56:26 -07:00
Atlante45	e9b7125894	Misc cleanup	2015-10-06 13:56:26 -07:00
Atlante45	5e9425d9eb	Fix view frustum preference	2015-10-06 13:56:25 -07:00
Atlante45	60ebd3a544	Remove unused members (Mostly mouse stuff)	2015-10-06 13:56:25 -07:00
Atlante45	35e2f8cd89	Removed _myAvatar from Application	2015-10-06 13:56:25 -07:00
Atlante45	2fc80e58b6	Fix warning	2015-10-06 13:56:24 -07:00
Atlante45	9827c90851	Rebase fixes	2015-10-06 13:56:24 -07:00
Atlante45	ba5c20b7a6	Header cleanup	2015-10-06 13:56:24 -07:00
Atlante45	9c7a480fda	Remove shadowMatrices/Distances	2015-10-06 13:56:23 -07:00
Atlante45	8c653c70fb	Remove fps throttle from Application	2015-10-06 13:56:23 -07:00
Atlante45	4ccc2bbcd0	Enclose entire functions in ifdef	2015-10-06 13:56:23 -07:00
Atlante45	dde11c5cd1	More unused	2015-10-06 13:56:23 -07:00
Atlante45	34bba28775	More header cleanup	2015-10-06 13:56:22 -07:00
Atlante45	f55f146d1b	More code cleanup	2015-10-06 13:56:22 -07:00
Atlante45	38f23ef79e	Remove Application friend	2015-10-06 13:56:22 -07:00
Atlante45	311edabe51	More header cleanup	2015-10-06 13:56:21 -07:00
Atlante45	765608d0ff	More unused	2015-10-06 13:56:21 -07:00
Atlante45	7da55747f5	Simplify friends window	2015-10-06 13:56:21 -07:00
Atlante45	77a7814854	Move sendPingPackets	2015-10-06 13:56:20 -07:00
Atlante45	e74df484cc	Remove unused methods	2015-10-06 13:56:20 -07:00
Atlante45	a5f31dba5f	Fix startup timer	2015-10-06 13:56:20 -07:00
Atlante45	0aab013a0e	Remove unused members	2015-10-06 13:56:20 -07:00
Atlante45	92e974929c	Move tray icon to MainWindow	2015-10-06 13:56:19 -07:00
Atlante45	0f18db886c	Remove 4 Application static methods - Replace by lambda - Cleaned up global scope	2015-10-06 13:56:19 -07:00
Atlante45	cf3b33a96b	Replace Application::getInstance() with qApp	2015-10-06 13:56:19 -07:00
Thijs Wenker	4e8fc08458	made the changes as suggested by @hyperlogic	2015-10-06 20:48:51 +02:00
Thijs Wenker	3c6e9378c3	fixes merge issues	2015-10-06 20:20:37 +02:00
Thijs Wenker	953ff6caa7	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/Application.cpp interface/src/scripting/HMDScriptingInterface.h libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h	2015-10-06 20:06:29 +02:00
Thijs Wenker	f6afb4cb02	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:56:22 +02:00
Andrew Meadows	2c276bb13e	Merge pull request #5986 from sethalves/kinematic-grab Kinematic grab	2015-10-06 10:30:06 -07:00
Brad Davis	8090bc8e8d	Revert "Enabling programmatic access to the IPD scale"	2015-10-06 10:16:42 -07:00
Seth Alves	8caa7abca6	assert that deltaTimeStep is always greater than zero	2015-10-06 09:35:54 -07:00
Seth Alves	5abaf38efd	include setVelocity in returned arguments	2015-10-06 09:24:18 -07:00
Seth Alves	18b5b994b4	include setVelocity in returned arguments	2015-10-06 09:23:38 -07:00
Seth Alves	febdb52b26	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-06 09:20:13 -07:00
Seth Alves	c3142ab90b	include setVelocity in returned arguments	2015-10-06 09:20:07 -07:00
Seth Alves	91f5a6fec6	make setting of rigid-body velocity controlled by an action argument	2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub	d95fe3ddb7	Merge pull request #5989 from jherico/homer Enabling programmatic access to the IPD scale	2015-10-05 17:22:19 -07:00
Clément Brisset	5eda3095bb	Merge pull request #5998 from birarda/qt-5.5 suppress warnings for overriden methods in Xcode 7	2015-10-05 17:00:43 -07:00
Thijs Wenker	dd59527763	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation	2015-10-06 01:35:29 +02:00
Stephen Birarda	25a1f2dd11	add override to suppress warning for PluginContainerProxy	2015-10-05 15:53:37 -07:00
Stephen Birarda	a2c9d7a4b2	add overrides for Avatar classes in Interface	2015-10-05 15:52:47 -07:00
Anthony Thibault	2a406481d4	Merge pull request #5992 from howard-stearns/reset-on-calibration Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 15:19:16 -07:00
Seth Alves	99be44f92d	smooth out vibrating appearance for kinematic hold	2015-10-05 14:58:42 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Howard Stearns	844270e306	Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 12:44:22 -07:00
Andrew Meadows	1ead20683c	Merge pull request #5976 from sethalves/fix-action-deletes Fix action deletion/addition when more than one interface are involved	2015-10-05 12:31:01 -07:00
Seth Alves	993111d22f	code review	2015-10-05 11:28:59 -07:00
Seth Alves	8c25f2e16c	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-05 09:09:01 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
Thijs Wenker	8befade007	expose position and orientation of HMD to Javascript. - HMD.orientation - HMD.position	2015-10-04 15:08:35 +02:00
Seth Alves	6a770a870b	set correct type in kinematic hold	2015-10-02 17:31:45 -07:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
Howard Stearns	fdba55e56e	Merge pull request #5973 from ctrlaltdavid/20698 Fix Reload Content menu item not reloading FST files	2015-10-02 16:43:11 -07:00
Seth Alves	cf8955a8c5	kinematic grab	2015-10-02 15:27:01 -07:00
Howard Stearns	f6665a4ac6	Merge pull request #5839 from sethalves/transmit-joint-translation WARNING protocol change: Transmit joint translation	2015-10-02 13:37:56 -07:00
Anthony J. Thibault	c0be32d359	Fix for model offset when using Rig Animations.	2015-10-02 11:40:46 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub	4c556dd43a	Merge pull request #5962 from samcake/calvin Rendering the background elements after opaque and only work on the far pixels	2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub	c6c430ca76	Merge pull request #5977 from jherico/marge Fixing 2D overlay mouse interaction	2015-10-02 11:11:04 -07:00
Anthony J. Thibault	a1b54945d6	Compute the model offset in the rig, using the bind pose of the hips.	2015-10-02 10:34:34 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
samcake	71ad6195f2	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-10-01 19:25:25 -07:00
Anthony J. Thibault	fa864d29f9	Merge branch 'master' into transmit-joint-translation	2015-10-01 16:55:24 -07:00
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -07:00
David Rowe	2fbb436bc5	Fix Reload Content menu item	2015-10-01 12:42:23 -07:00
Brad Hefta-Gaub	066e25bb4a	Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes Bug fix for deriveBodyFromHMDSensor calculations	2015-09-30 16:54:59 -07:00
Anthony J. Thibault	d993d39718	Bug fix for deriveBodyFromHMDSensor calculations The calculation that determined where the body position relative to the HMD was incorrect, one of the components was in the wrong coordinate frame. Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips. Use these offsets to calculate where the hips should be given a specific hmd position and orientation. Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing certain named joints, such as, "LeftEye", "Neck" and "Head".	2015-09-30 16:28:33 -07:00
samcake	6b86f21491	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-09-30 15:54:39 -07:00
samcake	75e858cd13	Putting together the stencil buffer for opaque vs background and using it for the backgroud render items	2015-09-30 15:54:03 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub	76825c2be7	only show hand cursors when menu is enabled	2015-09-30 09:06:45 -07:00
Seth Alves	58d98d3ce4	Merge pull request #5932 from howard-stearns/default-animation-and-quieter Set default animation and quiet state logging	2015-09-29 16:12:28 -07:00
Seth Alves	d554eb8db9	avatar collisions are off during a grab	2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00
Seth Alves	d0a1e206ca	Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation	2015-09-29 13:55:13 -07:00
Seth Alves	f7b34f63c1	try calling updateMotionBehaviorFromMenu	2015-09-29 13:40:54 -07:00
Howard Stearns	745a59af1c	Default animation is anim graph. Remove state change logging from animation graph state machine.	2015-09-29 12:48:57 -07:00
Eric Levin	e8e9957846	Merge pull request #5911 from ZappoMan/rayIntersectionWork adding surface normals to ray intersection	2015-09-28 17:21:40 -07:00
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

... 11 12 13 14 15 ...

14351 commits