26738 commits

Author	SHA1	Message	Date
Simon Walton	17c12fde9c	Fix for HandshakeRequest logic	2018-03-06 16:32:04 -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
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
samcake	5440f62860	fixing a bad key /pipeline pair	2018-03-01 10:46:47 -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
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -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
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
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
Ken Cooke	bb2f3cac2c	Use named constant for the onset of near-field corrections (1 meter)	2018-02-27 08:51:55 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
John Conklin II	25144f0fec	Merge pull request #12456 from Atlante45/fix/min-spec-crash ... Fix crash when passing --checkMinSpec flag	2018-02-26 17:35:46 -08:00
Stephen Birarda	7e3d4d7503	Merge pull request #12506 from birarda/feat/content-settings ... merge upstream/master into upstream/feat/content-settings	2018-02-26 18:08:58 -07:00
Ryan Huffman	8a8830bbd4	Fix writeSubclassData in octree data	2018-02-26 17:06:25 -08:00
Stephen Birarda	aa7bd2066a	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-26 17:02:00 -08:00
Ryan Huffman	ec210e1750	Move OctreeUtils to OctreeDataUtils	2018-02-26 16:51:42 -08:00
Ryan Huffman	3fa538d42d	Add RawEntityData subclass	2018-02-26 16:32:09 -08:00
Atlante45	2a204533f4	Add comments to startup processes	2018-02-26 16:25:41 -08:00
humbletim	d3bae87066	* remove unneeded Q_DECLARE_METATYPEs ... * CR feedback	2018-02-26 19:07:55 -05:00
humbletim	767569bc40	* changes per CR feedback ... * make MeshPart.topology read-only * JS Graphics API starter documentation * remove redundant qscriptvalue sequence registrations	2018-02-26 18:00:22 -05:00
Ryan Huffman	65a4b3d316	Revert change to packet reading in Socket.cpp	2018-02-26 14:43:50 -08:00
Ryan Huffman	dbfbee5406	CR	2018-02-26 13:53:20 -08:00
Ryan Huffman	24da043937	Merge pull request #12437 from sethalves/fix-qt-5-10-udt ... fix Qt 5.10 udt packet reading	2018-02-26 13:50:41 -08:00
Seth Alves	d60d8fe702	Merge pull request #12498 from vladest/fix_crash_startup ... Search main window by checking object name	2018-02-26 13:06:10 -08:00
Sam Gondelman	d1d6adf447	Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 ... fix osx shadows	2018-02-26 11:46:43 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
Anthony J. Thibault	c8af9c6f04	Missing EPSILON	2018-02-26 10:05:15 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
vladest	77ef0e05a1	Search main window by checking object name	2018-02-26 13:43:50 +01:00
humbletim	3dbe5d79bb	fix windows punctilious warnings	2018-02-26 06:01:16 -05:00
humbletim	54dc0240b0	remove bufferviewscripting refs; fix compiler warnings	2018-02-26 05:26:35 -05:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
Sam Gondelman	e10af9b83d	Merge pull request #12462 from SamGondelman/entityDelete ... Fix EntityItems not getting destroyed	2018-02-23 16:17:52 -08:00
Seth Alves	59bd05aa55	make shadow-related shader compile on osx	2018-02-23 09:22:34 -08:00
Thijs Wenker	a27a5a7e1f	export boolean properties properly	2018-02-23 18:16:38 +01:00
humbletim	7c571cd431	cleanup / addition error message detail	2018-02-23 10:31:57 -05:00
humbletim	058e4d1926	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:12:33 -05:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00