65352 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	b8fc9e2469	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-07 07:40:35 -08:00
Zach Fox	04a230c20f	Merge pull request #12491 from ElderOrb/FB12523 ... fix for not re-enabling preview on leaving security-sensitive pages in marketplace	2018-03-06 16:19:39 -08:00
Clément Brisset	fdc054c86b	Merge pull request #12577 from Atlante45/new-master ... RC65 merge back into master	2018-03-06 16:17:27 -08:00
Seth Alves	926be73c0a	make this work again	2018-03-06 15:50:03 -08:00
Atlante45	edeed95ccc	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-06 15:33:12 -08:00
Seth Alves	94b6115271	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-06 13:23:01 -08:00
Seth Alves	79aa450332	some code-review induced changes	2018-03-06 13:11:09 -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
Alexander Ivash	53e1a0cae5	forward 'maybeEnableHmdPreview' if control is not visible	2018-03-06 22:25:35 +03: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
John Conklin II	16bb992d8d	Merge pull request #12557 from druiz17/correctly-use-defaults-values ... correctly use default values and don't delete userData in entitiesProperties.js	2018-03-05 13:15:23 -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
Seth Alves	7d6927a00d	Merge pull request #12555 from druiz17/fix-controllerDispacther-error ... fix controllerDispatcher error in logs	2018-03-05 12:08:35 -08:00
Thijs Wenker	d7725f1d73	make the grabbable checkbox again, respect default true setting	2018-03-05 20:54:08 +01:00
Dante Ruiz	1997cd27bd	correctly use default values	2018-03-05 11:26:37 -08:00
Dante Ruiz	654770af51	fix controller dispatacher error	2018-03-05 09:39:26 -08:00
Seth Alves	a6c3bcd8d8	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-05 08:51:12 -08:00
John Conklin II	8cb7e0584f	Merge pull request #12547 from Atlante45/fix/session-uuid-lock ... Protect session UUID from concurrent read/writes	2018-03-05 08:24:22 -08:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
Seth Alves	dabdff9b2b	don't add extra entry in history when going 'back' from a serverless domain	2018-03-03 08:33:42 -08:00
Seth Alves	606face7c0	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
Seth Alves	fdb53b6543	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-02 19:27:53 -08:00
Seth Alves	7a61119d11	remove unneeded call to clearDomainOctreeDetails	2018-03-02 19:27:45 -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	ed07b3c28b	Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick ... Purge RayPick and LaserPointers from default scripts	2018-03-02 14:59:32 -08:00
Dante Ruiz	d12a4f0c18	little change	2018-03-02 14:30:02 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -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
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
Seth Alves	746769cbe9	don't crash	2018-03-02 13:52:18 -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
John Conklin II	7ebe3df2b1	Merge pull request #12537 from zfox23/fixJsRequest ... Fix undefined request from JS	2018-03-02 13:39:27 -08:00
John Conklin II	ff94587518	Merge pull request #12544 from jherico/fix_android ... Disable virtual trackpad rendering on non-Android builds	2018-03-02 13:37:08 -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
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
Seth Alves	507dfa5ec3	more code review response	2018-03-02 11:35:34 -08:00
Brad Davis	9e8368e50e	Disable virtual trackpad rendering on non-Android builds	2018-03-02 11:12:44 -08:00
Dante Ruiz	7ce13a3ce7	adding comment	2018-03-02 11:06:28 -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
Seth Alves	bdd926f89e	cleanups	2018-03-02 10:38:35 -08:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
Zach Fox	a5a109e4f1	Fix undefined request from JS	2018-03-02 10:05:32 -08:00
Seth Alves	45157a16f2	merge from upstream	2018-03-02 09:57:27 -08:00
Seth Alves	82bfd25d8b	fix placename in title-bar, fix domain-spawning-point	2018-03-02 09:54:54 -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
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00