30645 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	3424071a33	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-08-31 11:17:46 -07:00
Howard Stearns	2dbfa5ce9f	Be more uniform in deciding animation movement, and incorporate HMD standing mode (which sets position, but not velocity).	2015-08-31 11:10:05 -07:00
Howard Stearns	a907c5757b	Do not reset animation frame when restarting while we're fading out. ... Keeps it smooth if we're oscillating on some theshold between running and not.)	2015-08-31 11:09:28 -07:00
Anthony J. Thibault	77b857031b	Take timeScale into account during interps & setCurrentFrame()	2015-08-31 11:01:15 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Brad Davis	dc7d20ff86	Working on ui	2015-08-30 23:50:02 -07:00
Raffi Bedikian	ff2a58b3eb	Add FXAA effect class, modeled after AO effect	2015-08-30 20:49:03 -07:00
Raffi Bedikian	1001cf9000	Add shader files for FXAA	2015-08-30 20:48:06 -07:00
Raffi Bedikian	59a758b5ec	Add AA state to RenderContext and Menu	2015-08-30 20:38:05 -07:00
Brad Davis	9d07bf1585	Magballs: Removing entity scripts, using onUpdate	2015-08-30 19:20:47 -07:00
Seth Alves	41a2ff2fff	working on stitching marching-cube polyvoxs together	2015-08-30 18:42:15 -07:00
Seth Alves	64d0ce47f3	attempting to stitch polyvox entites together	2015-08-30 09:59:33 -07:00
Bennett Goble	6f4fc24fb6	NodeConnectionData QDataStream #include	2015-08-30 12:05:56 -04:00
Brad Davis	a574251173	Cleaning up and moving entity script	2015-08-29 23:06:23 -07:00
Brad Davis	cffb0be384	Removing edge finding calculations	2015-08-29 22:49:14 -07:00
Brad Davis	ebb530aaac	More magball work	2015-08-29 22:30:21 -07:00
Brad Davis	38b62108af	Magnetic sticks and balls	2015-08-28 23:35:43 -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
Seiji Emery	e0f6db2152	Coding style	2015-08-28 16:36:44 -07:00
James B. Pollack	08986dcb17	Merge pull request #5669 from ZappoMan/breakdanceToy ... first cut at breakdance toy	2015-08-28 16:36:00 -07:00
Brad Davis	f353d34479	Merge pull request #5680 from highfidelity/revert-5677-bart ... Revert "Add common vector constants to JS"	2015-08-28 16:27:31 -07:00
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -07:00
Seth Alves	f6fbf4f324	fix whitespace	2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub	1e2374da87	Merge pull request #5677 from jherico/bart ... Add common vector constants to JS	2015-08-28 13:43:13 -07:00
Seth Alves	7614cababb	adjust whitespace	2015-08-28 13:21:34 -07:00
Brad Davis	2aa1976b5d	Add common vector constants to JS, add some missing quaternionin functionality	2015-08-28 13:05:39 -07:00
Seth Alves	752c787f0b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-28 12:50:31 -07:00
Seth Alves	540af4afcb	remove unneeded call to computeShapeInfoWorker	2015-08-28 12:47:04 -07:00
Seth Alves	0ca9b60be5	Merge pull request #5671 from birarda/ice-server-crash ... don't read ice-server packets that are too small	2015-08-28 12:46:23 -07:00
Seth Alves	a5cd3ff046	release _threadRunning if decompressVolumeDataAsync exits early	2015-08-28 11:04:56 -07:00
Seiji Emery	c704fb7b12	Fixed to follow signal naming conventions, and added null check	2015-08-28 11:01:30 -07:00
Seth Alves	1ac5c19f44	if someone else changes a polyvox, we need to localy recompute the collision shape	2015-08-28 10:39:23 -07:00
Seiji Emery	9353eaf35a	Added signal to detect + close address bar when user clicks outside of it	2015-08-28 10:33:30 -07:00
Seth Alves	92b5fe3457	fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags	2015-08-28 10:31:28 -07:00
Seth Alves	0bcd6b8ec5	remove no-longer-used #define	2015-08-28 10:30:56 -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	21c6ba9bdf	updated avatar.json to match current gist.	2015-08-27 21:27:37 -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
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
Stephen Birarda	c5c73b7809	remove _ipd variable from OculusLegacyDisplayPlugin	2015-08-27 18:26:55 -07:00
Stephen Birarda	8ea20b5e5e	fix warning on string literal call to qFatal	2015-08-27 18:26:55 -07:00
Stephen Birarda	f7d32add0c	wrap OVR variables in ifdef for MAJOR_VERSION >= 6	2015-08-27 18:26:55 -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
Brad Hefta-Gaub	542b124146	first cut at breakdance toy	2015-08-27 16:12:33 -07:00
Stephen Birarda	b4e624a64d	don't read packets that are too small	2015-08-27 15:38:18 -07:00
Philip Rosedale	d0db56a4a6	Merge pull request #5667 from howard-stearns/rig-menu-toggle ... Rig Menu Toggle and new animations	2015-08-27 13:52:12 -07:00
David Rowe	c9d799f5e0	Auto refresh entities list upon display of Entities tab	2015-08-27 13:32:00 -07:00