61332 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	55f6ecb070	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-27 09:29:41 -07:00
Nissim Hadar	420b0f321c	Merge branch 'master' into hazeZone	2017-10-27 09:14:53 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Sam Gateau	a2765cffbd	adjusting the qml again ? i just hate the layout / anchor system	2017-10-26 23:22:06 -07:00
Andrew Meadows	5ed58d5e5d	enable Quad in ShapeEntityItem properties	2017-10-26 22:59:25 -07:00
Andrew Meadows	2710dca37c	fix rendering of Circles and Quads	2017-10-26 22:58:50 -07:00
Andrew Meadows	474609dabf	enforce dimensions of Circles and Quads	2017-10-26 22:58:24 -07:00
Andrew Meadows	901e145712	remove redundant dimensionsChanged()	2017-10-26 22:57:33 -07:00
Brad Hefta-Gaub	f21a284324	Merge pull request #11700 from SamGondelman/face ... Billboardables face avatar instead of facing away	2017-10-26 20:40:29 -07:00
samcake	1dbeac7b88	Adding the idons for Luci and cleaning up the scripts	2017-10-26 19:55:59 -07:00
samcake	0636a2db06	removing historic changes	2017-10-26 19:19:52 -07:00
MissLiviRose	c7857d4fc3	actually remove href not script	2017-10-26 17:47:04 -07:00
MissLiviRose	0ab06d624a	remove href property for non-owned avatar entities	2017-10-26 17:35:51 -07:00
samcake	79338f4316	removing the the unecessary files and trying using qrc:///qml	2017-10-26 17:12:49 -07:00
Zach Fox	9481824d0a	Fix enabled status of wear button	2017-10-26 17:02:09 -07:00
Zach Fox	8cb60fc62c	Small edit.js changes	2017-10-26 16:44:21 -07:00
Stephen Birarda	10d05ba6c9	only respond to expected ICE peers in DS	2017-10-26 16:34:49 -07:00
beholder	6093cef6f0	add comments to explain '-1'	2017-10-27 01:25:26 +03:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
SamGondelman	755ce183e0	fix is facing avatar	2017-10-26 14:16:31 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub	e6dca8de86	Merge pull request #11698 from kencooke/audio-sample-sound-fix ... Tighter version of sample sound	2017-10-26 13:45:19 -07:00
Zach Fox	d24f241b88	Fix silly javascript error	2017-10-26 13:31:15 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
Bradley Austin Davis	becd99a964	Merge pull request #11584 from SamGondelman/pointerEvents ... First step of cleaning up PointerEvents	2017-10-26 12:01:03 -07:00
Ken Cooke	2156729a75	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
Sam Gateau	6051a3913f	Merge pull request #11684 from NissimHadar/bugFix8610 ... Bug fix 8610	2017-10-26 10:55:29 -07:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
beholder	ddd25da430	8315 Stylus appears in wrong place on hand	2017-10-26 19:39:15 +03:00
Liv	c571af6bb2	Merge pull request #11689 from ctrlaltdavid/21580 ... Remove stopwatch source in favor of using source in hifi-content repo	2017-10-26 09:38:51 -07:00
Nissim Hadar	c5c996f186	Cleanup.	2017-10-26 09:21:38 -07:00
Ryan Downe Karpf	2f69e757a0	Merge pull request #11690 from highfidelity/RC-57.1 ... RC57.1 * Temporarily disable baking of JS files in Asset Server * Better handling of place name lookup - fixing some cases of unable to connect to domain	2017-10-26 08:57:27 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
Nissim Hadar	b820f397fc	Fix zero-divide.	2017-10-26 08:39:22 -07:00
Ken Cooke	30d6185625	Merge pull request #11687 from ctrlaltdavid/21577 ... Fix script reload icon not working in Windows developer builds	2017-10-26 08:35:59 -07:00
Seth Alves	807b4c4ed2	Merge pull request #11686 from NissimHadar/hazeZone ... Reduced haze background blend range to 27,000 metres.	2017-10-26 08:13:24 -07:00
luiscuenca	b7c375f396	Cleaning	2017-10-25 19:09:37 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Clément Brisset	61a2d80117	Merge pull request #11676 from Atlante45/new-master ... Merge stable back into master	2017-10-25 18:37:50 -07:00
Stephen Birarda	b7b0172a42	Merge pull request #11682 from birarda/bug/lost-ice-server ... Hotfix: fix null candidate ice-server QHostAddress	2017-10-25 20:27:56 -05:00
David Rowe	7cb6bae1e6	Remove stopwatch source in favor of using source in hifi-content repo	2017-10-26 14:09:50 +13:00
Stephen Birarda	0b28dfd569	Merge pull request #11685 from birarda/bug/js-bake-disable ... Hotfix: disable baking of JS files in Asset Server	2017-10-25 19:41:51 -05:00
Seth Alves	0f31631f17	Merge pull request #11677 from druiz17/fix-fargrab ... Make non-dynamic entities collisionless during far-grab	2017-10-25 17:31:02 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
David Rowe	da33c4fcf2	Fix script reload icon not working in Windows developer builds	2017-10-26 11:41:52 +13:00
Stephen Birarda	e450ac5bd3	don't use COW-less SpecialAddress assignment	2017-10-25 15:28:30 -07:00
Zach Fox	2f28cf1443	Remove unnecessary newline	2017-10-25 15:20:31 -07:00
Zach Fox	3f0108528d	Remove unnecessary newline	2017-10-25 15:19:56 -07:00