11752 commits

Author	SHA1	Message	Date
Seth Alves	1b92ae95d7	put glm:: before vec3	2015-09-04 09:41:53 -07:00
Seth Alves	72322c0270	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub	762bed8223	Merge pull request #5715 from jherico/apu ... Fix mirror to display on Oculus	2015-09-04 09:06:40 -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	127271110c	Merge pull request #5714 from jherico/lisa ... Magballs polish	2015-09-04 08:48:15 -07:00
Seth Alves	fff3da0cc3	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-04 07:17:01 -07:00
Raffi Bedikian	6b2897ca8f	Fix AA bugs with display plugins and mini-mirror	2015-09-03 23:11:53 -07:00
Brad Davis	4a28361e05	Fix mirror to display on Oculus	2015-09-03 22:12:21 -07:00
Brad Davis	0f70797ab4	Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes ... fix a bug in entity script includes and file based includes on windows	2015-09-03 21:21:42 -07:00
Brad Davis	c8069ba73c	Working on magballs polish	2015-09-03 20:09:54 -07:00
Brad Hefta-Gaub	b0f239b89d	also make sure local file includes work for non-entity scripts	2015-09-03 19:06:26 -07:00
Brad Hefta-Gaub	063320771c	fix a bug in entity script includes and file based includes on windows	2015-09-03 16:37:24 -07:00
Seth Alves	e12b7807ad	merge from upstream	2015-09-03 16:36:04 -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
Seth Alves	218521fc02	put AVATAR_MIN_ROTATION_DOT back to previous value	2015-09-03 16:08:46 -07:00
Seth Alves	0c8848a463	don't update _lastSendJointData if we didn't send	2015-09-03 15:41:40 -07:00
Brad Hefta-Gaub	3984dc9ecd	Merge pull request #5682 from jherico/bart ... Add common vector constants to JS, add some missing Quat functionality	2015-09-03 14:51:02 -07:00
Seth Alves	1071b98260	fix differential avatar-joint sending to work if more than 2 avatars are in the domain	2015-09-03 14:38:46 -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
Brad Davis	8dc3905767	Add common vector constants to JS, add some missing quaternion functionality	2015-09-03 11:51:35 -07:00
Seth Alves	07b241c778	code review	2015-09-03 11:05:44 -07:00
Andrew Meadows	cd1dac50ad	Merge pull request #5687 from howard-stearns/delete-collision-sounds-after-use ... Delete collision sounds (and their threads) after use.	2015-09-03 09:59:02 -07:00
Seth Alves	bb96ad1346	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-03 09:38:58 -07:00
Brad Davis	2901155a7b	Fix Oculus mirroring to window	2015-09-02 18:28:44 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -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
Seth Alves	f20ce12091	Merge branch 'test-5685' of github.com:sethalves/hifi into polyvox-again	2015-09-02 16:30:55 -07:00
Seth Alves	f1bb7fb67f	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-02 16:30:48 -07:00
Seth Alves	2fe6e9c317	use AABox's ray intersection code rather than the goofed-up version that was here	2015-09-02 16:30:11 -07:00
Eric Levin	d55c92780c	Merge pull request #5704 from AndrewMeadows/erbium ... fix for Controller.getSpatialControlNormal()	2015-09-02 16:30:01 -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	c61bc190de	fix finger and palm-normal directions for JS	2015-09-02 14:16:02 -07:00
Raffi Bedikian	2d95d1c236	Fix various whitespace issues	2015-09-02 13:49:21 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Seth Alves	3e11852845	Merge pull request #5685 from howard-stearns/standing-hmd-animations ... Standing hmd animations	2015-09-02 10:57:45 -07:00
Seth Alves	849477ac12	Merge branch 'standing-hmd-animations' of github.com:howard-stearns/hifi into test-5685	2015-09-02 10:52:30 -07:00
Seth Alves	16ee5199e8	change how polyvox neighbors are notified of updates	2015-09-02 09:30:32 -07:00
Raffi Bedikian	9318661bc3	Add algorithm comments to FXAA shader	2015-09-01 23:54:48 -07:00
Seth Alves	3963035599	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 21:08:23 -07:00
Andrew Meadows	dd2f94bc88	Merge pull request #5696 from birarda/sixense-fix ... fix for sixense compile when not present	2015-09-01 19:56:03 -07:00
Seth Alves	8608e4f2b0	small bug-fixes	2015-09-01 16:51:55 -07:00
Seth Alves	9256917f15	rebake mesh when a neighbor changes	2015-09-01 16:21:12 -07:00
Seth Alves	264d39aa9b	have knitted polyvoxes keep track of low-axis neighbors as well as high	2015-09-01 14:49:17 -07:00
Stephen Birarda	9a4d666b0c	no consts if HAVE_SIXENSE not set	2015-09-01 15:33:54 -06:00
Stephen Birarda	2ce225d76c	fix for sixense not present on OS X	2015-09-01 15:33:46 -06:00
Andrew Meadows	4a7a384c65	avoid bad joints when computing bounding capsule	2015-09-01 14:12:14 -07:00
Seth Alves	7194700c0b	pull from upstream	2015-09-01 13:39:33 -07:00
Seth Alves	e32b9191f5	bump AvatarData protocol version	2015-09-01 13:35:58 -07:00
Seth Alves	6f80c484b4	cleanups	2015-09-01 13:33:19 -07:00