11462 commits

Author	SHA1	Message	Date
Brad Davis	aba7bebf6e	Revert "Updating to the new version of the sixense library"	2015-08-19 09:44:51 -07:00
Brad Davis	86e21c91ba	Case issues again	2015-08-18 18:56:00 -07:00
Brad Davis	eba446e7f6	Updating to the new version of the sixense library	2015-08-18 18:55:59 -07:00
Andrew Meadows	9ee49c3e1e	Merge pull request #5551 from sethalves/quiet-compiler ... Quiet compiler	2015-08-18 09:54:29 -07:00
Brad Davis	5d65937120	Merge pull request #5583 from ZappoMan/clickToFocusWebEntity ... make web entity focus click based	2015-08-17 16:57:39 -07:00
Philip Rosedale	01108bdf6b	Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors ... Synchronize eye joint and debugging vectors	2015-08-17 16:56:01 -07:00
ZappoMan	ae9ccb79ed	cleanup debugging and dead code	2015-08-17 15:58:51 -07:00
ZappoMan	b7d9dc444b	more work on clicking focus	2015-08-17 13:06:32 -07:00
Seth Alves	1c8030472a	back out the more controversial changes	2015-08-17 12:40:56 -07:00
Brad Davis	db4d98ccb5	Polyvox shader fix	2015-08-16 23:21:45 -07:00
Brad Hefta-Gaub	34403c6242	Merge pull request #5564 from jherico/maggie ... Fix warning messages about depth and stencil buffers for the QML surfaces	2015-08-15 11:15:04 -07:00
Brad Hefta-Gaub	821063f6d2	Merge pull request #5575 from SamGondelman/sam/input-plugins ... Working on toybox script, squeezeHands, and default mappings	2015-08-15 10:59:04 -07:00
Anthony J. Thibault	cd58f012a3	Fix for ATI discrete graphics on 2015 macbook pro / mac pro. ... Fixed incorrect size for camera transform uniforms passed via glBindBufferRange. This is a legitimate bug on our side. I guess Intel and nVidia drivers just happen to ignore this field. This was likely causing many of the shader TransformCamera members to be identity or un-initialized, specifically, the projection matrix values. This was resulting in a black screen on ATI gpus.	2015-08-15 09:42:05 -07:00
Brad Davis	82310bb499	Attempting to fix rendering issues on 2015 Macs	2015-08-14 23:57:10 -07:00
Brad Hefta-Gaub	f76c663bb5	Merge pull request #5558 from AndrewMeadows/chromium ... coalesce scattered unit-test helper functions	2015-08-14 18:12:03 -07:00
Howard Stearns	d28c555a79	Synchronize eye joint and debugging vectors when the other avatar is looking at me.	2015-08-14 16:47:34 -07:00
Brad Davis	208e41efd1	WebEntity keyboard input with mouse hover	2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub	31a49a551a	Merge pull request #5556 from jherico/bart ... QML framerate improvments	2015-08-14 11:11:14 -07:00
Howard Stearns	9308e9df4f	Merge pull request #5458 from ctrlaltdavid/20639 ... CR for 20639 - Add SMI Rift eye tracker support	2015-08-13 10:06:15 -07:00
Howard Stearns	daae750d68	No symbolic names for non-entity contants.	2015-08-12 16:40:00 -07:00
David Rowe	c0439f123b	Merge branch 'master' into 20639	2015-08-12 16:34:53 -07:00
Brad Davis	0fa3044231	QML framerate improvments	2015-08-12 16:24:34 -07:00
Seth Alves	2dbbc5c184	Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data ... Warning: protocol change - Remove obsolete AvatarMixer wire data	2015-08-12 16:01:42 -07:00
Andrew Meadows	488f6aa7d8	fix bug in ElbowConstraint::apply()	2015-08-12 13:34:23 -07:00
Brad Hefta-Gaub	acf9933925	Merge pull request #5557 from jherico/marge ... Fixing crash in vive controllers	2015-08-12 12:45:57 -07:00
Brad Davis	0ff283d09e	Fixing crash in vive controllers	2015-08-12 12:24:53 -07:00
ZappoMan	0990229c64	cache calculation of aabox and aacubes	2015-08-11 18:05:22 -07:00
Howard Stearns	a5d8125aa7	Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.)	2015-08-11 17:53:49 -07:00
David Rowe	c060af0de5	Merge branch 'master' into 20639	2015-08-11 14:55:17 -07:00
Brad Davis	3595f6a8a0	Fixing bad success macro for the Oculus SDK on windows	2015-08-11 14:06:35 -07:00
David Rowe	e6473fc8b9	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.h tests/ui/src/main.cpp	2015-08-11 12:34:28 -07:00
Brad Davis	f539e95e53	Fixing includes	2015-08-11 12:02:40 -07:00
Bradley Austin Davis	e94cff594d	Working on breaking up transfers and draws	2015-08-11 12:02:39 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins ... New plugins architecture	2015-08-11 11:11:27 -07:00
Seth Alves	fedbfe8881	fix jumbled merge	2015-08-11 11:00:04 -07:00
Seth Alves	804c1ecf8e	quiet compiler	2015-08-11 10:46:53 -07:00
David Rowe	84feaeb703	Merge branch 'master' into 20639	2015-08-11 10:33:17 -07:00
Seth Alves	b0190f00fb	merge	2015-08-11 10:27:43 -07:00
Seth Alves	b25f6df7af	quiet compiler	2015-08-11 10:22:56 -07:00
Seth Alves	dab5848330	quiet compiler	2015-08-11 10:21:30 -07:00
Seth Alves	d6322903a2	quiet compiler	2015-08-11 10:12:46 -07:00
Howard Stearns	295d655eec	Merge pull request #5545 from AndrewMeadows/chlorine ... rotation constraints in preparation for inverse kinematics	2015-08-11 09:19:16 -07:00
Andrew Meadows	8e82e48f76	remove more std::max/min favor of glm utilities	2015-08-11 08:17:54 -07:00
Andrew Meadows	a38c1c82d1	use glm::clamp() instead if std::max() and min()	2015-08-10 23:08:36 -07:00
Andrew Meadows	4655bd21dd	added some comments to clarify algorithm	2015-08-10 23:08:10 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
David Rowe	80e296edd0	Merge branch 'master' into 20639	2015-08-10 19:25:12 -07:00
Seth Alves	7403929323	missed this in the last commit -- bump protocol version	2015-08-10 15:15:54 -07:00
Andrew Meadows	80b36f9f12	fix typo	2015-08-10 15:11:00 -07:00
Seth Alves	b26d6d2b9c	Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization ... Renderable model entity item optimizations	2015-08-10 15:10:12 -07:00