5935 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	dc4751a95b	Merge pull request #7595 from ZappoMan/depthReticleWork ... Fix a random case of the depth reticle hiding when it shouldn't	2016-04-07 12:06:20 -07:00
David Rowe	fd7a6ed042	Fix checkbox being clickable outside of checkbox and label extents	2016-04-07 17:20:40 +12:00
Brad Hefta-Gaub	89a7b5f731	Merge pull request #7548 from ericrius1/roomAudio ... Add examples for entity scripts that set up audio reverb zones	2016-04-06 19:09:09 -07:00
ericrius1	0e08b15db7	spacing fix attempt	2016-04-06 11:30:29 -07:00
Brad Hefta-Gaub	0f4e1e79fd	Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork	2016-04-06 11:01:00 -07:00
Brad Hefta-Gaub	8c15116190	fix auto-hide logic in depthReticle	2016-04-06 11:00:43 -07:00
ericrius1	2be2f940ea	remove panel	2016-04-06 10:59:18 -07:00
ericrius1	21f6d7bee3	fixed largeroom illegal characters	2016-04-06 10:50:58 -07:00
ericrius1	ce290a1993	got rid of illegal character	2016-04-06 10:38:59 -07:00
ericrius1	9cac249122	f1	2016-04-06 10:36:38 -07:00
Brad Hefta-Gaub	52497b1dfc	Merge pull request #7560 from sethalves/remove-handcontroller-touch ... remove code that sends entity 'touch' events	2016-04-05 17:50:07 -07:00
Brad Hefta-Gaub	891cc12d3f	Merge pull request #7549 from zzmp/feat/resource-vis ... Add a visualization of cacheable resource usage	2016-04-05 15:43:27 -07:00
Seth Alves	ace4546dec	make handGrabController search ray follow controller rather than IK driven hand	2016-04-04 12:49:03 -07:00
Seth Alves	0bd747fa06	remove code that sends entity 'touch' events	2016-04-04 11:00:27 -07:00
Brad Hefta-Gaub	e5f3ec4600	Merge pull request #7545 from birarda/marketplace-to-examples ... renaming of marketplace icon/window to examples	2016-04-03 14:25:00 -07:00
Zach Pomerantz	d78338330c	Rm unused trigger from renderStats	2016-04-01 20:06:10 -07:00
Zach Pomerantz	b0185dc355	Add cacheStats.js	2016-04-01 20:06:10 -07:00
Zach Pomerantz	41cdb29bd2	Use a timer in plotperf	2016-04-01 20:06:09 -07:00
Zach Pomerantz	36e04f4434	Mv PlotPerf to shared dir	2016-04-01 19:52:44 -07:00
Seth Alves	3f3efc4250	remove debug prints	2016-04-01 17:55:12 -07:00
ericrius1	048d745af9	update	2016-04-01 17:53:02 -07:00
ericrius1	f7f7c18d72	added new audio room examples	2016-04-01 17:45:15 -07:00
ericrius1	5bbca785b3	added new audio room examples	2016-04-01 17:43:10 -07:00
Seth Alves	9942a5edd4	don't reset local offset during a hold	2016-04-01 17:22:20 -07:00
Seth Alves	d9f5a0ccaf	experiment	2016-04-01 17:17:21 -07:00
Seth Alves	f05f283b04	disable setting of angular velocity upon release of a parenting grab	2016-04-01 16:58:17 -07:00
Seth Alves	bfa2d8f405	set angular velocity on parenting-grab release	2016-04-01 15:11:01 -07:00
Seth Alves	eb22b5e4a7	velocity is now set when a parenting grab ends, though not angular velocity	2016-04-01 14:50:42 -07:00
Seth Alves	7c8050790b	set velocity when something is un-parent-grabbed	2016-04-01 14:20:36 -07:00
Stephen Birarda	eaa0ba9e32	rename marketplace.js to examples.js	2016-04-01 14:16:44 -07:00
Seth Alves	0006ba281f	Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb	2016-04-01 13:46:31 -07:00
Brad Hefta-Gaub	7db22ee8c2	Merge pull request #7477 from ericrius1/cowTipper ... Adds a cow which untips itself and moos when it collides with an entity	2016-04-01 13:08:41 -07:00
Brad Hefta-Gaub	95e0682012	Merge pull request #7446 from ctrlaltdavid/20855 ... Restyle entities editor	2016-04-01 13:07:58 -07:00
Brad Davis	cd548744f6	Merge pull request #7531 from ZappoMan/optimizeDepthReticle ... only do depth reticle depth check when the reticle is visible	2016-04-01 13:06:44 -07:00
Brad Hefta-Gaub	aee6fc9c8a	handle starting in HMD mode	2016-04-01 11:22:12 -07:00
Brad Hefta-Gaub	c36a5370e6	whitespace	2016-04-01 09:02:16 -07:00
Brad Hefta-Gaub	d5ecb99b16	switch to HMD preferred audio when mounting the HMD	2016-04-01 09:00:57 -07:00
David Rowe	b9054897f7	Merge branch 'master' into 20855	2016-04-01 17:32:47 +13:00
David Rowe	7d36ec9520	Miscellaneous fixes	2016-04-01 17:30:22 +13:00
Eric Levin	8176852503	removed extra space	2016-03-31 18:50:24 -07:00
Eric Levin	e0f843d6eb	removes extra space	2016-03-31 18:49:51 -07:00
David Rowe	1f0529b5ea	Miscellaneous fixes	2016-04-01 14:13:38 +13:00
David Rowe	b900fcbbf0	Back out attempt at fixing OSX styling	2016-04-01 12:43:30 +13:00
Seth Alves	e8d58483aa	fix typo	2016-03-31 16:37:08 -07:00
Seth Alves	0e643a1555	debugging prints	2016-03-31 16:26:54 -07:00
Brad Hefta-Gaub	bbca1ba6db	only do depth reticle depth check when the reticle is visible	2016-03-31 15:58:37 -07:00
Brad Davis	27406f5b21	Add texture stress test	2016-03-31 15:13:04 -07:00
David Rowe	a2953595a5	Tweak spinbox fields for large values	2016-04-01 10:23:39 +13:00
David Rowe	048865fb09	Style spin buttons	2016-04-01 09:55:27 +13:00
Seth Alves	a8b4d1a379	ray follows controller	2016-03-31 13:46:00 -07:00