26839 commits

Author	SHA1	Message	Date
John Conklin II	1341774450	Merge pull request #12482 from SimonWalton-HiFi/declare-metatype ... Add a Q_DECLARE_METATYPE in TextureCache.	2018-03-08 09:37:06 -08:00
Clément Brisset	b7ac07f590	Merge pull request #12589 from highfidelity/RC65 ... merge back RC65 to master after RC hotfixes	2018-03-07 17:22:41 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	0aacdcd558	docs	2018-03-07 13:34:48 -08:00
Simon Walton	17c12fde9c	Fix for HandshakeRequest logic	2018-03-06 16:32:04 -08:00
Atlante45	edeed95ccc	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-06 15:33:12 -08:00
John Conklin II	7bc3848c36	Merge pull request #12533 from druiz17/stereo-checkbox ... Adding Stereo checkbox in Audio settings	2018-03-05 12:45:01 -08:00
Atlante45	85b4c3b422	Protect session UUID from concurrent read/writes	2018-03-02 17:34:18 -08:00
Sam Gateau	8856d4af4f	Merge pull request #12530 from samcake/punk ... Fixing the graphics bugs introduced since last recent dual quaternion change	2018-03-02 16:12:23 -08:00
John Conklin II	8f403ebc23	Merge pull request #12543 from zfox23/improveFontLoading ... Improve font loading via QRC instead of file path	2018-03-02 14:22:17 -08:00
samcake	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
Brad Hefta-Gaub	762e36ef19	Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii ... fix ASCII art for packet headers in NLPacket	2018-03-02 13:49:27 -08:00
Brad Hefta-Gaub	746f43c0fc	Merge pull request #12538 from huffman/fix/gzipped-json-export ... Fix Edit -> Export Entities exporting gzipped json	2018-03-02 13:34:23 -08:00
Stephen Birarda	4f151a4237	fix ASCII art for packet headers in NLPacket	2018-03-02 12:41:22 -08:00
Brad Davis	9e8368e50e	Disable virtual trackpad rendering on non-Android builds	2018-03-02 11:12:44 -08:00
Dante Ruiz	55d8cfd4c1	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
SamGondelman	a66125fbb7	scriptablematerial -> scriptablemateriallayer	2018-03-01 16:56:51 -08:00
Ryan Huffman	70bdedc4b3	Fix Edit -> Export Entities exporting gzipped json ... We were not respecting the doGzip flag.	2018-03-01 16:42:41 -08:00
SamGondelman	e3b65a9201	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-03-01 16:39:31 -08:00
Brad Hefta-Gaub	d24cea2f07	Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers ... if a node can't change locks, don't allow it to create an already-locked entity	2018-03-01 14:56:29 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	5440f62860	fixing a bad key /pipeline pair	2018-03-01 10:46:47 -08:00
Zach Fox	877fa52034	Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading	2018-03-01 10:14:23 -08:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	7ae37c21e0	Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats	2018-02-28 08:13:00 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
Ken Cooke	328b5a1e8b	Merge pull request #12479 from kencooke/audio-nearfield-hrtf ... Near-field HRTF	2018-02-28 07:44:24 -08:00
Ken Cooke	bc7b983f48	Fast approximation of the azimuth parallax correction	2018-02-28 04:44:20 -08:00
Seth Alves	31115b3cb6	make sure rezzer doesn't ignore adjustment	2018-02-27 20:14:00 -08:00
Seth Alves	9d131a6547	if a node can't change locks, don't allow them to create an already-locked entity	2018-02-27 19:53:54 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
Elisa Lupin-Jimenez	17ddf21028	fixed line length	2018-02-27 15:05:51 -08:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
John Conklin II	b4000c04bc	Merge pull request #12432 from highfidelity/feat/content-settings ... Add content archives to domain server web interface	2018-02-27 13:30:53 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
Ken Cooke	41ccf6afd8	Compensate the near-field azimuth correction for the parallax baked into the HRTF dataset	2018-02-27 12:49:32 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
SamGondelman	a4b04d9d43	merge	2018-02-27 10:08:30 -08:00
Stephen Birarda	9cc348ef27	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
John Conklin II	abe7c29b5e	Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly ... Export boolean entity properties properly	2018-02-27 09:18:46 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00