24880 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	a72ac3ead2	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 12:19:04 -07:00
Brad Hefta-Gaub	4de6d645e5	Merge pull request #4701 from jherico/infoview ... Infoviews & Browser in QML	2015-05-06 12:12:21 -07:00
Brad Davis	a9de502e76	removing commented out old implementation.	2015-05-06 12:03:47 -07:00
Brad Hefta-Gaub	e1db23887a	Merge pull request #4781 from jherico/off_axis ... Removing off-axis projection from menu	2015-05-06 11:59:59 -07:00
Andrew Meadows	326d17072e	merge seth/dice-on-table-1 into andrew/nova	2015-05-06 11:50:12 -07:00
Andrew Meadows	c97b11a6e9	no ownership of kinematic objects on collision	2015-05-06 11:48:31 -07:00
Andrew Meadows	6e6fec158d	split ignore/activation thresholds for updates	2015-05-06 11:47:33 -07:00
Andrew Meadows	f0c778a802	fix bug preventing taking of simulation ownership	2015-05-06 11:46:42 -07:00
Andrew Meadows	646661d037	update body gravity when proper dirty bits are set	2015-05-06 11:46:25 -07:00
Bradley Austin Davis	4c22e637d7	Merge remote-tracking branch 'upstream/master' into off_axis	2015-05-06 11:28:03 -07:00
Bradley Austin Davis	c832fd969a	Removing off-axis projection from menu	2015-05-06 11:26:46 -07:00
Seth Alves	238a41f2b9	pull from upstream	2015-05-06 11:22:18 -07:00
Seth Alves	f75eef4295	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-06 11:20:45 -07:00
Seth Alves	129a3a82da	clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape	2015-05-06 11:20:39 -07:00
Clément Brisset	9f8e52652b	Merge pull request #4771 from ctrlaltdavid/20526 ... CR for #20526 - Fix Mixamo avatar clipping in HMD view	2015-05-06 20:17:07 +02:00
Andrew Meadows	e61470517c	track all entities added to simulation	2015-05-06 11:01:16 -07:00
Brad Hefta-Gaub	b27154186b	Merge pull request #4779 from jherico/hmd_tools ... Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:46:55 -07:00
Bradley Austin Davis	de49057f17	Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:32:45 -07:00
David Rowe	eb438e9ccb	Can use same clipping calc for non-Oculus	2015-05-06 09:58:14 -07:00
Philip Rosedale	e2541c4243	Merge pull request #4740 from ctrlaltdavid/20518 ... CR for #20518 - Mute camera button next to mute audio button	2015-05-06 09:54:42 -07:00
Seth Alves	7a5fe8a34e	quiet compiler	2015-05-06 09:05:13 -07:00
Seth Alves	ff104bb915	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 08:55:06 -07:00
Brad Hefta-Gaub	410baa6ac0	Merge pull request #4778 from ctrlaltdavid/20525 ... CR for 20525 - Fix lobby not displaying in HMD mode	2015-05-06 08:34:32 -07:00
David Rowe	9c1d73747f	Merge branch 'master' into 20526	2015-05-06 08:24:57 -07:00
Clément Brisset	0470e72459	Merge pull request #4777 from cozza13/20529 ... CR for Job #20529 - Change defaulscripts.js	2015-05-06 16:12:22 +02:00
David Rowe	333da93642	Updated face tracker mute icons	2015-05-05 23:20:23 -07:00
David Rowe	b519884609	Fix lobby not displaying in HMD mode ... This usage of Glower is similar to that in renderAvatarBillboard(). Both may indicate that something needs changing in the graphics pipeline.	2015-05-05 20:54:12 -07:00
Seth Alves	74743c9677	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 20:15:17 -07:00
Andrew Meadows	14f925b48e	merge seth/dice-on-table-1 into andrew/nova ... Conflicts: libraries/physics/src/EntityMotionState.cpp libraries/physics/src/ObjectMotionState.h	2015-05-05 16:54:53 -07:00
Chris Collins	7396bb138d	Removed headmove ... removed head move, it is not being used by Oculus users at the moment	2015-05-05 16:52:38 -07:00
Seth Alves	e637a9b5ae	Merge pull request #4776 from PhilipRosedale/master ... dice don't go away unless 'X' key is clicked, harmonicOscillator.js	2015-05-05 16:52:35 -07:00
David Rowe	1c21874f00	Make face tracker mute action start / stop face tracker	2015-05-05 16:51:31 -07:00
Andrew Meadows	50f73602f6	cleanup PhysicalEntitySimulation::_outgoingChanges	2015-05-05 16:51:07 -07:00
Andrew Meadows	d4701b4310	namechange getIncomingDF --> getAndClearIncomingDF	2015-05-05 16:49:41 -07:00
Andrew Meadows	550820ee45	set EntityItem::_simulated in the correct location	2015-05-05 16:48:56 -07:00
Seth Alves	4a7fe50084	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 16:43:43 -07:00
Seth Alves	c35edd8eb4	some debugging on Andrew's refactor	2015-05-05 16:40:10 -07:00
Seth Alves	c9f97b9d42	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-05 15:50:24 -07:00
Andrew Meadows	2668ff6d0a	check for DIRTY_ROTATION bit when copying rotation	2015-05-05 15:34:50 -07:00
Andrew Meadows	8523a96e2b	implement setShouldClaimSimulationOwnership()	2015-05-05 15:34:26 -07:00
samcake	5f19141050	Merge pull request #4773 from AndrewMeadows/bispinor ... fix crash in UserInputMapper::update() for invalid DeviceProxy	2015-05-05 15:18:16 -07:00
Philip Rosedale	5fb79df4c9	dice don't go away unless 'X' key is clicked, added harmonicOscillator test script	2015-05-05 15:18:16 -07:00
Andrew Meadows	419cfee775	more correct fix for invalid DeviceProxy crash bug	2015-05-05 15:06:51 -07:00
Andrew Meadows	bbb8e2e076	merge upstream/master into andrew/bispinor	2015-05-05 15:00:19 -07:00
Andrew Meadows	0d4d5d024e	revert last change (fix for invalid DeviceProxy)	2015-05-05 14:59:22 -07:00
Seth Alves	82828f0b93	print when bullet and local octree don't agree on position of an entity	2015-05-05 13:52:10 -07:00
Seth Alves	1cd93b9ec8	pull andrew's branch, add back in visual indicator of an entity being active in bullet	2015-05-05 13:14:22 -07:00
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -07:00
samcake	7ee4a1baca	Merge pull request #4774 from ZappoMan/atmosphereInZones ... change skyboxMode to backgroundMode	2015-05-05 12:54:35 -07:00
Seth Alves	8aafce6382	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-05 12:53:28 -07:00