17354 commits

Author	SHA1	Message	Date
Chris Collins	1e2d77a99b	Merge pull request #8346 from sethalves/default-when-av-fails ... use default avatar when avatar-url is bogus	2016-08-05 15:13:58 -07:00
Brad Hefta-Gaub	82119f7f0b	Merge pull request #8336 from ctrlaltdavid/21018 ... close file browser dialog immediately after selecting asset to upload	2016-08-05 14:39:35 -07:00
Seth Alves	905c6147cf	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-04 09:56:32 -07:00
Chris Collins	2473bbf1db	Merge pull request #8313 from imgntn/tweak_lazers ... Tweak Teleport + Hand Lasers	2016-08-03 16:40:28 -07:00
Philip Rosedale	98e40d54e1	Merge pull request #8355 from SamGondelman/touchDeadZone ... Added dead zones to Hydra and Oculus Touch joysticks	2016-08-03 15:17:15 -07:00
James B. Pollack	7a41ed25db	Merge remote-tracking branch 'upstream/master' into tweak_lazers	2016-08-03 14:59:51 -07:00
Seth Alves	ad4fc8c656	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
SamGondelman	458e43fadc	added dead zones to hydras, style fixes	2016-08-03 10:18:57 -07:00
Brad Hefta-Gaub	70cb3d3393	Merge pull request #8354 from AlexanderOtavka/remove-web-debug ... Remove url change debug info for WebView	2016-08-03 09:10:10 -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
Seth Alves	7e94d4c694	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-02 19:34:17 -07:00
James B. Pollack	88ebeaa4cb	start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck	2016-08-02 18:46:47 -07:00
SamGondelman	1ce7623f41	added deadzones to oculus touch movements	2016-08-02 18:19:58 -07:00
Zander Otavka	3c30743d0d	Remove url change debug info for WebView	2016-08-02 16:48:39 -07:00
James B. Pollack	7fae7e9c77	cleanup	2016-08-02 12:26:37 -07:00
James B. Pollack	108e7a2fc1	Merge remote-tracking branch 'upstream/master' into tweak_lazers	2016-08-02 12:25:27 -07:00
James B. Pollack	a7b8f2c9df	updates	2016-08-02 12:25:24 -07:00
Seth Alves	79121133df	remove unneeded change	2016-08-02 12:00:45 -07:00
Seth Alves	528f417f74	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-02 11:55:17 -07:00
Seth Alves	f91df4997d	re-enable falling-back to default avatar if an avatar's url is bad	2016-08-02 11:55:11 -07:00
Seth Alves	75f9626c2d	if MyAvatar simulation is cut short (due to no skeleton), still update the head position	2016-08-02 11:50:53 -07:00
Seth Alves	56af36ae64	set head position of other avatars even if they can't be drawn	2016-08-02 11:29:43 -07:00
Seth Alves	229b8d3b5e	testing a more explicit fix of the audio failure	2016-08-02 10:46:11 -07:00
Seth Alves	ed4b0b3589	call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url.	2016-08-02 09:57:17 -07:00
Seth Alves	b953e6f0ff	when an avatar URL fails, switch to the default	2016-08-01 18:12:30 -07:00
David Rowe	31ac7a2812	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
Ryan Huffman	604c8f4a36	Merge pull request #8337 from humbletim/fix-Assets-getMapping ... fix Assets.getMapping(path, callback) to return a value	2016-08-01 13:32:08 -07:00
David Rowe	18b0ed9e8f	Close file browser dialog immediately after selecting asset to upload	2016-07-30 14:16:08 +12: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
Brad Hefta-Gaub	e879f22c95	fix behavior with no entity server	2016-07-28 15:15:52 -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
humbletim	3e0ef7d43a	make Assets.getMapping(path) actually return the mapping	2016-07-28 10:13:30 -04:00
Bradley Austin Davis	a9740b803f	Defer batch execution to the end of the frame generation	2016-07-26 16:13:48 -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
Brad Hefta-Gaub	2d199fe3d0	rename function for better clarity	2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub	83dc9ea6bb	punish slow scripts and don't send updates while physics is still loading	2016-07-25 21:46:30 -07:00
Anthony J. Thibault	fb84f058d6	Fix alpha cut-outs and incorrect gamma on Web3DOverlays	2016-07-25 15:56:05 -07:00
Zander Otavka	90154158b6	Fix gravity zero vector	2016-07-25 14:08:07 -07:00
Zander Otavka	344ec25bcd	Fix gravity for dynamic entities	2016-07-25 14:01:57 -07:00
James B. Pollack	38765e6fa4	extra space	2016-07-25 11:12:34 -07:00
James B. Pollack	84e4de4bad	update formatting	2016-07-25 11:11:37 -07:00
James B. Pollack	ea1c21e685	resolve merge	2016-07-24 18:51:00 -07:00
James B. Pollack	3b25b36db3	cleanup	2016-07-24 16:57:15 -07:00
James B. Pollack	8acb30da8e	add permissions bar	2016-07-24 16:54:00 -07:00
Brad Hefta-Gaub	4f04dbc926	Merge pull request #8308 from jherico/overlay_multi_edit ... Allow atomic editing of multiple overlays from scripts	2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub	43064807d1	Merge pull request #8292 from jherico/webui ... Fix some UI elements triggered by WebViews	2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub	41e02276e5	Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override ... Support for animGraphUrl override in FST file.	2016-07-23 13:42:46 -07:00