63094 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vladest	7985c39f2a	Adopt path to certain Tablet dialogs to new loading subsystem and path resolver	2017-12-21 22:14:15 +01:00
Alexander Ivash	bd3a056f4e	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict ... note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope	2017-12-21 20:03:38 +00:00
Stephen Birarda	31e9f26772	fix use after free of pending message	2017-12-21 11:35:11 -08:00
David Back	fd297f1c03	convert negative relative indices to absolute indices	2017-12-21 10:36:41 -08:00
vladest	2bca0939b3	Preliminary proxy model	2017-12-21 19:32:13 +01:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
vladest	d6e1a3ea41	Merge conflicts solved	2017-12-21 09:02:04 +01:00
Brad Hefta-Gaub	15fcf66d0e	Merge pull request #12022 from AndrewMeadows/lod-auto-adjust-002 ... more responsive LOD auto-adjust	2017-12-20 19:23:39 -08:00
unknown	be736373f2	fix if else convention	2017-12-20 17:52:27 -08:00
Andrew Meadows	c1906215ba	add comments	2017-12-20 17:41:08 -08:00
Andrew Meadows	721e9d426a	restore signals on LOD change	2017-12-20 17:41:08 -08:00
Andrew Meadows	5c11ae3469	bump desktop min FPS from 20 to 30 msec	2017-12-20 17:41:08 -08:00
Andrew Meadows	4fb9680f3b	also consider GPU render time for LOD adjust	2017-12-20 17:41:08 -08:00
Andrew Meadows	9c4a0c8c70	tweak LOD adjustment logging	2017-12-20 17:41:08 -08:00
Andrew Meadows	8e0d367a2d	use full 'present' time for FPS calculation ... also, refactor LOD adjust logic	2017-12-20 17:41:08 -08:00
Andrew Meadows	5c84c5f845	measure average time of 'present'	2017-12-20 17:41:08 -08:00
Andrew Meadows	7a9d566e02	remove unnecessary whitespace	2017-12-20 17:41:08 -08:00
unknown	dbbc87d72e	merge	2017-12-20 17:40:11 -08:00
John Conklin II	aad89e87be	Merge pull request #12032 from birarda/rc-61-merge-back ... merge back for stable to master after RC-61	2017-12-20 17:37:31 -08:00
Melissa Brown	fddb192af8	Merge pull request #11961 from humbletim/add-midi-control-change ... forward MIDI_CONTROL_CHANGE events	2017-12-20 17:11:08 -08:00
Zach Fox	d53baf3e40	Merge pull request #12030 from zfox23/commerce_fixTextInputErrorStatus ... Fix error state for Commerce passphrase TextInputs	2017-12-20 16:58:12 -08:00
Stephen Birarda	85ecfbabab	Merge remote-tracking branch 'upstream/stable' into rc-61-merge-back	2017-12-20 16:54:20 -08:00
RebeccaStankus	95d94e1c8f	UI Done	2017-12-20 16:52:56 -08:00
Zach Fox	b30d3fcc12	Change three lines of code. Fix one thing. Break another.	2017-12-20 15:40:10 -08:00
RebeccaStankus	5d0eeabf3d	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-20 14:47:54 -08:00
SamGondelman	2ba3e337db	cleanup	2017-12-20 14:18:01 -08:00
vladest	79f9b54f6a	Store button list in the resources section of fake item instead of C++ space	2017-12-20 22:59:07 +01:00
SamGondelman	7a7b1f7089	fix web entity crash	2017-12-20 13:58:58 -08:00
Zach Fox	e02e6790fe	Fix error state for Commerce passphrase TextInputs	2017-12-20 13:46:02 -08:00
Elisa Lupin-Jimenez	7de2918b9b	added newline to header	2017-12-20 12:44:47 -08:00
Ryan Downe Karpf	b6d8434b55	Merge pull request #11969 from highfidelity/RC-61 ... Beta Release 61 - Includes up to Developer Release 7548	2017-12-20 11:10:57 -08:00
SamGondelman	bd06dc6443	cleaning up modelmeshpartpayload	2017-12-20 11:00:14 -08:00
Zach Fox	08edc52932	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-20 09:18:10 -08:00
Andrew Meadows	02e3b22621	remove hot-key for disable of scripted motor	2017-12-20 08:43:56 -08:00
Andrew Meadows	6ad3a0598c	remove crufty comment	2017-12-20 08:42:42 -08:00
Andrew Meadows	f82de05f9c	defang accidental disable of MyAvatar's default motor	2017-12-20 08:42:42 -08:00
Zach Fox	297a3df63c	Merge pull request #11815 from zfox23/commerce_QmlWhitelist ... QML Whitelisting + Commerce Integration	2017-12-19 18:07:14 -08:00
Sam Gondelman	5f5bf94f2a	Merge pull request #12008 from AndrewMeadows/fix-animation-crash ... fix interface crash for bad QVector index in animation loop	2017-12-19 17:59:47 -08:00
NissimHadar	88ade87c71	Merge pull request #11774 from NissimHadar/hazeOnTransparent ... Haze on transparent	2017-12-19 17:20:14 -08:00
Zach Fox	a72ed27a25	CR feedback	2017-12-19 16:57:48 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
Zach Fox	91ed531421	Merge pull request #12023 from zfox23/commerce_fixAvailabileBug ... Fix bug preventing 'get' buttons from working in Marketplace	2017-12-19 16:24:56 -08:00
Stephen Birarda	1a6546999a	track reliably sent adds in sent packet history from OEPS	2017-12-19 16:00:55 -08:00
Elisa Lupin-Jimenez	ca062f9232	changed qtglobal include	2017-12-19 15:41:42 -08:00
Elisa Lupin-Jimenez	14935e5924	added const to valid inputs	2017-12-19 15:11:24 -08:00
Zach Fox	ed5da4f83b	Fix bug preventing 'get' buttons from working in marketplace	2017-12-19 15:07:50 -08:00
Sam Gateau	01ff08de1d	Merge pull request #12004 from SamGondelman/burp2 ... Fix caching of ktx texture files	2017-12-20 04:38:54 +07:00
Elisa Lupin-Jimenez	1b6c85edb0	cleaned up code	2017-12-19 13:22:31 -08:00
vladest	012f65a87f	Merge branch 'master' into tablet_home_paginate	2017-12-19 21:40:47 +01:00
SamGondelman	9aed825328	Merge remote-tracking branch 'upstream/master' into burp2	2017-12-19 11:39:21 -08:00