3186 commits

Author	SHA1	Message	Date
Zach Fox	8825e91775	emissive is true	2017-06-09 11:42:17 -07:00
Zach Fox	3f169e50fe	selfie to spectatorCamera	2017-06-09 11:42:17 -07:00
Zach Fox	3d9904cde1	Correctly position actual camera and preview overlay	2017-06-09 11:42:17 -07:00
Zach Fox	fd50434d86	New camera model; Cleanup; Bashing head :against desk	2017-06-09 11:42:16 -07:00
Zach Fox	3884287c41	Use 'resource' protocol instead of 'http'	2017-06-09 11:39:28 -07:00
Zach Fox	5114fd8e1f	Rename correctly?	2017-06-09 11:39:28 -07:00
Zach Fox	7aef4dab4c	Variable renaming pass	2017-06-09 11:39:28 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07: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
Liv	03edb06ecb	change design to run chat separately so it can be removed if users prefer to not use it	2017-06-08 13:46:33 -07:00
Liv	0e27ad767c	Move chat app to be included as part of the default scripts	2017-06-08 13:07:01 -07:00
howard-stearns	df8287d6ee	reset display texture as needed when switching camera or hmd	2017-06-08 11:35:55 -07:00
howard-stearns	ce2053e3b8	control-0 toggles display, and display itself only toggles when camera is ... on	2017-06-08 10:41:09 -07: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
howard-stearns	8db81ee5c9	wire up preview vs camera display in scripts	2017-06-07 16:19:36 -07:00
Zach Fox	d1719fade6	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-07 09:46:04 -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
Zach Fox	cbeea7abc4	Make the camera an avatar entity	2017-06-06 16:37:25 -07:00
Zach Fox	a30b678ecb	No more dynamic camera...for now.	2017-06-06 16:27:58 -07:00
Zach Fox	6e9b083be1	Function renaming; turn cam off when changing domains	2017-06-06 15:49:15 -07:00
Zach Fox	383ef542a1	Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset'	2017-06-06 14:59:26 -07:00
Zach Fox	ca05e3d0b6	Improvements to switch; switch settings persist	2017-06-06 14:17:38 -07:00
Zach Fox	557d1c65a3	Another checkpoint; added Switch.qml	2017-06-06 11:59:23 -07:00
Zach Fox	9970802142	Another checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	1fc7094b2c	Checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	e9bb982651	First checkpoint!	2017-06-06 11:59:22 -07:00
Andrew Meadows	f1dd5fbb14	Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet ... teleport.js should still function on avatars with no feet.	2017-06-06 09:33:00 -07:00
Anthony J. Thibault	90d241ca3c	Account for avatar scale	2017-06-06 09:10:46 -07:00
seefo	b729707ce7	Removed old comments in SnapshotReview.js	2017-06-06 09:10:25 -07:00
Seth Alves	dcbd279bd8	Merge pull request #10589 from vladest/create_in_landscape ... Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]	2017-06-05 12:46:03 -07:00
howard-stearns	4ccfef9702	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype	2017-06-05 11:18:40 -07:00
Andrew Meadows	85a1e1d691	Merge pull request #10608 from ctrlaltdavid/21379 ... Fix icon for polylines in entities editor properties page	2017-06-05 11:06:23 -07:00
Zach Fox	87fca16e0d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-05 10:48:12 -07:00
NeetBhagat	2ce72d554b	Resolve 2 issues: ... 1) Entity can grow/shrink if it is grabbed by first right hand then left hand. 2) Stop unwanted grow/shrink of an entity.	2017-06-05 14:13:51 +05:30
NeetBhagat	967c50ab93	Merge branch 'master' into 4869-Entity-resize-issue	2017-06-05 11:08:51 +05:30
Anthony J. Thibault	7da73d0ff1	teleport.js should still function on avatars with no feet.	2017-06-02 18:01:40 -07:00
Clément Brisset	0a864a7ce9	Merge pull request #10570 from ctrlaltdavid/21376 ... Move record script files to unpublishedScripts directory	2017-06-02 16:25:56 -07:00
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
Patrick Manalich	0b2de18e8e	Volume Change	2017-06-02 16:04:03 -07:00
Clément Brisset	5f91d2dcb7	Merge pull request #10569 from ctrlaltdavid/21312 ... Improve positioning of assets when added / imported	2017-06-02 15:45:18 -07:00
seefo	fa726f43a6	Fixed a bug in Polaroid canRez listener	2017-06-02 13:47:58 -07:00
seefo	7ade5b07a6	Final touches to Polaroids	2017-06-02 11:35:56 -07:00
David Rowe	58c4a2f12a	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
seefo	655a411865	Cleaned up Polaroid code	2017-06-02 11:02:01 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
NeetBhagat	580c2548e9	Initial Commit : ... 1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand. 2) Resolve right hand-left hand grow-shrink functionality	2017-06-02 23:04:58 +05:30