50738 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Pomerantz	d82c8b251a	use sleep_for to avoid WIN32 sleep_until bug	2017-01-27 13:22:50 -05:00
Bradley Austin Davis	8d45f43ba8	Disable sparse textures	2017-01-27 10:06:31 -08:00
Andrew Meadows	489fbc6299	compute Model's local bounds outside render lambda	2017-01-27 09:35:36 -08:00
Seth Alves	8e1bd70e44	Merge pull request #9528 from sethalves/tablet-ui ... Tablet ui	2017-01-26 18:22:55 -08:00
Seth Alves	fa61bbe2a6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 18:21:39 -08:00
Chris Collins	5ed376afc9	Merge pull request #9257 from ZappoMan/tuneAvatarInfo ... avatar mixer bandwidth optimization	2017-01-26 17:33:57 -08:00
Thijs Wenker	cdc0f3ddd2	- make AC recording audio play with right encoding ... - spelling fix	2017-01-27 01:19:11 +01:00
Zach Pomerantz	1c5228cb6d	fix AudioRingBuffer::appendData	2017-01-26 19:16:02 -05:00
Howard Stearns	866f9debcd	Merge pull request #9526 from highfidelity/edit-entity-filter ... Edit entity filter (from branch)	2017-01-26 16:00:48 -08:00
Zach Pomerantz	3d526a1024	Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local	2017-01-26 18:56:58 -05:00
ZappoMan	af426063ac	fix bad merge	2017-01-26 15:19:25 -08:00
Seth Alves	b3500047b2	Merge pull request #9525 from sethalves/tablet-ui ... Tablet ui	2017-01-26 15:10:43 -08:00
Seth Alves	2edcc7359d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 15:09:54 -08:00
Seth Alves	95d5c64e83	put a schmitt trigger in place to de-bounce tablet clicks	2017-01-26 15:09:35 -08:00
Howard Stearns	d1a137cd18	Merge pull request #9518 from howard-stearns/entity-filter-resource ... Entity filters by URL	2017-01-26 15:06:57 -08:00
Seth Alves	eccf435f01	Merge pull request #9524 from sethalves/tablet-ui ... Tablet ui	2017-01-26 14:56:01 -08:00
Seth Alves	f808549675	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 14:54:50 -08:00
Seth Alves	c0f169e242	allow tablet-stabbers to more easily click buttons	2017-01-26 14:54:32 -08:00
ZappoMan	4c80422a73	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-26 14:34:58 -08:00
Seth Alves	d6dbc4a47d	Merge pull request #9523 from sethalves/tablet-ui ... Tablet ui	2017-01-26 14:31:42 -08:00
Seth Alves	e3d4cae515	avoid having the snapshot script be multi-activated by a single button-click	2017-01-26 14:29:49 -08:00
Chris Collins	c0ee091946	Merge pull request #9502 from zzmp/audio/throttle ... Throttle audio with PI controller, by node	2017-01-26 14:25:44 -08:00
howard-stearns	f9f0a4ea2d	fix startup-failure case	2017-01-26 14:05:16 -08:00
Seth Alves	db38503d57	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
samcake	19858bda78	Merge pull request #9493 from AndrewMeadows/otherAvatars ... optimize, prioritize, and timebox processing of avatar updates	2017-01-26 13:30:51 -08:00
samcake	52cbac0018	Merge pull request #9510 from jherico/sparse_size_estimation ... Attempt to account for sparse texture memory overhead	2017-01-26 12:59:15 -08:00
Seth Alves	d85d892057	Merge pull request #9522 from fayeli/PAL-to-PEOPLE ... Tablet Button name from PAL to PEOPLE	2017-01-26 12:58:16 -08:00
Faye Li	44fc8a5fbf	update button name	2017-01-26 11:23:06 -08:00
Seth Alves	a52b1efca9	Merge pull request #9521 from sethalves/tablet-ui ... Tablet ui	2017-01-26 11:01:49 -08:00
Seth Alves	0b51b1d566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub	0582aca598	Merge pull request #9511 from kunalgosar/master ... change server to default to not auto-muting	2017-01-26 10:59:50 -08:00
Brad Hefta-Gaub	0c9e42e2d9	Merge pull request #9486 from huffman/fix/overlay-parent-reg-point ... Fix Overlay-as-child of model entity with reg point	2017-01-26 10:59:01 -08:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Seth Alves	ad96a66c39	Merge pull request #9520 from sethalves/tablet-ui ... Users to USERS in button	2017-01-26 10:23:56 -08:00
Seth Alves	68de5c9757	Users to USERS in button	2017-01-26 10:23:38 -08:00
Seth Alves	728d05a927	Merge pull request #9519 from sethalves/tablet-ui ... include tablet fbx with interface distribution rather than get it fro…	2017-01-26 10:22:02 -08:00
Seth Alves	e2b1f4b2ab	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
Andrew Meadows	5783db910b	remove some unhelpful trace profiling data	2017-01-26 08:35:26 -08:00
Andrew Meadows	82f52b9658	fix bug: Avatar instance not getting deleted	2017-01-26 08:35:26 -08:00
Andrew Meadows	2264c29604	less magic	2017-01-26 08:35:26 -08:00
Andrew Meadows	0f09e60acd	remove unhelpful comment	2017-01-26 08:35:26 -08:00
Andrew Meadows	01e14eec47	remove commented out cruft	2017-01-26 08:35:26 -08:00
Andrew Meadows	ac180758ad	sort, optimize, and timebox process avatar updates	2017-01-26 08:35:26 -08:00
Andrew Meadows	d3dcc2b415	remove cruft: billboard option for Head::simulate()	2017-01-26 08:35:26 -08:00
Andrew Meadows	887707426e	remove cruft: Head::getScalePivot()	2017-01-26 08:35:26 -08:00
Andrew Meadows	69a7b1ef76	move some stuff out of Avatar::simulate() ... call it explicity in AvatarManager::updateOtherAvatars()	2017-01-26 08:35:26 -08:00
Andrew Meadows	b8afc87ad9	remove cruft	2017-01-26 08:35:26 -08:00
Andrew Meadows	e65d9309b3	remove cruft: Avatar::setShouldDie()	2017-01-26 08:35:26 -08:00
Andrew Meadows	e363423992	compute priority of avatar and sort before update	2017-01-26 08:35:26 -08:00
Andrew Meadows	09707217ec	remove Model::simulateInternal()	2017-01-26 08:35:25 -08:00