2617 commits

Author	SHA1	Message	Date
Zach Fox	a795822919	Comments and disable camera when switching	2017-06-15 10:09:28 -07:00
Zach Fox	498ed4cbe8	showSpectatorInDesktop true for now	2017-06-15 10:09:28 -07:00
Zach Fox	0114962e75	Make the Spectator button only appear in HMD (with debug mode)	2017-06-15 10:09:28 -07:00
Zach Fox	f214712b33	Merge pull request #10678 from zfox23/spectatorCamera_improvements1 ... Secondary camera and rendering improvements	2017-06-14 14:39:38 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
Zach Fox	03c61e2191	vFoV and clipping plane distances now come from config	2017-06-14 11:53:05 -07:00
Zach Fox	8962c7bf6a	Viewfinder re-flip, add comments regarding why it's necessary	2017-06-13 13:06:03 -07:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Zach Fox	7b6033f7bc	Getting closer to a solution	2017-06-13 11:37:27 -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
Zach Fox	4acbb81413	Checkpoint	2017-06-13 10:22:48 -07: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
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07: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
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
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
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
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	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