50738 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	aeb02001ed	Merge pull request #9431 from sethalves/tablet-ui ... avoid unthreadsafe use of getJointIndex	2017-01-18 14:59:02 -08:00
Stephen Birarda	112b119f17	send entities that just stopped matching filter	2017-01-18 14:58:36 -08:00
Stephen Birarda	5d1b53c600	move map population with properties back	2017-01-18 14:58:36 -08:00
Stephen Birarda	b08bfe93f4	change lastViewFrustumSent to lastQuerySent	2017-01-18 14:58:36 -08:00
Stephen Birarda	a1ad496772	handle match on non-default serverScripts property during entity send	2017-01-18 14:58:36 -08:00
Stephen Birarda	3556379034	leverage JSON filter changes to OctreeQuery in EntityServer	2017-01-18 14:58:36 -08:00
Stephen Birarda	f9f958aef1	provide direct access to OctreeQuery from OHV	2017-01-18 14:58:36 -08:00
Stephen Birarda	6e6f2c50b8	leverage OctreeQuery enhancements in EntityScriptServer/OHV	2017-01-18 14:58:36 -08:00
Stephen Birarda	ed68d5a7a2	add JSON filter to OctreeQuery	2017-01-18 14:58:36 -08:00
Zach Fox	0ec01c0dc5	CR feedback	2017-01-18 14:55:53 -08:00
Seth Alves	c6d0c0909e	avoid unthreadsafe use of getJointIndex	2017-01-18 14:54:38 -08:00
Zach Fox	8a35afd3ac	Merge branch 'master' into PAL_AdminLabel	2017-01-18 14:46:08 -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
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08: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
David Kelly	3b70fa08a3	Merge pull request #9417 from davidkelly/dk/palLogSpam ... Removing some PAL-related interface log spam	2017-01-18 13:20:57 -08:00
Zach Fox	f8dd7f5433	Cleanup	2017-01-18 12:55:25 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	1175752e1d	Cleanup after rebase	2017-01-18 12:55:24 -08:00
Zach Fox	d067ba7dcc	Alan's feedback	2017-01-18 12:55:24 -08:00
Zach Fox	9d19aa3c79	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	202d4e8107	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	4dd0de62fc	Merge pull request #9424 from sethalves/tablet-ui ... fix warnings	2017-01-18 12:50:06 -08:00
Seth Alves	b6188bb73a	fix warnings	2017-01-18 12:49:25 -08:00
Ryan Huffman	3b5b88e719	Move MessageID to AssetUtils	2017-01-18 11:17:13 -08:00
Ryan Huffman	d85f27e992	Add Entities.getServerScriptStatus	2017-01-18 11:15:59 -08:00
Ryan Huffman	8137c59ef7	Add support for sending requests to entity script server	2017-01-18 11:15:29 -08:00
Seth Alves	02b708feaf	Merge pull request #9419 from druiz17/buttonsMissing ... Fixed pal on tablet	2017-01-18 11:04:10 -08:00
Seth Alves	a1efb7695b	Merge pull request #9420 from sethalves/tablet-ui-model-stylus ... Tablet ui model stylus	2017-01-18 10:51:36 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Dante Ruiz	8172329ec3	Fixed pal	2017-01-18 10:33:58 -08:00
howard-stearns	60eb6dca9d	remove debug dump that was printing to screeen during << operator	2017-01-18 10:29:11 -08:00
Philip Rosedale	d60d183c8c	Merge pull request #9403 from humbletim/21118 ... Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter	2017-01-18 10:29:01 -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
Seth Alves	439d6f0fa3	Merge pull request #9418 from druiz17/tabletController ... game controller input with tablet	2017-01-18 09:31:55 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	715ee0b019	Merge pull request #9416 from sethalves/tablet-ui ... Tablet ui	2017-01-18 06:41:21 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00