18641 commits

Author	SHA1	Message	Date
Anthony J. Thibault	90a06f0d40	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-05 11:05:10 -07:00
Seth Alves	a2441ca84c	back out some uneeded chagnes	2016-08-04 14:09:12 -07:00
Seth Alves	981a8d76fa	code review	2016-08-04 13:47:43 -07:00
Seth Alves	45c21ca523	make UNSET_VALUE still work while still returning and empty string value for undefined keys	2016-08-04 13:37:08 -07:00
Seth Alves	4c258b9568	fix bug which caused getValue for a non-existent key to return the integer 2	2016-08-04 10:16:08 -07:00
Brad Hefta-Gaub	a1dc9beddb	Merge pull request #8348 from ZappoMan/beltAndSuspenders ... implement codec renegotiation in client	2016-08-03 21:22:28 -07:00
Anthony J. Thibault	f24c92f3a1	Bug fix for avatar debug marker rendering. ... "Developer > Hands > Show Hand Targets" works again "Developer > Avatar > Draw Position" works again	2016-08-03 15:43:31 -07:00
Anthony J. Thibault	713bee84c3	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-03 14:06:43 -07:00
Brad Hefta-Gaub	eb230071a0	Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders	2016-08-03 11:53:28 -07:00
Anthony J. Thibault	75b88b0794	WebEntities now support custom hifi url handling ... WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml. marketplace urls and hifi urls should work properly in web entities.	2016-08-03 10:20:15 -07:00
Seth Alves	9962d47173	Merge pull request #8326 from birarda/kick ... kick	2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub	754eae98c2	Merge pull request #8353 from birarda/fake-atp-url ... fix for disabled physics with unloadable entity	2016-08-03 09:10:41 -07:00
Seth Alves	cc7322a0de	Merge pull request #8334 from ctrlaltdavid/21015 ... refresh file dialog when directory content changes	2016-08-03 08:11:40 -07:00
Brad Hefta-Gaub	193f0bbb99	Merge pull request #8345 from ctrlaltdavid/web-window-signals ... add OverlayWebWindow resized, moved, and closed signals	2016-08-02 18:41:49 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
Zander Otavka	38ba54e481	Fix confirm dialog	2016-08-02 16:04:54 -07:00
Brad Hefta-Gaub	ca3a194454	implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream	2016-08-02 15:30:03 -07:00
Anthony J. Thibault	6d768d8327	hand controllers send touch events instead of mouse events to web entities ... This gives a much better experience when scrolling web content.	2016-08-02 15:23:46 -07:00
Stephen Birarda	4cdc98287b	add canKick to USI, revert constants to production	2016-08-02 14:35:51 -07:00
Stephen Birarda	39e6ac0974	cleanup API for HifiConfigVariantMap after migration	2016-08-02 14:35:11 -07:00
Stephen Birarda	62af203d08	migrate the deprecated merged master/user config	2016-08-02 14:35:11 -07:00
Stephen Birarda	7e6dbf2d1a	add a kick request packet and send from NL	2016-08-02 14:35:11 -07:00
Stephen Birarda	94b97e8119	expose kick perms from LNL and Node	2016-08-02 14:35:11 -07:00
Stephen Birarda	f04996a53d	add the kick permission to domain server settings	2016-08-02 14:35:11 -07:00
David Rowe	31ac7a2812	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
Seth Alves	708bd33056	Merge branch 'master' of github.com:highfidelity/hifi into groups	2016-08-01 12:00:13 -07:00
Seth Alves	60d6673950	switch data-web urls to point at production server rather than dev one	2016-08-01 12:00:08 -07:00
Anthony Thibault	cf7450beb7	handControllerGrab and web entity input integration	2016-07-29 17:50:45 -07:00
Anthony Thibault	f71a59276c	Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering ... Fix alpha cut-outs and incorrect gamma on web overlays and entities	2016-07-29 17:44:46 -07:00
David Rowe	800c2b9ec0	Refresh file dialog when directory content changes	2016-07-30 11:21:40 +12:00
Seth Alves	8e1820f911	make sure permissions have the correct ID in the case where a user has been verified	2016-07-29 13:10:14 -07:00
Seth Alves	507410af79	Merge branch 'master' of github.com:highfidelity/hifi into groups	2016-07-29 08:14:15 -07:00
Anthony Thibault	8e3bc97ef9	fix for unused variable warnings	2016-07-29 08:10:10 -07:00
Brad Hefta-Gaub	74a3835a1e	CR feedback	2016-07-28 15:15:33 -07:00
Anthony Thibault	ea310bcc43	Web Entities now render correctly as well	2016-07-28 14:11:19 -07:00
Anthony Thibault	be6e401e9a	Merge branch 'master' into bug-fix/web3doverlay-rendering	2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub	22619a66ba	process events also	2016-07-28 10:51:17 -07:00
Anthony Thibault	6b8e912114	Fix for mac and linux builds	2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub	755989b8ff	don't allow punished scripts to slow stop or shutdown	2016-07-28 10:01:05 -07:00
Seth Alves	5a96c8bf57	Merge branch 'master' of github.com:highfidelity/hifi into groups	2016-07-27 18:07:29 -07:00
Seth Alves	cd2f61c90c	if logging in, send username signature even when connecting to localhost	2016-07-27 14:03:51 -07:00
Seth Alves	bc2ded2f97	code review	2016-07-27 08:46:46 -07:00
Seth Alves	148793011d	code review	2016-07-27 07:55:09 -07:00
Bradley Austin Davis	54a7265be8	Removing empty file, because jenkins	2016-07-26 16:32:56 -07:00
Bradley Austin Davis	a9740b803f	Defer batch execution to the end of the frame generation	2016-07-26 16:13:48 -07:00
Bradley Austin Davis	fa20898285	Remove last direct use of gpu::Context::render()	2016-07-26 16:13:22 -07:00
Bradley Austin Davis	bb6abf11d3	FramebufferCache, cleanup & thread safety	2016-07-26 15:32:31 -07:00
Bradley Austin Davis	a455f3a435	Add frame concept to gpu library	2016-07-26 15:25:36 -07:00
Andrew Meadows	5ce681154d	Merge pull request #8301 from AlexanderOtavka/asset-browser-ui ... Asset browser ui	2016-07-26 15:04:10 -07:00
Chris Collins	a13c8385bb	Merge pull request #8319 from ZappoMan/punishSlowScripts ... better allocation of CPU time while loading scenes and when slow scripts are running	2016-07-26 12:54:31 -07:00