65111 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	a23884d0e0	Prevent crash during long backup web requests	2018-03-06 13:21:02 -08:00
John Conklin II	9294ae0dd2	Merge pull request #12567 from elisa-lj11/RC65-update ... Added fixed log spam undefined error to RC65	2018-03-06 12:40:28 -08:00
Elisa Lupin-Jimenez	15c1f5ba30	fixed log spam undefined error	2018-03-06 11:01:50 -08:00
John Conklin II	acf1f48d9e	Merge pull request #12550 from thoys/fix/grabbableCheckbox ... FIX: make the grabbable checkbox function again when dynamic disabled	2018-03-05 14:55:38 -08:00
Thijs Wenker	d7725f1d73	make the grabbable checkbox again, respect default true setting	2018-03-05 20:54:08 +01: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
John Conklin II	be30d8d4ec	Merge pull request #12542 from zfox23/RC65_fixJsRequest ... RC65: Fix undefined request from JS	2018-03-02 12:34:14 -08:00
Zach Fox	a5a109e4f1	Fix undefined request from JS	2018-03-02 10:05:32 -08:00
John Conklin II	678584538d	Merge pull request #12532 from samcake/RC65 ... RC65 Fix: Applying the fix for shadows and transitions on Dual Quat Skinned meshes	2018-03-02 09:23:38 -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	9f9214e808	getting back the RC65 version for a few files	2018-03-01 09:33:48 -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
Sam Gondelman	b90af9e3b5	Merge pull request #12523 from samcake/punk ... Adding more detailed stats	2018-02-28 12:18:07 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
samcake	9e5ed7b905	Add more timing stats in explanded mode	2018-02-28 10:48:35 -08:00
Elisa Lupin-Jimenez	061a189e9f	Merge pull request #12520 from elisa-lj11/selection_tool_log_spam ... Fixed log spam undefined error	2018-02-28 09:37:17 -08:00
samcake	9580258589	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-02-28 09:00:55 -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
samcake	a2e9e8295d	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-02-27 17:47:22 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
Thijs Wenker	6bf1c9878f	Merge pull request #12473 from misslivirose/fix-log-spam ... Logspam fix for editing in HMD mode	2018-02-28 01:59:25 +01:00
Elisa Lupin-Jimenez	b8fd640ddf	fixed log spam undefined error	2018-02-27 16:44:45 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
samcake	e290f2fc3c	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-02-27 14:54:11 -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
Howard Stearns	1fb0f898b4	Merge pull request #12505 from howard-stearns/wallet-help ... new wallet help	2018-02-27 13:18:36 -08:00
Howard Stearns	0e4f3460b3	Merge pull request #12497 from howard-stearns/end-seeding ... End seeding	2018-02-27 13:18:13 -08:00
Sam Gondelman	354fae5063	Merge pull request #12513 from SamGondelman/revertShadows ... Revert can cast shadow work	2018-02-27 13:13:09 -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
howard-stearns	e21d9f7950	Merge branch 'wallet-help' of github.com:howard-stearns/hifi into wallet-help	2018-02-27 12:05:00 -08:00
howard-stearns	30896c264b	reduced text	2018-02-27 12:04:41 -08:00
howard-stearns	53b976b400	fix typo in bank href	2018-02-27 11:46:06 -08:00
Zach Fox	1119998c7a	Fix semicolon	2018-02-27 11:45:59 -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
howard-stearns	1f2d270419	Merge branch 'master' of github.com:highfidelity/hifi into wallet-help	2018-02-27 11:20:56 -08:00
samcake	816c5ab59d	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-02-27 11:18:43 -08:00
Ryan Huffman	a6a38d8b3d	Merge pull request #12511 from birarda/feat/content-settings ... merge master into feat/content-settings	2018-02-27 10:03:28 -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
Zach Fox	9170244312	Make WindowScriptingInterface available to tablet	2018-02-27 09:36:02 -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
samcake	efba6bb524	Adding a counter for the other parts of the gameloop	2018-02-27 09:11:14 -08:00
Ken Cooke	cc7b9a254b	Optimized compute of distance attenuation	2018-02-27 09:02:03 -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