61937 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vladest	3f0de940a4	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +01:00
Seth Alves	56e299c205	Merge pull request #11875 from samcake/orange ... Fix the spot light direction	2017-11-23 11:11:31 -08:00
Sam Gateau	9a31a3dc95	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-22 23:29:55 -08:00
Sam Gateau	9c53ab719a	Merge branch 'orange' of https://github.com/samcake/hifi into orange	2017-11-22 23:29:25 -08:00
Clément Brisset	e20555bf38	Merge pull request #11870 from Atlante45/feat/update-default-perms ... Add tmpRezCertified to default perms	2017-11-22 14:57:22 -08:00
Atlante45	b398e235a2	Add tmpRezCertified to default perms	2017-11-22 13:40:44 -08:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Sam Gateau	8389137caa	Merge pull request #11834 from highfidelity/pointers ... UI Pointer Optimization	2017-11-21 16:01:52 -08:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
Brad Hefta-Gaub	c66a500fcf	Merge pull request #11861 from druiz17/fix-modal ... Fix replace content dialog not closing	2017-11-21 15:43:20 -08:00
samcake	a0e40efdc8	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
Dante Ruiz	767b0fa4af	remove unused variable warning	2017-11-21 14:45:55 -08:00
samcake	ebd701a1ab	Merging with master	2017-11-21 14:40:37 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	c9ad7b1db5	Merge branch 'master' of github.com:highfidelity/hifi into fix-modal	2017-11-21 13:56:22 -08:00
Dante Ruiz	88c3adbff1	change askToReplaceDomainContent to use async question and warning	2017-11-21 13:56:11 -08:00
Brad Hefta-Gaub	817afcd083	Merge pull request #11741 from ZappoMan/entityItemCleanup ... Entity item cleanup	2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub	0945c1c50b	Merge pull request #11851 from Atlante45/feat/wizard ... Reworked wizard congratulation page.	2017-11-21 09:15:59 -08:00
Brad Hefta-Gaub	4d1e90dfca	Merge pull request #11821 from dback2/mirrorfanciness3 ... Mirror projection for Secondary Camera	2017-11-21 07:59:07 -08:00
Brad Hefta-Gaub	5dadec0b93	Merge pull request #11845 from thoys/feat/parentJointName ... Import JSON parentJointName value	2017-11-21 07:58:13 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Howard Stearns	89425ca210	Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log ... consolidated blockchain history log	2017-11-20 16:19:27 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez	3211aa7d13	Merge pull request #11849 from elisa-lj11/blocks ... Zip file structures replicated in asset server	2017-11-20 16:13:51 -08:00
Brad Hefta-Gaub	50ff782ab5	Merge pull request #11829 from sethalves/av-ent-misc-fixes ... misc avatar-entity fixes	2017-11-20 16:05:39 -08:00
Bradley Austin Davis	7a5dc9e00b	remove test code disabling the script cache	2017-11-20 15:57:44 -08:00
Clément Brisset	381fbe833d	Merge pull request #11855 from highfidelity/stable ... Merge stable back into master	2017-11-20 15:40:14 -08:00
Elisa Lupin-Jimenez	fb6287503e	hopefully fixed build error resulting from escape sequence	2017-11-20 15:12:11 -08:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez	ecd45534dd	merge conflict	2017-11-20 14:04:29 -08:00
Elisa Lupin-Jimenez	a54f4eca93	simplified naming of zip folders	2017-11-20 14:02:46 -08:00
Ryan Downe Karpf	f7c27966a9	Merge pull request #11801 from highfidelity/RC59 ... Beta Release 59 - Includes up to Developer Release 7426	2017-11-20 13:25:27 -08:00
Dante Ruiz	a201312dcf	re-added fix that when into master that this branch breaks	2017-11-20 13:10:35 -08:00
vladest	4e38b3bace	Started working on ComboBox. Add background for scroll bar	2017-11-20 20:35:41 +01:00
Elisa Lupin-Jimenez	b6e75d1222	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
Elisa Lupin-Jimenez	88823a169b	changed url for blocks app	2017-11-20 10:01:33 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
vladest	f20a723a7d	Merge branch 'master' into move_to_qqc2	2017-11-20 17:04:26 +01:00
vladest	f991379c9c	Fix scroll bar	2017-11-20 17:02:34 +01:00
Seth Alves	df07b66872	Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes	2017-11-20 07:47:19 -08:00
howard-stearns	07d52306c4	consolidated blockchain history log	2017-11-19 22:51:36 -08:00
ZappoMan	3b77f14f69	fix build error	2017-11-19 15:12:23 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
vladest	50ed9e2b2a	Port CheckBox to QQC2	2017-11-19 22:03:38 +01:00