2615 commits

Author	SHA1	Message	Date
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07:00
Brad Davis	de88a34e97	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
Ryan Huffman	209a4f33b5	Merge pull request #10784 from huffman/feat/pal-replicated ... Disable silence + ban buttons for replicated users	2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub	a32f7b2395	Merge pull request #10743 from humbletim/21383 ... CR 21383: Integrate attachments into doppleganger mirror	2017-06-26 09:54:04 -07:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
David Rowe	6543b74b52	Add beeps	2017-06-24 14:26:01 +12:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -07:00
David Rowe	513e0cd232	Fix import of JSON with parent-child relationships	2017-06-20 16:44:25 +12:00
humbletim	89ebf4998f	relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror	2017-06-19 10:28:56 -04:00
Stephen Birarda	39e8510ccb	Merge pull request #10720 from seefo/fb5386 ... Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 15:03:45 -07:00
seefo	a4d008eec9	Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 08:57:27 -07:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	337b6bca14	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Matti Lahtinen	35f83afd09	Removed unneccessary print	2017-06-13 20:43:14 +03:00
Menithal	c2c1e607c0	Formating	2017-06-13 20:31:41 +03:00
Menithal	395cc55fb2	Fixed formatting	2017-06-13 20:20:54 +03:00
Menithal	020760cc97	21324: Fixed accidental inccorect bracket	2017-06-13 20:16:56 +03:00
Menithal	00701eb5c7	Merge remote-tracking branch 'origin/master' into 21324	2017-06-13 19:08:37 +03:00
Menithal	0edb763dac	21324: Formatting and PR Feedback Changes	2017-06-13 19:06:47 +03:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Seth Alves	92fe8145be	Merge pull request #10616 from vladest/create_button_sticked ... Set active button property isActive before Home menu redraw. Makes su…	2017-06-11 13:43:41 -07:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Clément Brisset	8e62bdea40	Merge pull request #10538 from ctrlaltdavid/21345 ... Position tablet relative to hand	2017-06-09 17:01:37 -07:00
David Rowe	fff8876b21	Code review	2017-06-10 09:33:45 +12:00
Seth Alves	759a87c27e	Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts ... Move chat app to run with default scripts	2017-06-08 20:26:34 -07:00
Liv Erickson	6657c4d997	Update chat.js ... remove stray semicolon	2017-06-08 17:22:18 -07:00
Seth Alves	d87b858c0a	Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue ... 4869 entity resize issue	2017-06-08 16:34:07 -07:00
Seth Alves	9fa74029c7	Merge pull request #10633 from mnafees/21299 ... CR for Job #21299 - Save category on Marketplace when using back button	2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi	b7f8cc7f0b	Fix intendantion	2017-06-08 22:58:40 +02:00
Liv	0e27ad767c	Move chat app to be included as part of the default scripts	2017-06-08 13:07:01 -07:00
Vladyslav Stelmakhovskyi	dc2c79baab	Merge with master	2017-06-08 21:10:30 +02:00
seefo	8d5b90afe7	Merge pull request #10600 from seefo/snapshot ... Added Polaroid Feature to Snapshot	2017-06-07 17:05:29 -07:00
seefo	26bd6b67ae	Final touches to polaroid feature	2017-06-07 16:52:16 -07:00
Mohammed Nafees	608becef7d	Make the back button work again, uses the browser history directly now.	2017-06-07 15:52:06 +05:30