20528 commits

Author	SHA1	Message	Date
howard-stearns	ada685a376	cr changes	2017-01-23 15:31:55 -08:00
howard-stearns	24a9cf1f23	Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-23 13:52:39 -08:00
Clément Brisset	19622f86bf	Merge pull request #9475 from Atlante45/fix/injector-options ... Fix invalid volume values in injector options silencing all injectors	2017-01-23 13:17:55 -08:00
howard-stearns	0a4634446d	typo	2017-01-23 13:09:28 -08:00
howard-stearns	3358d58d01	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-23 12:21:32 -08:00
Stephen Birarda	f02832ca71	output the actual value set in WebEntityItem	2017-01-23 11:50:05 -08:00
Atlante45	3f8b2f9cbb	Fix invalid volume values in injector options	2017-01-23 11:49:07 -08:00
Stephen Birarda	d7651e9838	move value sanitizing to WebEntityItem	2017-01-23 11:45:21 -08:00
Stephen Birarda	99e0c8c0e7	use fromUserInput in web entity URL set to avoid crashable URLs	2017-01-23 11:37:54 -08:00
howard-stearns	7b986dcac6	works, but removes an optimization we'd like to keep	2017-01-20 17:03:52 -08:00
samcake	afd3c3b504	Merge pull request #9436 from AndrewMeadows/cauterization-cleanup ... Cleanup of code that decides not to render head when in first-person	2017-01-20 14:49:08 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
Andrew Meadows	10cdea9cd8	cleanup model fade logic	2017-01-19 14:17:50 -08:00
Andrew Meadows	b7c1bfaf58	another attempt to fix model transform	2017-01-19 14:01:40 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
Andrew Meadows	d3af420516	fix broken model transforms	2017-01-19 13:07:50 -08:00
Andrew Meadows	1d6f47e3d8	repack to reduce MeshPartPayload footprint 8 bytes	2017-01-19 12:56:08 -08:00
Andrew Meadows	bfbef91f53	re-enable cauterization of meshes for MyAvatar	2017-01-19 12:56:07 -08:00
Andrew Meadows	3dd8fd838b	move cauterization out of Model class	2017-01-19 12:56:07 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
howard-stearns	c9c9b30c50	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-19 10:30:18 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Brad Davis	70de00c6bf	Merge pull request #9421 from jherico/more_trace_details ... Additional trace details for GPU timing, frame data updates	2017-01-19 09:12:34 -08:00
samcake	149e727cf3	Merge pull request #9429 from gcalero/android_forward_shaders ... Create render forward version of pixel shaders	2017-01-19 00:48:25 -08:00
samcake	05304c72e0	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
samcake	027bd30cbc	Removing macOS warning	2017-01-18 16:59:50 -08:00
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
samcake	e3da6aa9f1	Removing the comment	2017-01-18 15:03:31 -08:00
Zach Fox	0ec01c0dc5	CR feedback	2017-01-18 14:55:53 -08:00
howard-stearns	90c9c5b137	logging change	2017-01-18 14:32:05 -08:00
Gabriel Calero	5602479988	Create render forward version of pixel shaders	2017-01-18 19:18:59 -03:00
howard-stearns	957b1d9ae4	pass just what is given to filter, more or less	2017-01-18 13:22:54 -08:00
howard-stearns	00e53c8ea6	more tractable copy semantics	2017-01-18 13:21:28 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
howard-stearns	60eb6dca9d	remove debug dump that was printing to screeen during << operator	2017-01-18 10:29:11 -08:00
howard-stearns	2e9b26057e	refactor bumpTimestamp, and fix implementation of wasChanged	2017-01-18 10:27:32 -08:00
howard-stearns	d9182cd38d	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-18 10:02:27 -08:00
Brad Davis	a593a2116a	Removing magic numbers	2017-01-17 18:15:40 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Zach Fox	246f5fb7f5	Add log; fix whitespace	2017-01-17 11:51:09 -08:00
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
samcake	305e308575	avoiding the exclusive filtering behavior	2017-01-17 10:54:45 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
samcake	960f4f0ead	Move the drawBOunds job to DrawTasks	2017-01-16 18:33:42 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00