54634 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	0fff7678bf	code review	2017-05-03 19:07:46 -07:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Zach Fox	d28d89e8ff	Merge pull request #10368 from zfox23/palWebViewtoTabletWebView ... PAL WebView is now a TabletWebView	2017-05-03 16:51:32 -07:00
anshuman64	a924a33428	Merge pull request #10361 from ctrlaltdavid/21315 ... Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 16:41:43 -07:00
howard-stearns	3e57e80465	use new request module.	2017-05-03 16:39:34 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30:34 -07:00
howard-stearns	aa74dda9f3	cleanup	2017-05-03 16:29:37 -07:00
Seth Alves	c09009ad8b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 16:21:58 -07:00
Zach Fox	14315155b5	Remove the +1s	2017-05-03 15:59:06 -07:00
Zach Fox	cb51aaab61	ARG	2017-05-03 15:58:56 -07:00
howard-stearns	e3546c38fa	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 15:55:13 -07:00
samcake	e2e6b1f9f1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-03 15:46:56 -07:00
Zach Fox	259d6f8ec6	Merge pull request #10370 from zfox23/fixEventEnum ... Fix event enum	2017-05-03 15:45:22 -07:00
Zach Fox	4d49ae5b09	Remove the +1s	2017-05-03 15:43:57 -07:00
Zach Fox	07d3e482cf	ARG	2017-05-03 15:40:39 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
Zach Fox	eaf819d11d	Remove FIXME	2017-05-03 14:59:07 -07:00
Zach Fox	066b2db73f	Make the change	2017-05-03 14:57:31 -07:00
samcake	26441dbf2f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-03 14:54:11 -07:00
Sam Gateau	8507fffcc2	Merge pull request #10313 from samcake/ambient-bis ... Fixing the the mip gpu copy for compressed format texture in GL41Backend	2017-05-03 14:50:55 -07:00
Chris Collins	6da9e62037	Merge pull request #10304 from highfidelity/RC-38 ... Beta Release 38 - Includes up to Developer Release 6383	2017-05-03 16:49:39 -05:00
Seth Alves	e96c3e84b4	if a script attempts to edit a non-entity, don't send the edit packet over the wire	2017-05-03 13:58:49 -07:00
Brad Davis	0f9002d724	Prevent possible crash in texture buffering thread	2017-05-03 13:55:42 -07:00
Chris Collins	c4c62e790b	Merge pull request #10341 from jherico/texture_transfer_crash ... Prevent possible crash in texture buffering thread	2017-05-03 15:50:49 -05:00
howard-stearns	a007c1fe4b	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 13:46:00 -07:00
howard-stearns	42887d41c4	debugging	2017-05-03 13:45:48 -07:00
Zach Pomerantz	7f6a1be2c7	continue idling while minimized	2017-05-03 12:56:54 -07:00
Zach Pomerantz	4a8f5e380f	Merge pull request #10358 from zzmp/fix/minimize-deadlock ... Fix deadlock from minimizing	2017-05-03 15:06:27 -04:00
Howard Stearns	fb8cfd720e	Merge pull request #10362 from cfresquet/requestModuleRefactor ... Request module refactor	2017-05-03 11:57:23 -07:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
howard-stearns	33356b94d1	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 11:43:18 -07:00
Zach Fox	c82a07016d	New Preparing text; Better disabled behavior	2017-05-03 11:30:44 -07:00
samcake	c583ffbac4	Clean up names and comments	2017-05-03 11:30:09 -07:00
Ryan Huffman	a886963e20	Fix refresh crash with ktx textures	2017-05-03 11:26:52 -07:00
Ryan Huffman	7999ed6f60	Fix Resource::refresh for NetworkTexture	2017-05-03 11:26:52 -07:00
Ryan Huffman	2c19c5f045	Fix KTX creation not handling invalid storage	2017-05-03 11:26:52 -07:00
Ryan Huffman	0263021c0c	Fix loaded being reset to false for KTX resources	2017-05-03 11:26:52 -07:00
Stephen Birarda	5d1abe4499	Merge pull request #10307 from huffman/fix/ktx-crash ... Fix for resource downloads getting capped	2017-05-03 11:25:51 -07:00
Zach Fox	09488c4987	Disabled state for share butotns	2017-05-03 11:02:44 -07:00
CFresquet	afa72210e0	requested tweaks to makeUserConnection.js	2017-05-03 10:28:44 -07:00
Seth Alves	20051b970a	make clone work again	2017-05-03 10:03:25 -07:00
Seth Alves	79604d3529	AvatarList not AvatarManager	2017-05-03 10:03:12 -07:00
Seth Alves	a0a6dee764	some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero	2017-05-03 10:02:55 -07:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07:00
Ryan Huffman	44b6d12b75	Merge pull request #10356 from sethalves/fix-grab-cleanups ... Fix grab cleanups	2017-05-03 09:53:31 -07:00
CFresquet	28b166c51f	further request fiddling	2017-05-03 07:51:49 -07:00
CFresquet	b54ea63af7	incremental request module fixes	2017-05-03 07:35:30 -07:00
CFresquet	15db80c8ba	request module updates	2017-05-03 07:32:23 -07:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00