60490 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	30bffdea32	Quick bugfix	2017-10-23 11:45:51 -07:00
Zach Fox	5c8451a626	Auto-refresh Wallet Home & Purchases on 4s timer	2017-10-23 10:36:23 -07:00
Brad Hefta-Gaub	6607be5b58	Merge pull request #11642 from sethalves/fix-action-deadlock ... fix action (grab) deadlock	2017-10-21 12:27:40 -07:00
Seth Alves	2b0285adc2	fix action (grab) deadlock	2017-10-20 15:05:21 -07:00
Zach Fox	d255b36236	Merge pull request #11639 from zfox23/contextOverlayPositionFix ... Context Overlay (i) Position Fix	2017-10-20 14:00:45 -07:00
Zach Fox	61a12a70c0	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into contextOverlayPositionFix	2017-10-20 13:16:31 -07:00
Howard Stearns	c77fbe1a9d	Merge pull request #11637 from zfox23/hackInspectionCert ... Fix Entity Certificate display upon inspection in RC-57	2017-10-20 13:10:41 -07:00
Zach Fox	c217992866	Order of operations lol	2017-10-20 11:42:03 -07:00
Zach Fox	ae1b2bd931	'Tis a silly hack	2017-10-20 11:11:23 -07:00
Howard Stearns	352243c01b	Merge pull request #11629 from zfox23/wearItButton ... REZ IT -> WEAR IT	2017-10-20 09:36:09 -07:00
Seth Alves	f8a01dffb0	Merge pull request #11633 from sethalves/pr-11581-for-rc-57 ... Pr 11581 for rc 57	2017-10-20 09:00:08 -07:00
Zach Fox	b3acdfa9d8	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into wearItButton	2017-10-19 14:37:47 -07:00
Seth Alves	2c8c5e214c	puff querybox if entity is in motion	2017-10-19 13:19:41 -07:00
Seth Alves	e8ca455547	cleanups + call updateQueryAACube when parent changes or action is deleted	2017-10-19 13:19:35 -07:00
Seth Alves	c1e8d5144c	remove code which is no longer needed because of custom physics setters	2017-10-19 13:19:25 -07:00
Seth Alves	633f63df54	fix updateQueryAACube return-value	2017-10-19 13:19:19 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
Seth Alves	cf960dc44b	not a parent or child doesn't mean always recompute queryAACube	2017-10-19 13:19:06 -07:00
Seth Alves	ae70f091c3	don't accept updates to queryAACube if this interface is simulation owner	2017-10-19 13:18:45 -07:00
Seth Alves	f75e59c0a6	keep grabbed and worn entities from spamming entity-server	2017-10-19 13:18:37 -07:00
Zach Fox	322bac035c	Don't show 'no permission' text on wearables	2017-10-18 16:19:54 -07:00
Liv	2ab606a98b	Merge pull request #11615 from sethalves/pr-11614-for-rc-57 ... Pr 11614 for rc 57	2017-10-18 14:09:11 -07:00
Zach Fox	876001146a	Get categories from backend instead of site	2017-10-18 14:05:47 -07:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
John Conklin II	38de88bb68	Merge pull request #11621 from sethalves/fix-avatar-entity-bandwidth ... don't send avatar-entity updates for queryCube-changes	2017-10-18 10:55:46 -07:00
John Conklin II	08cfa32858	Merge pull request #11610 from ElderOrb/case8217_RC57 ... 8217 Search in tablet doesn't update (RC-57)	2017-10-18 10:41:33 -07:00
Seth Alves	f1abb0cd55	don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them	2017-10-17 19:01:24 -07:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Seth Alves	5e6c0870e7	handle camera-relative controller joints for other avatars	2017-10-17 13:06:40 -07:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14:43 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
Zach Fox	46f0189ab4	Merge pull request #11601 from zfox23/walletNotifFix ... Fix Wallet notification appearing when taking screenshots	2017-10-16 12:19:50 -07:00
Zach Fox	1cf816a261	Fix Wallet notification appearing when taking screenshots	2017-10-16 11:15:09 -07:00
Zach Fox	c25008cff3	Merge pull request #11594 from zfox23/commerce_octoberTweaks ... 2017-10-13 Commerce frontend tweaks	2017-10-16 09:25:43 -07:00
John Conklin II	1fcbf56ab7	Merge pull request #11596 from samcake/RC-57 ... RC-57 : Fixing the zone entity not rendered properly when created	2017-10-16 09:12:18 -07:00
beholder	f83040c572	updating code accordingly to the comments	2017-10-14 12:29:06 +03:00
samcake	a852d5040d	FIxing the zone entity not stacked properly when created	2017-10-13 16:04:48 -07:00
Zach Fox	5be9f2022e	Fix writing backup instructions when restoring wallet backup	2017-10-13 14:33:36 -07:00
Zach Fox	6b7c997a4c	Minor text tweak	2017-10-13 13:37:11 -07:00
Zach Fox	17a0dd2a76	Elide long usernames in injected code	2017-10-13 13:32:55 -07:00
Zach Fox	051019a57a	Fix certificate username text eliding too early	2017-10-13 12:10:37 -07:00
Zach Fox	95a9675220	Final help QA - minus link to blockchain docs	2017-10-13 10:58:15 -07:00
Bradley Austin Davis	4dcce6ef45	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread ... Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.	2017-10-12 17:37:05 -07:00
Stephen Birarda	8a331e29a2	Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker ... Feat/JS-Baker	2017-10-12 16:16:02 -05:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities ... Import av entities	2017-10-12 13:30:53 -07:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
utkarshgautamnyu	75aa3a73ad	changed pointer args to references in JSBaker:bakeJS()	2017-10-12 12:08:44 -07:00
Zach Fox	30d6c78e4e	Merge pull request #11580 from ElderOrb/case8210 ... 8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 11:49:18 -07:00
utkarshgautamnyu	49f601329f	Update JSBaker.h	2017-10-12 11:35:38 -07:00