18167 commits

Author	SHA1	Message	Date
Zach Pomerantz	c62967a57b	add secs per hour	2016-06-28 12:38:00 -07:00
Howard Stearns	de7738e644	Merge pull request #8134 from highfidelity/vive-ui ... Vive UI bug fixes	2016-06-24 18:39:06 -07:00
Sam Gondelman	3c809ef40c	Merge pull request #8123 from AlexanderOtavka/first-person-hmd ... Automatically enter first person when in HMD mode	2016-06-24 15:58:38 -07:00
Ken Cooke	36ebe4a4f6	Merge pull request #8125 from ZappoMan/simplifyResamplerUse ... cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler	2016-06-24 15:43:04 -07:00
Brad Hefta-Gaub	2e8f6c2cc6	Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject ... cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-24 14:08:29 -07:00
howard-stearns	6a1dd235c9	Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui	2016-06-24 12:49:54 -07:00
samcake	61f5088ef3	Merge pull request #8130 from jherico/qml_window_visibility ... Fix initial visibility of QML windows from scripts	2016-06-24 12:42:17 -07:00
Brad Hefta-Gaub	4510bb1674	Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats ... add heartbeats to metaverse for temporary domains	2016-06-24 12:08:37 -07:00
Zander Otavka	d45694836f	Add signal for display mode change in HMD	2016-06-24 11:57:12 -07:00
Brad Davis	a095da31fd	Fix initial visibility of QML windows from scripts	2016-06-24 11:48:55 -07:00
howard-stearns	f8391f0062	fix reticle bugs	2016-06-23 16:51:15 -07:00
Seth Alves	2fd38c1585	when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree	2016-06-23 13:10:15 -07:00
Brad Hefta-Gaub	da74114b32	Merge pull request #8070 from AndrewMeadows/triangle-soup-4 ... support btBvhTriangleMeshShape for static mesh entities	2016-06-23 12:17:32 -07:00
Brad Hefta-Gaub	6111e4952a	fix comments	2016-06-23 10:59:26 -07:00
Andrew Meadows	1d8d1240ca	remove override to avoid new Jenkins OSX warnings	2016-06-23 10:38:46 -07:00
Seth Alves	03b55e6a64	Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject	2016-06-23 10:33:31 -07:00
Brad Hefta-Gaub	c0be9aec6a	cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler	2016-06-23 10:28:29 -07:00
howard-stearns	581d87d653	feedback re magic numbers and variable name.	2016-06-22 16:40:10 -07:00
howard-stearns	67f76db7e4	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-22 15:58:53 -07:00
Andrew Meadows	e5b89ebd17	bump version number	2016-06-22 15:33:44 -07:00
Andrew Meadows	8009d23f70	more STATIC_MESH and dynamic overlap prevention	2016-06-22 15:20:45 -07:00
Zach Pomerantz	eebf8e91c6	add api_key to domains/public_key updates	2016-06-22 12:02:35 -07:00
Zach Pomerantz	3a36b0a2e5	add temporary domain info to account info	2016-06-22 12:02:35 -07:00
Seth Alves	c62b73bf61	when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree	2016-06-22 11:42:57 -07:00
Seth Alves	fbfb6f169b	Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject	2016-06-22 10:02:12 -07:00
howard-stearns	e4dbb5e61a	Make mouse reticle be perpendicular to head.	2016-06-22 09:57:38 -07:00
Andrew Meadows	e88b264864	revert compound hull shape generation	2016-06-22 09:30:44 -07:00
Ryan Huffman	847685d224	Add tracking of away.js	2016-06-22 09:06:59 -07:00
Ryan Huffman	890de1bfea	Add went-to user activity back in	2016-06-22 08:54:58 -07:00
Ryan Huffman	a7f30ced29	Fix infinite recursion in PluginManager	2016-06-21 21:39:40 -07:00
howard-stearns	d6095d1f11	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-21 16:52:22 -07:00
Seth Alves	9ca27f267d	cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-21 16:48:04 -07:00
Ryan Huffman	4e52521f8c	Update UserActivityLogger device blacklist	2016-06-21 16:43:16 -07:00
Ryan Huffman	70be7b3273	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
Ryan Huffman	da71fcb57f	Update connected device detection implementation	2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub	d9e8026cd6	Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion ... fix setting velocity of inactive kinematic RigidBody	2016-06-21 16:32:04 -07:00
howard-stearns	8421931c56	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-21 14:47:45 -07:00
Andrew Meadows	702e83ba6a	prevent incompatible entity properties combos	2016-06-21 14:03:21 -07:00
Andrew Meadows	4c9ec7ca43	protect physics against bad entity properties	2016-06-21 13:55:11 -07:00
Andrew Meadows	937bd0c1be	SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH	2016-06-21 13:54:21 -07:00
Ryan Huffman	0ea9c5c26d	Fix getMemoryInfo not returning false on non-Windows	2016-06-21 13:32:17 -07:00
Ryan Huffman	6c2c7f1eec	Fix connected_device user activity event	2016-06-21 13:28:40 -07:00
Brad Hefta-Gaub	160a5de271	CR feedback	2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub	c322317878	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00
Andrew Meadows	31706a3909	force activate kinmatic objects when necessary	2016-06-21 10:38:44 -07:00
samcake	117a39d52a	Merge pull request #8103 from SamGondelman/compileShaderFix ... Reduce GLShader::compileShader log spam	2016-06-21 10:30:05 -07:00
Andrew Meadows	f22a5613bd	fix static mesh for model with per-mesh transforms	2016-06-20 17:29:20 -07:00
Andrew Meadows	5484b6fbb7	more correct extraction from triangle strips	2016-06-20 17:29:20 -07:00
Andrew Meadows	c0c77e9027	optimize/cleanup compound/mesh shape computation	2016-06-20 17:29:20 -07:00
Andrew Meadows	f444b70fdc	fix collision shape for scaled models	2016-06-20 17:29:20 -07:00