18920 commits

Author	SHA1	Message	Date
Zach Pomerantz	67288528da	add Audio.context	2017-06-06 17:55:06 -04:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Dante Ruiz	8d6e4bf28c	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-06 21:09:19 +01:00
Stephen Birarda	0ccd0d3fd6	Merge pull request #10621 from highfidelity/stable ... Merge Stable back into Master	2017-06-06 10:39:03 -07:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
Chris Howe	8166fec0e0	Minor changes based on code review feedback ... See https://worklist.net/21317, https://github.com/highfidelity/hifi/pull/10609 and https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197	2017-06-06 12:11:57 -04:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
NeetBhagat	ae9a928740	Merge branch 'master' into 21255 ... # Conflicts: # interface/src/Application.cpp	2017-06-06 19:06:50 +05:30
NeetBhagat	e79fd9c5cb	Merge branch 'master' into 21369	2017-06-06 15:26:40 +05:30
NeetBhagat	0f9cd5d0c7	intial commit hifi: #21369 Implement parts of the JS "console" object	2017-06-06 15:20:08 +05:30
Howard Stearns	3de243b093	Include the radius of the sphere at the avatar's feet.	2017-06-05 18:48:11 -07:00
Seth Alves	20c9228050	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-05 15:53:23 -07:00
Seth Alves	7a276f027f	fix orientation used for 3d audio	2017-06-05 15:53:01 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub	51e00b9de9	Merge pull request #10614 from samcake/brown ... Introduce a stencil mask pass in the rendering to optimize HMD	2017-06-05 14:14:11 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00
Zach Pomerantz	9395de1873	add nop notify signals to Audio(Devices)	2017-06-05 14:57:44 -04:00
Seth Alves	3ab67cf27e	fix forward gaze in HMD while not looking at anyone	2017-06-05 11:44:27 -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
Zach Fox	87fca16e0d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-05 10:48:12 -07:00
Chris Collins	6cc6cd3bf6	Merge pull request #10604 from highfidelity/RC-42 ... Beta Release 42 - Includes up to Developer Release 6626	2017-06-05 09:13:19 -07:00
Seth Alves	27669d44a7	in deriveBodyFromHMDSensor, avoid using invalid head pose	2017-06-05 08:58:40 -07:00
Howard Stearns	ca526e0776	git rid of a lambda	2017-06-05 07:11:25 -07:00
Howard Stearns	05f41fb4f8	cleanup	2017-06-04 08:13:12 -07:00
Howard Stearns	a0ea306aed	cleanup, and include missing allowBackface parameter	2017-06-04 07:55:23 -07:00
Howard Stearns	fd01258c76	cleanup	2017-06-03 16:02:58 -07:00
Howard Stearns	02c46080f7	we don't need to force, but we do need some extra room for confined spaces	2017-06-03 15:43:14 -07:00
Howard Stearns	c48b729527	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-02 18:05:20 -07:00
Ryan Huffman	52c60b35df	Add startup_sent_to user activity event	2017-06-02 17:57:40 -07:00
Seth Alves	1b719ee654	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 16:31:23 -07:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
David Kelly	12cbc206d2	cr feedback	2017-06-02 15:59:15 -07:00
Clément Brisset	c636922a5d	Merge pull request #10590 from huffman/fix/running-marker ... Update server-console to watch interface via pid rather than marker	2017-06-02 15:57:44 -07:00
David Kelly	9b34abeb40	oops initializer order...	2017-06-02 15:43:29 -07:00
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -07:00
David Kelly	f9e1f02888	protect _text member of Text3DOverlay with mutex	2017-06-02 14:59:27 -07:00
samcake	0a3c1712eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 14:35:05 -07:00
Patrick Manalich	76901f5bf9	Final Application.cpp change	2017-06-02 14:08:56 -07:00
Seth Alves	c40a76f320	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 13:58:00 -07:00
Seth Alves	9088e288e0	don't worry about head controller being enabled, just check to see if head pose is valid	2017-06-02 13:57:53 -07:00
Ryan Huffman	c0bca73ec7	Merge pull request #10606 from huffman/feat/startup-went-to-event ... Add startup_sent_to user activity event	2017-06-02 13:49:41 -07:00
Stephen Birarda	d89febac71	use a sleep instead of a yield waiting for close event	2017-06-02 13:22:02 -07:00
Stephen Birarda	e3d8229abe	rename ClosureEventSender to CloseEventSender	2017-06-02 13:21:55 -07:00
Stephen Birarda	ecc697dbe1	remove crash event definition for now	2017-06-02 13:21:45 -07:00
Stephen Birarda	40dfcb1e6e	send quit event during shutdown on thread, with timeout	2017-06-02 13:21:37 -07:00
Stephen Birarda	f5d732f332	initial version of the ClosureEventSender using std::thread	2017-06-02 13:21:28 -07:00
Chris Collins	34201ea1da	Merge pull request #10599 from jherico/ktx_cache_wipe ... Add versioning support to the KTX cache	2017-06-02 13:02:18 -07:00
Sam Gateau	8a2837e1f7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 11:52:11 -07:00
Brad Davis	1f95daf5c1	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Ryan Huffman	0d96f82888	Merge pull request #10592 from birarda/close-report ... Send a close event to API on shutdown	2017-06-02 10:57:41 -07:00
Patrick Manalich	1f478bdf13	Repair Application.cpp	2017-06-02 10:44:58 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
Patrick Manalich	0c71cf4bda	Edit: Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Patrick Manalich	4e61db8263	Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Seth Alves	d91b3700a7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 10:07:50 -07:00
Ryan Huffman	0fdbf4a342	Add startup_sent_to user activity event	2017-06-02 09:59:29 -07:00
Seth Alves	bc2311cb35	Merge pull request #10561 from AndrewMeadows/sanity-check-physics ... fix crash in EntityMotionState::handleDeactivation()	2017-06-02 09:55:20 -07:00
NeetBhagat	6228ff19bf	Resolve the reviewed comments of @ZappoMan	2017-06-02 15:23:21 +05:30
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
NeetBhagat	e08c3453a4	Merge branch 'master' into 21255	2017-06-02 12:36:07 +05:30
Ryan Huffman	86da91ac8d	Remove the runningMarker timer	2017-06-01 18:19:13 -07:00
Stephen Birarda	6d1bbc389d	use a sleep instead of a yield waiting for close event	2017-06-01 17:57:23 -07:00
Stephen Birarda	9fad8d1821	rename ClosureEventSender to CloseEventSender	2017-06-01 17:52:01 -07:00
howard-stearns	6b2e4c5abc	zaru stuff	2017-06-01 17:08:22 -07:00
Seth Alves	7d21ab88b0	add some saftey checks. cleanups	2017-06-01 16:14:59 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Stephen Birarda	c513d04b52	remove crash event definition for now	2017-06-01 13:40:50 -07:00
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
howard-stearns	1068a4a9bd	remove the optimization for upperId == lowerId. Doesn't work in zaru ... tunnels.	2017-06-01 13:21:24 -07:00
Stephen Birarda	792d938262	send quit event during shutdown on thread, with timeout	2017-06-01 13:01:24 -07:00
Ryan Huffman	aaf9b9ac7f	Update server-console to watch interface via pid rather than marker	2017-06-01 11:20:36 -07:00
Seth Alves	b83620f7c5	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-01 10:58:33 -07:00
Seth Alves	eca05d9c42	more use of head input	2017-06-01 10:57:53 -07:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
Seth Alves	0b2eb43ee2	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 07:02:31 -07:00
NeetBhagat	d27ad061cb	Merge branch 'master' into 21255	2017-06-01 12:46:14 +05:30
NeetBhagat	c7c07b28e9	Resolve the reviewed comments of @ZappoMan	2017-06-01 12:17:13 +05:30
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Stephen Birarda	1d9d83b157	initial version of the ClosureEventSender using std::thread	2017-05-31 19:00:41 -07:00
Zach Pomerantz	954e4979f8	expose Audio.devices.input/output	2017-05-31 20:14:58 -04:00
howard-stearns	1e1dd3a633	checkpoint with working detector	2017-05-31 17:10:37 -07:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
Chris Howe	6edc6b2756	WL21317 ... New MyAvatar functions to support converting from avatar joint space to world space and vice versa. Added some tests to support these functions.	2017-05-31 15:05:43 -04:00
Patrick Manalich	7b69a5dbd5	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
howard-stearns	07ea2e271b	hook into location changes	2017-05-30 14:59:19 -07:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Chris Collins	5db0975554	Merge pull request #10556 from highfidelity/RC-41 ... Beta Release 41 - Includes up to Developer Release 6603	2017-05-30 12:52:30 -07:00
howard-stearns	fe351f8ea2	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-30 12:04:15 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
volansystech	e90b1b5a67	Resolve the comments of @ZappoMan.	2017-05-29 18:21:59 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
Zach Pomerantz	4a3f2e1d09	use subclass for interface's Audio interface	2017-05-28 19:25:37 -04:00
Zach Pomerantz	b2eda7cf22	rm AudioDevice interface	2017-05-28 19:04:51 -04:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Zach Pomerantz	03d3666c0c	show menu after requesting it	2017-05-28 17:34:11 -04:00
Zach Pomerantz	156b3f9738	use showDialog instead of toggleMenu	2017-05-28 17:10:59 -04:00
Seth Alves	66415dadc6	Merge pull request #10496 from volansystech/Wl-21298 ... Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-27 08:28:19 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
howard-stearns	92aeadd70f	rotation of local capsule offset	2017-05-26 16:34:08 -07:00
howard-stearns	f694691efb	add fixme comments and make isUp/isDown ordinary methods.	2017-05-26 16:15:18 -07:00
howard-stearns	4be31f1b18	thread safety	2017-05-26 15:31:59 -07:00
Atlante45	ccc7cb638d	Fix "retain avatar info"	2017-05-26 14:18:29 -07:00
Zach Pomerantz	637a448c2c	abstract toggleMenu	2017-05-26 17:12:15 -04:00
Zach Pomerantz	380a16f9dd	use SYSTEM_TABLET static	2017-05-26 17:11:32 -04:00
Andrew Meadows	fa003b0c14	swap order of changes and deactvations	2017-05-26 12:29:37 -07:00
howard-stearns	7cee438298	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 11:36:04 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
volansystech	8d9cfbdf31	Resolve comments of @sethalves . Remove whitespaces.	2017-05-26 11:41:35 +05:30
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
howard-stearns	905b5261d1	If collisions are enabled, turn them off in safeLanding, and ... restore.	2017-05-25 16:32:44 -07:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
howard-stearns	ac8cb63419	clean and DRY	2017-05-25 14:34:24 -07:00
Dante Ruiz	108c444cc7	clean up code	2017-05-25 21:59:06 +01:00
Andrew Meadows	3bd0c111d7	verify empty ShapeManager in Application dtor	2017-05-25 13:47:40 -07:00
howard-stearns	9d73d0c931	works with nested enclosing entities	2017-05-25 12:09:22 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
howard-stearns	74c163d047	snapshot of safeLanding. Works as long as entities don't intersect.	2017-05-25 10:25:29 -07:00
volansystech	a2851b5bcb	Put proper comments and indentation.	2017-05-25 18:47:59 +05:30
volansystech	8d51be644d	Merge branch 'master' into 21255	2017-05-25 17:48:48 +05:30
volansystech	cab6f3f7c3	Solve Jitteriness while scrolling.	2017-05-25 17:28:19 +05:30
volansystech	aab80629ea	Merge branch 'master' into Wl-21298	2017-05-25 15:44:17 +05:30
volansystech	1f24e38585	Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.	2017-05-25 14:56:06 +05:30
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
Stephen Birarda	f897f3f090	send machine fingerprint as uuid without curly braces	2017-05-24 19:08:25 -07:00
Stephen Birarda	50285005be	add machine fingerprint to the launch event	2017-05-24 18:35:57 -07:00
Stephen Birarda	c671817fa3	fix cache http request count in stats	2017-05-24 17:47:40 -07:00
Stephen Birarda	fefb34512d	change asset inbound key to atp	2017-05-24 17:44:09 -07:00
Stephen Birarda	c37fd335e1	track the number of local socket changes	2017-05-24 17:41:52 -07:00
Stephen Birarda	5e61f20df8	add more details about pending downloads	2017-05-24 17:37:42 -07:00
Stephen Birarda	48c4db1ca4	nest the download stats so they are cleaner	2017-05-24 17:36:21 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
Stephen Birarda	3743cd23b4	add detailed download stats for file/http/atp	2017-05-24 17:22:38 -07:00
Stephen Birarda	ac55908e42	add additional information to stats/launch activities	2017-05-24 16:50:06 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
anshuman64	2b63eb9d90	Merge pull request #10469 from druiz17/improve-rotation-jitter ... Added a LowVelocityFilter to the input system.	2017-05-24 08:35:13 -07:00
volansystech	0c4cd96bfd	Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.	2017-05-24 12:26:07 +05:30
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Clément Brisset	ed86ca3e55	Merge pull request #10522 from birarda/bug/version-number-jumps ... remove version difference from update dialog	2017-05-23 10:28:50 -07:00
Dante Ruiz	0cbdeaa1e8	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-23 18:26:58 +01:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Anthony J. Thibault	06c26f029a	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
Sam Cake	7f9c98a922	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 22:54:43 -07:00
Chris Collins	978eb0dfa9	Merge pull request #10492 from ctrlaltdavid/21359 ... Fix eye behavior in recording playback	2017-05-22 21:53:13 -07:00
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00
Sam Gateau	e4a516dcbf	Merge pull request #10497 from AndrewMeadows/crashfix-null-rig ... fix crash for Zone with 'compoundURL' property	2017-05-22 18:18:08 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
David Rowe	b0962865b2	Code review	2017-05-23 09:57:53 +12:00
Stephen Birarda	3e09c911f5	remove number of versions behind from the update dialog	2017-05-22 14:19:36 -07:00
David Rowe	9f83ca518f	Merge branch 'master' into 21359	2017-05-23 09:18:10 +12:00
volansystech	1cbf685133	Merge branch 'master' into Wl-21298	2017-05-22 10:58:05 +05:30
volansystech	6da46c2d4c	Resolve Mouse hover issue.	2017-05-22 10:53:58 +05:30
Atlante45	2928507e48	Fix "Reset Settings" window poping up every time	2017-05-21 08:37:17 -07:00
samcake	c5b5aa93b1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-19 18:13:42 -07:00
David Rowe	768415695d	Tidying	2017-05-20 12:43:47 +12:00
David Rowe	eef707e4e9	Simplify code	2017-05-20 12:42:40 +12:00
Andrew Meadows	d3956b47d0	remove bad break	2017-05-19 15:35:29 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Sam Gateau	36ac623e66	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-19 13:25:36 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
howard-stearns	af98b3bd4c	cleanup	2017-05-19 10:45:36 -07:00
volansystech	2691855e2b	Merge branch 'master' into Wl-21298	2017-05-19 10:43:31 +05:30
howard-stearns	469ffd41ab	bring back proper cached args	2017-05-18 17:07:41 -07:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips ... And opened up hip constraints.	2017-05-18 16:29:55 -07:00
howard-stearns	3f5f47e7f3	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype	2017-05-18 16:13:15 -07:00
howard-stearns	242cbdf2df	Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1	2017-05-18 16:02:45 -07:00
howard-stearns	851911f55a	Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1	2017-05-18 15:28:40 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
samcake	2c6e10fbe1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 09:21:02 -07:00
Dante Ruiz	90ddc16d09	add calibration data to filters	2017-05-18 17:07:28 +01:00
volansystech	b2ac4381eb	Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-18 19:13:59 +05:30
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Andrew Meadows	09433a93ba	Merge pull request #10477 from AndrewMeadows/correct-avatar-mass ... More correct avatar mass	2017-05-17 16:22:06 -07:00
Zach Fox	d4752926b8	First pass - checking performance	2017-05-17 13:51:27 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions ... cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Dante Ruiz	a18940142e	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 ... Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
howard-stearns	fed5397b38	a camera	2017-05-16 16:46:52 -07:00
Andrew Meadows	d065b569d3	support for variable avatar mass by size	2017-05-16 16:03:51 -07:00
Andrew Meadows	805d23567d	fix simple typo	2017-05-16 16:03:50 -07:00
Atlante45	201f81f20a	Don't wait on the sandbox	2017-05-16 14:41:57 -07:00
Andrew Meadows	e9c703b147	add deprecation log for DYNAMIC_TYPE_SPRING	2017-05-16 10:34:39 -07:00
Andrew Meadows	9e08dadaf4	Remove ObjectActionSpring	2017-05-15 22:11:42 -07:00
Dante Ruiz	724f849d88	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-16 00:15:18 +01:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
samcake	2df6d0df48	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-15 13:40:56 -07:00
Seth Alves	66a1dbfcfe	Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation ... cleanup Head::simulate() code	2017-05-15 11:21:43 -07:00
howard-stearns	fa9d866369	change camera pos/orientation through config	2017-05-15 07:10:12 -07:00
howard-stearns	3a0cc4e975	begin/end are Model, not ModelI/O, and begin has config	2017-05-14 15:48:40 -07:00
howard-stearns	9d1283e067	resetSize of texture	2017-05-14 15:24:35 -07:00
Vladyslav Stelmakhovskyi	cc10fc81b7	Fix crash in sit script	2017-05-13 20:57:04 +02:00
Howard Stearns	142b4f4203	kill warnings	2017-05-12 18:18:46 -07:00
anshuman64	49d4cf4e68	Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config ... More stable IK when hips, feet and chest are controlled via external input	2017-05-12 17:22:29 -07:00
howard-stearns	29299976ee	render task should default off and be enabled by script	2017-05-12 17:03:23 -07:00
howard-stearns	bca2cf45c0	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-05-12 15:21:03 -07:00
Seth Alves	4af0a85aa0	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 13:03:58 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
Seth Alves	bc6fb182eb	pull out motor action, fix import of slider and cone-twist constraints	2017-05-12 10:32:28 -07:00
samcake	3393456d91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-12 10:15:13 -07:00
Seth Alves	c6131916e1	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 09:46:21 -07:00
Seth Alves	e1c805e76f	lock in Overlays::findRayIntersectionInternal	2017-05-11 17:02:00 -07:00
samcake	39241bec13	Prototyping a way to produce a selfie and use the rendering directly	2017-05-11 15:58:31 -07:00
Andrew Meadows	a43447310d	remove physics dependency from avatars-render lib	2017-05-11 15:22:22 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Andrew Meadows	0852852f39	Merge pull request #10443 from ctrlaltdavid/21326-2 ... Fix avatar recording playback mouth not moving	2017-05-11 10:41:41 -07:00
samcake	6b32219f5f	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-11 10:07:27 -07:00
Seth Alves	4042e2bceb	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-11 09:29:30 -07:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
David Rowe	1b855f2c6b	Voice modulation and facetrackers write to transient blendshapes	2017-05-11 18:15:38 +12:00
Anthony J. Thibault	147d067c4e	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 18:12:39 -07:00
samcake	737fdf9dd8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 17:28:07 -07:00
Atlante45	79d53d92a1	Use baked default skybox	2017-05-10 16:03:02 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Brad Hefta-Gaub	f91f42b0c8	Merge pull request #10411 from zzmp/feat/tester-flag ... Add launch.tester to user_actions	2017-05-10 11:58:24 -07:00
samcake	39f6e22da3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 09:48:26 -07:00
Seth Alves	9184936496	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-10 09:30:39 -07:00
Anthony J. Thibault	93b8dc550c	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 09:03:21 -07:00
Ryan Huffman	bddfdfa838	Adjust Web3DOverlay to load QML even if not visible	2017-05-09 16:01:20 -07:00
Zach Pomerantz	45feee38b2	Merge pull request #10269 from zzmp/fix/audio-bg-join ... Cleanup Audio background threads on shutdown	2017-05-09 17:23:36 -04:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
samcake	c36035d3eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-09 10:46:38 -07:00
trent	9c8b844e26	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-09 12:51:28 -04:00
trent	7faed38bb5	Just use the smooth time constant instead of a variable.	2017-05-09 12:51:25 -04:00
Seth Alves	1e1968357a	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-09 09:24:50 -07:00
Andrew Meadows	e92e710cdc	Merge pull request #10413 from humbletim/fix_lookat_regression ... Fix lookAt eye snapping	2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
humbletim	29b1ac3572	optimizations per feedback	2017-05-08 21:50:24 -04:00
humbletim	42d1498d20	call Model::updateRig (not Parent::updateRig)	2017-05-08 21:19:18 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
Zach Pomerantz	defc3c1c4f	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-08 19:55:10 -04:00
Seth Alves	de589a32f3	clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring	2017-05-08 16:36:51 -07:00
Zach Pomerantz	929079df97	add launch.tester to user_actions	2017-05-08 19:33:09 -04:00
humbletim	ef0e32643d	update refactored logic to match previous application behavior	2017-05-08 18:53:47 -04:00
Anthony J. Thibault	712fcbe27a	Removed cruft/debug code & comments	2017-05-08 15:06:30 -07:00
Anthony J. Thibault	7af93f9fea	Hooked up IK constraint rendering	2017-05-08 15:06:29 -07:00
Anthony J. Thibault	e992d6703a	WIP: debug render joint constraints.	2017-05-08 15:06:28 -07:00
Anthony J. Thibault	a260163aee	WIP commit, first pass at generating limit center joints + debug draw	2017-05-08 15:06:27 -07:00
Andrew Meadows	afe0447322	remove unnecessary virtual keyword	2017-05-08 14:27:39 -07:00
Andrew Meadows	138a987a8f	_rotationChanged is a timestamp	2017-05-08 14:27:18 -07:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Seth Alves	c8cdad5b4e	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-08 11:02:42 -07:00
Chris Collins	4bfb23b5d2	Merge pull request #10388 from humbletim/21308 ... CR #21308 Fix Script.print	2017-05-08 10:46:49 -07:00
Chris Collins	0351ac1575	Merge pull request #10401 from jherico/fix_benny_hill_animations ... Fix sped up animations	2017-05-08 09:11:23 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Seth Alves	5d539bcc17	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-06 07:49:02 -07:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
samcake	bc1e5101ac	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-05 16:13:51 -07:00
Seth Alves	b2ccc33a79	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-05 14:52:07 -07:00
Zach Pomerantz	ca7cd61c64	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-05 13:04:01 -04:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Chris Collins	8d49540f3a	Merge pull request #10380 from vladest/rightclick-fix ... Rightclick fix	2017-05-05 10:01:11 -07:00
Andrew Meadows	63042eea3a	fix flawed fix of bad rebase	2017-05-05 09:37:00 -07:00
Andrew Meadows	41ad25ade1	fix bad rebase of changed menu option	2017-05-05 09:37:00 -07:00
Andrew Meadows	fe401c7488	improved management of collisionless avatar state	2017-05-05 09:37:00 -07:00
Andrew Meadows	d34b667e82	remove kinematic character controller implemention	2017-05-05 09:35:49 -07:00
Andrew Meadows	0aa579225c	even more correct API: MyAvatar.collisionsEnabled	2017-05-05 09:35:49 -07:00
Andrew Meadows	559f5836c5	restore MyAvatar.setCharacterControllerEnabled()	2017-05-05 09:35:49 -07:00
Andrew Meadows	94ee6d6838	fix driving motion of collisionless avatars	2017-05-05 09:35:49 -07:00
Andrew Meadows	c47e26174c	support collisionless avatar when playing recording	2017-05-05 09:35:49 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
humbletim	25807a5258	fix warning color	2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	0406cc41e0	if model-overlay has no name, use its url	2017-05-04 18:37:04 -07:00
Seth Alves	c04c0c5b13	if model-overlay has no name, use its url	2017-05-04 18:36:51 -07:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Atlante45	ecda313223	Add runtime access to compression settings	2017-05-04 15:07:59 -07:00
humbletim	6cb95b2393	add and connect handlers for scriptWarningMessage and scriptInfoMessage signals	2017-05-04 17:43:00 -04:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
humbletim	fe36e6a793	fix JSConsole script message handlers and about: filename	2017-05-04 16:45:12 -04:00
Vladyslav Stelmakhovskyi	d522864141	Remove debug prints	2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi	c8a9b02c7a	Block only secondary button	2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi	4cefa0379c	Merge branch 'master' into rightclick-fix	2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi	99ed2556f2	Do not send non primary button events to Tablet window	2017-05-04 16:11:07 +02:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30:34 -07:00
Zach Fox	4d49ae5b09	Remove the +1s	2017-05-03 15:43:57 -07:00
Zach Fox	07d3e482cf	ARG	2017-05-03 15:40:39 -07:00
trent	d7ed727faf	Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.	2017-05-03 16:56:18 -04:00
trent	ca4b563768	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-03 16:34:34 -04:00
Zach Pomerantz	4a8f5e380f	Merge pull request #10358 from zzmp/fix/minimize-deadlock ... Fix deadlock from minimizing	2017-05-03 15:06:27 -04:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
trent	fc3cce6b73	Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.	2017-05-03 12:35:35 -04:00
trent	24f2678cdd	Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.	2017-05-03 12:05:21 -04:00
trent	786838d092	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 20:21:35 -04:00
Zach Pomerantz	ad8d3e5490	continue idling while minimized	2017-05-02 20:05:55 -04:00
trent	557a8fffd7	Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D	2017-05-02 19:56:47 -04:00
Trent Polack	0a5dfbb9af	Changed l to interp. ... In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.	2017-05-02 19:10:33 -04:00
Sam Gateau	a7eecdfb26	Merge pull request #10265 from samcake/ambient ... Making the render engine Job/Task system configurable and reusable	2017-05-02 14:55:53 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
trent	f79e032841	Silly online git merge tool. You are silly. Errors fixed.	2017-05-02 14:48:27 -04:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00
trent	6d1fb8a6f8	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-02 13:55:39 -04:00
trent	49881b5ea2	Actually the full set of changes. Kids: don't forget to pop your stash.	2017-05-02 13:55:32 -04:00
samcake	df54ad2339	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-02 10:50:39 -07:00
Trent Polack	8f93a9a074	Merge branch 'master' into feature/snap-turn-smoothing-21270	2017-05-02 13:43:32 -04:00
trent	8f34ec4c7f	Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.	2017-05-02 13:41:34 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Seth Alves	dc569051f9	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-05-02 09:50:13 -07:00
trent	6317857e3d	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 12:11:39 -04:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Seth Alves	45a50f9a46	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5	2017-05-01 15:32:29 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
trent	4d7eeed343	Marking MyAvatar's rotation as dirty if smoothing is going down.	2017-05-01 15:21:25 -04:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
trent	773563850c	Merge hifi/master with my branch, fixed merge issue.	2017-05-01 13:23:02 -04:00
Vladyslav Stelmakhovskyi	dde363ef3d	Merge branch 'master' into audio-source-sync	2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
Anthony J. Thibault	0c09823f67	clang warning fixes, unused variables...	2017-05-01 09:10:31 -07:00
Seth Alves	7f69bdecb2	first try at angular-velocity setting action	2017-05-01 07:06:21 -07:00
Seth Alves	7ce0ef2ec4	fix spring action so that it can be linear or rotational or both	2017-04-30 10:04:07 -07:00
Seth Alves	4c4e0dffcc	bullet cone-twist constraint	2017-04-29 12:30:12 -07:00
Seth Alves	6623028d71	ball-and-socket constraint	2017-04-29 08:35:55 -07:00
Seth Alves	9e7ef83bd1	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4	2017-04-29 07:01:44 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Stephen Birarda	c518aa55be	Merge pull request #10312 from birarda/upload-new-models-to-entity ... add an entity file replacement via domain-server content page	2017-04-28 16:06:05 -07:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Anthony J. Thibault	108cd80bb5	Merge branch 'master' into feature/head-standard-action	2017-04-28 10:41:29 -07:00
Andrew Meadows	994eed7b83	safer delete of AvatarMotionStates	2017-04-28 10:18:19 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Seth Alves	2a0fc5b34c	Merge pull request #10273 from hyperlogic/feature/hips-ik-target ... Avatar IK system now supports manipulating the hips.	2017-04-28 09:17:33 -07:00
Anthony J. Thibault	b80270400f	Merge branch 'master' into feature/hips-ik-target	2017-04-27 18:15:12 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Stephen Birarda	038ac745c8	clear domain octree details if ES killed	2017-04-27 17:47:18 -07:00
Anthony J. Thibault	764f6c69ea	Head input action will override the HMD for IK.	2017-04-27 17:39:25 -07:00
Zach Fox	3ce81844da	Snapshot JS interface for better Settings handling	2017-04-27 14:01:08 -07:00
Zach Fox	6711e8cbc2	Remove duplicate setting; Make settings page open; button state	2017-04-27 14:01:07 -07:00
Zach Fox	3221214283	New Snap FTUE flow	2017-04-27 14:01:07 -07:00
Zach Fox	eaa699bbfd	Wow, it's really coming together!	2017-04-27 14:01:06 -07:00
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
Howard Stearns	88c3b4d9d3	Merge pull request #10258 from howard-stearns/watch-for-announcements ... watch for announcements	2017-04-27 14:00:39 -07:00
Andrew Meadows	5cf233db3a	less labyrinth	2017-04-27 13:16:50 -07:00
Andrew Meadows	aa90a6bd02	use static methods for setting avatar debug options	2017-04-27 13:16:50 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
Andrew Meadows	442080dec7	remove unused RenderArgs::_cameraMode hack	2017-04-27 13:16:50 -07:00
Andrew Meadows	00b05ed137	connect menu options to avatar render features	2017-04-27 13:16:50 -07:00
Andrew Meadows	823f3a73c6	remove commented out cruft	2017-04-27 13:16:50 -07:00
Andrew Meadows	72f5860538	restore RecordingScriptingInterface to Application	2017-04-27 13:16:50 -07:00
Andrew Meadows	caf6a77baf	repair bad merge during rebase	2017-04-27 13:16:50 -07:00
Andrew Meadows	2441536de3	remove Avatar dependency on AvatarMotionState	2017-04-27 13:16:49 -07:00
trent	53f47c132f	Avatar snap-turn rotation smoothing (sent out from the local client outward).	2017-04-27 16:12:25 -04:00
Andrew Meadows	010d1dfa22	remove Menu dependency from Avatar class	2017-04-27 13:11:57 -07:00
Andrew Meadows	6393972874	remove AvatarManager dependency from Avatar	2017-04-27 13:11:57 -07:00
Andrew Meadows	65682a914d	remove cufty AvatarManager LocalLights feature	2017-04-27 13:11:57 -07:00
Andrew Meadows	4c212fb1e5	pull qApp spaghetti out of Avatar class ... some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-27 13:11:57 -07:00
Seth Alves	b0c12dd84a	warn rather than crash if we get unexpected action data	2017-04-27 13:04:47 -07:00
Seth Alves	203a14f2a0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux	2017-04-27 12:56:11 -07:00
David Kelly	63468cc9e1	Thread safety for sending location	2017-04-27 12:20:56 -07:00
Philip Rosedale	f555291d92	Merge pull request #10296 from Triplelexx/21296 ... 21296 - Move two menu items	2017-04-27 11:37:07 -07:00
Seth Alves	93f9716557	merge from upstream	2017-04-27 10:17:00 -07:00
Seth Alves	15661987be	load tablet overlay models with higher priority	2017-04-27 10:16:08 -07:00
Seth Alves	68b59e4601	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux	2017-04-27 07:56:49 -07:00
Seth Alves	b196dd082b	expose bullet slider constraint to javascript	2017-04-27 07:56:35 -07:00
Triplelexx	a154879001	change menu item text Audio Noise Reduction to Noise Reduction	2017-04-27 03:25:24 +01:00
Triplelexx	f9c6cb27f4	change menu item for avatar collisions to "Collide with world"	2017-04-27 03:16:04 +01:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
Triplelexx	f795027ab7	change menu item locations ... AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.	2017-04-27 01:09:04 +01:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Ryan Huffman	8ba56a96df	Merge pull request #10240 from zzmp/fix/hmd-tutorial ... Condition tutorial on active HMD	2017-04-26 14:00:02 -07:00
Andrew Meadows	fd874429c1	remove unused cruft	2017-04-26 12:51:16 -07:00
Andrew Meadows	ac751029c0	remove identity cache code	2017-04-26 12:51:16 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
Anthony J. Thibault	ef43ff4b99	Add default pose matrices to InputCalibrationData structure	2017-04-26 11:55:24 -07:00
ZappoMan	5dd6daaad7	send identity on nodeActivated not nodeAdded	2017-04-26 11:42:38 -07:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
David Rowe	1b635d8c5e	Replace FIXMEs with proper code	2017-04-26 13:29:51 +12:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
ZappoMan	65801cbb4d	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 18:21:17 -07:00
ZappoMan	5164aa4056	hacking	2017-04-25 18:21:09 -07:00
trent	2963d3d212	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 19:31:21 -04:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Dante Ruiz	5a9cf554e7	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-25 23:57:48 +01:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
David Rowe	7c2e1aa846	Tidy FIXME	2017-04-26 10:16:35 +12:00
Anthony J. Thibault	dc19f37726	input/controller routing thru skeleton model and rig.	2017-04-25 15:04:47 -07:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
Zach Pomerantz	d2bfcce3f7	Merge pull request #10242 from zzmp/fix/display-log ... Send changed_display_mode after it changes	2017-04-25 16:36:12 -04:00
trent	f28b58f56e	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 15:35:11 -04:00
Seth Alves	23592f4a53	get rid of _trackedHeadPosition ... (cherry picked from commit e909938b232e11400832ae7dd29de16968967668)	2017-04-25 11:03:43 -07:00
Seth Alves	0cd2863df4	start on routing HMD position and rotation through controller interface ... (cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)	2017-04-25 11:01:52 -07:00
David Rowe	d682924b00	Temporary fix for recording audio	2017-04-25 21:08:10 +12:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Anthony J. Thibault	937f308ba8	code cleanup	2017-04-24 17:04:16 -07:00
humbletim	3641ca3816	add support for jointRotations/jointTranslations to ModelOverlay	2017-04-24 19:24:54 -04:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
Zach Pomerantz	4a26785eda	cleanup Audio bg threads in cleanupBeforeQuit	2017-04-24 18:21:27 -04:00
Zach Pomerantz	cd2665fc55	standardize Audio bg thread joins	2017-04-24 18:10:50 -04:00
Anthony J. Thibault	dc3803a225	Re-enable IK _hipsOffset computation when no hips IK target is present.	2017-04-24 13:59:02 -07:00
David Rowe	d52125e2f5	Merge branch 'master' into 21249	2017-04-25 07:19:56 +12:00
Dante Ruiz	f69691afd5	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 19:57:48 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
samcake	c36f8da4c0	Fixing build on mac	2017-04-24 10:46:29 -07:00
trent	b00cd66a2a	Revisited where smoothing was done (to a much lower-level); still needs testing.	2017-04-21 22:36:11 -04:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug ... Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
howard-stearns	ce7f3197f6	watch for announcements	2017-04-21 14:27:38 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
trent	a94f4ca182	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-21 13:22:32 -04:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
Ken Cooke	a5ed3007b3	Merge pull request #10248 from vladest/notify-sound-inject ... Notify sound inject	2017-04-21 09:26:36 -07:00
ZappoMan	c03182546b	some cleanup	2017-04-21 09:11:51 -07:00
Dante Ruiz	641a7390ba	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-21 16:46:55 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
Sam Gateau	a668ed0409	Merge pull request #10244 from samcake/ambient ... Cleaning the Engine/Task/Job interface	2017-04-20 15:48:21 -07:00
Vladyslav Stelmakhovskyi	2665ede06f	Audio injector cleanup	2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi	b2533b6106	Code nitpick. Pointer cleanup on exit	2017-04-20 21:12:57 +02:00
trent	805a74c074	First-pass attempt at remedying the smoothing issue (the avatar is never receiving the proper call).	2017-04-20 13:21:38 -04:00
Zach Pomerantz	b77917b8d1	Merge pull request #10241 from zzmp/fix/display-fail ... Update Display menu on unsuccesful selection	2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi	06406ef7de	Merge branch 'master' into notify-sound-inject	2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi	023d03d9f8	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
Dante Ruiz	d4c8d06575	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-19 20:42:11 +01:00
Dante Ruiz	07f674eabe	exprting compressed file	2017-04-19 20:41:56 +01:00
samcake	2c16b2bf3a	Expose the runtime from the engine in Stats	2017-04-18 18:12:42 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Zach Pomerantz	e0cb809f58	add hmd:bool to changed_display_mode	2017-04-18 18:48:28 -04:00
Zach Pomerantz	858a1db38b	only log changed_display_mode on successful change	2017-04-18 18:48:23 -04:00
Zach Pomerantz	c7a7fa90ec	update Display menu on unsuccesful selection	2017-04-18 18:47:57 -04:00
Zach Pomerantz	a310acd37f	check HMD usage for tutorial teleport	2017-04-18 18:46:53 -04:00
Dante Ruiz	f8ec49eb96	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-18 21:53:37 +01:00
Dante Ruiz	5cd4007aaa	got input recording working	2017-04-18 21:53:23 +01:00
Seth Alves	0807e036e8	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-18 11:59:23 -07:00
Seth Alves	d077c9f1de	print rather than crash in what should be an impossible situation	2017-04-18 11:58:56 -07:00
Andrew Meadows	da55c96c4c	protect against crash on invalid scene on shutdown	2017-04-18 11:52:22 -07:00
Andrew Meadows	014d7b8d8d	use viewFrustum position for laser pointer render filtering	2017-04-18 11:52:22 -07:00
Andrew Meadows	71c5644c23	more shared_ptr by const reference	2017-04-18 11:52:22 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
Andrew Meadows	0cc6763617	fix build by including EntityItem.h	2017-04-18 11:52:22 -07:00
Andrew Meadows	e60a28620d	cleanup FancyCamera implementation	2017-04-18 11:52:22 -07:00
Andrew Meadows	a3682a1a0e	cleanup includes in Avatar.cpp and remove cruft	2017-04-18 11:52:21 -07:00
Andrew Meadows	5a458c9923	remove last qApp usage from Avatar class	2017-04-18 11:52:21 -07:00
Andrew Meadows	685a01482c	remove Camera argument from Avatar::render()	2017-04-18 11:52:21 -07:00
Andrew Meadows	fbacbd74f7	pass shared pointers by ref in Avatar::render()	2017-04-18 11:52:21 -07:00
Andrew Meadows	9cddbbc42a	more interface-only spaghetti out of Avatar	2017-04-18 11:52:21 -07:00
Andrew Meadows	272cf07c31	removed cruft: unused Camera::toViewFrustum()	2017-04-18 11:52:21 -07:00
Andrew Meadows	1137bd1436	pull qApp spaghetti out of Avatar class ... some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-18 11:52:21 -07:00
kunalgosar	d215856b23	cleanup to blendshapes	2017-04-18 11:44:59 -07:00
kunalgosar	0a295fc258	setBlendshapes will presist	2017-04-18 11:44:59 -07:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
Seth Alves	d84dd4ce67	Merge pull request #10234 from druiz17/webview-redesign ... tablet webview navigation bar redesigned	2017-04-18 10:23:39 -07:00
Seth Alves	b2de5ebdaf	Merge pull request #10136 from mittens/21217 ... Added quadratic ease-in-and-out smoothing to remote avatars	2017-04-18 10:05:48 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Zach Fox	9c4e367245	Merge pull request #10213 from zfox23/fixGoToFocus ... FB 4156; Fix GoTo text field focus; other GoTo tweaks	2017-04-17 12:13:41 -07:00
Zach Fox	e6edce5352	Entirely remove addressBarToggle()	2017-04-17 12:13:01 -07:00
Dante Ruiz	3eb9b37c29	Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign	2017-04-17 16:41:15 +01:00
David Kelly	3e268fbf68	put shareable_url in UserStory details when creating	2017-04-17 07:38:24 -07:00
Anthony J. Thibault	a10b157aff	First pass at having an explicit Hips IK target. ... Also, AnimManipulator nodes support setting position and rotation on a single joint.	2017-04-14 17:00:44 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Seth Alves	0dab94fada	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:34:46 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
Chris Collins	c545558b8a	Merge pull request #10199 from AndrewMeadows/avatar-should-vanish ... Avatar should vanish when teleporting far away	2017-04-12 12:28:46 -07:00
Zach Fox	39587d5308	lol	2017-04-12 10:54:28 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Andrew Meadows	b8a3c856be	update model transform even when out of view	2017-04-11 15:03:11 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix ... Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
Seth Alves	bf16309917	Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 ... avoid invisible avatars redux	2017-04-11 07:07:03 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	b8620f6919	make getAvatar in AvatarManager Q_INVOKABLE	2017-04-10 22:15:45 -07:00
Stephen Birarda	e7299a5435	add missing include for ScriptAvatar in AvatarManager	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Zach Fox	54ca8bd89e	grab audio loudness from correct avatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Seth Alves	05bf1930ca	Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame ... Added accessor to get Avatar default pose in avatar space	2017-04-10 12:55:02 -07:00
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Triplelexx	7936637e9c	and tired..	2017-04-09 11:02:35 +01:00
Triplelexx	54eb7c10c6	distracted	2017-04-09 10:50:22 +01:00
Triplelexx	ec6885a2fb	change audioPacketLoss stat to display largest of upstream/downstream loss	2017-04-09 09:49:41 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Anthony J. Thibault	e065c1bac4	Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API	2017-04-07 14:12:03 -07:00
Anthony J. Thibault	40844d2a49	Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API.	2017-04-07 14:03:31 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Andrew Meadows	92495d9622	delete in proper order on shutdown	2017-04-07 11:10:48 -07:00
Andrew Meadows	8773497f7e	remvoe commented out cruft	2017-04-07 11:08:06 -07:00
Andrew Meadows	1fb88a0315	add a helpful comment	2017-04-07 11:08:06 -07:00
Andrew Meadows	6d627aa9bc	don't remove other avatars on sign-out	2017-04-07 11:08:06 -07:00
Andrew Meadows	2f18e51f6b	lock mutex around fading avatar list	2017-04-07 11:08:06 -07:00
Andrew Meadows	662c34c266	fix avatar scale animation and avatar render debug	2017-04-07 11:06:16 -07:00
Triplelexx	4c2823b42d	change increment operator	2017-04-07 18:21:43 +01:00
Andrew Meadows	40e223cb82	cleanup unused return values and redundant variables	2017-04-07 09:58:04 -07:00
Andrew Meadows	2775b17a65	unravel one loop of spaghetti	2017-04-07 09:56:26 -07:00
Andrew Meadows	b9c7d6351f	Merge pull request #10135 from samcake/ambient ... Rename render::PendingChanges to render::Transaction	2017-04-07 09:54:10 -07:00
Triplelexx	fcfd206e9c	change implict conversions	2017-04-07 17:47:04 +01:00
Triplelexx	27a404d0ea	remove extra lines	2017-04-07 07:09:18 +01:00
Triplelexx	279997d905	change display plugin to deactivate when window minimized	2017-04-07 06:49:28 +01:00
Seth Alves	584905a618	fix warning	2017-04-06 15:41:35 -07:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
trent	21f810e040	Fixed formatting concerns as well as a benign order-of-constructor warning.	2017-04-06 14:50:16 -04:00
trent	76d3e6d598	Added an assert for out-of-bounds values in the smoothing function; also clamped the values that I was sending in on the avatar-side.	2017-04-06 13:21:59 -04:00
Triplelexx	1b2887d5b1	change paintGL to return if window is minimized	2017-04-06 17:06:06 +01:00
Triplelexx	f588612fc3	add audioPacketLoss % display in stats	2017-04-06 16:04:14 +01:00
trent	43b3a6c624	Addressing some style inconsitency issues, as well as making the position/orientation times constants.	2017-04-05 21:31:13 -04:00
Dante Ruiz	90f5d02c99	goto toggle option	2017-04-06 00:13:53 +01:00
trent	c739db7562	Added quadratic ease-in-and-out smoothing to remote avatars position/orientation updates (through... one path, at least?).	2017-04-05 17:39:52 -04:00
samcake	1a9005ed8b	Avoid unexpected changes	2017-04-05 13:57:40 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
kunalgosar	8749428ede	dont assume no query tags	2017-04-04 13:51:34 -07:00
howard-stearns	6f79b2eaeb	send initial path in location update (e.g., on login)	2017-04-04 12:05:43 -07:00
kunalgosar	cc81bcab66	updating url check from hifi master	2017-04-04 11:58:38 -07:00
Kunal Gosar	e5c075f107	fix typo and namespace	2017-04-04 11:54:58 -07:00
kunalgosar	8e4229b211	dont redirect people from webentity	2017-04-04 11:54:58 -07:00
kunalgosar	3b88553699	check scripts	2017-04-04 11:54:58 -07:00
kunalgosar	9d0667cb31	add url tag to web entities	2017-04-04 11:54:58 -07:00
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
kunalgosar	9b758dbdba	updated headers	2017-04-04 11:54:21 -07:00
kunalgosar	a0f0879087	added file type filter and interceptor	2017-04-04 11:54:21 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
Lexx	af95741a7e	Merge branch 'master' into 21224	2017-04-04 18:24:49 +01:00
Triplelexx	b4b5d4fe9b	resolve merge conflict	2017-04-04 18:15:12 +01:00
Triplelexx	01b13d7032	fix crash when pressing "Bookmark Avatar" button ... also modified LocationBookmarks for consistency	2017-04-04 18:05:00 +01:00
Vladyslav Stelmakhovskyi	072e024d9a	Fixed warning in JSConsole	2017-04-04 16:10:37 +02:00
Thijs Wenker	2b85563413	Merge pull request #10115 from sethalves/fix-fast-talking ... Fix fast talking	2017-04-04 02:13:09 +02:00
Seth Alves	fbf2014f04	Merge pull request #10102 from vladest/tablet-ui-goto ... Put current address to location instead of inputfield	2017-04-03 16:09:58 -07:00
Seth Alves	55c2d36752	math fixes, cleanups	2017-04-03 15:30:06 -07:00
Seth Alves	2a43c41954	Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking	2017-04-03 14:44:13 -07:00
Seth Alves	7ac09398be	include deltaTime in audioAttack running average	2017-04-03 14:44:05 -07:00
Andrew Meadows	66ff551a7c	Merge pull request #10080 from ZappoMan/footActions ... add foot IK targets as actions, map Kinect feet to foot targets	2017-04-03 12:06:14 -07:00
Seth Alves	7f1095c590	use deltaTime rather than calling usecTimestampNow	2017-04-03 11:55:08 -07:00
Seth Alves	9e08925d7e	involve clock time in _mouthTime calculation	2017-04-03 11:34:29 -07:00
Anthony Thibault	999bd0d339	Merge pull request #10075 from sethalves/tablet-ui ... Tablet ui -- misc changes + landscape mode	2017-04-03 10:43:34 -07:00
Seth Alves	c45514a557	Merge pull request #10066 from vladest/tablet-ui-connection-dialog ... Implemented no connection dialog for Tablet UI	2017-04-03 09:57:00 -07:00
Seth Alves	98a54d9119	Merge pull request #10101 from ctrlaltdavid/21252 ... Fix tablet scrolling getting stuck to mouse pointer	2017-04-03 09:52:45 -07:00
Seth Alves	0f936f7511	Merge pull request #10078 from hyperlogic/feature/avatar-skeleton ... Expose Avatar Skeleton to JavaScript	2017-04-03 09:39:35 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -07:00
David Rowe	2b4afdb987	Fix tablet window getting stuck to pointer if release mouse off tablet	2017-04-02 12:58:11 +12:00
Chris Collins	3c62826ef9	Merge pull request #10091 from ctrlaltdavid/21248 ... Fix HTML controls not working properly in the tablet	2017-04-01 08:41:44 -07:00
Chris Collins	cc8b52fff4	Merge pull request #10095 from druiz17/tablet-webView2.0 ... Tablet webview now uses mobile format	2017-04-01 08:33:09 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Dante Ruiz	b10f491c6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0	2017-04-01 00:58:37 +01:00
Dante Ruiz	d1bf3e4bf2	fixed webview mobile view	2017-04-01 00:58:09 +01:00
Andrew Meadows	0181783290	Merge pull request #10064 from samcake/ambient ... Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1	2017-03-31 16:04:00 -07:00
Chris Collins	b36f688a5a	Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default ... use tablet-ui stylus as default, rather than avatar finger	2017-03-31 15:34:37 -07:00
David Rowe	25ac82f162	Don't send "move" events for non-move events	2017-04-01 10:47:04 +13:00
David Rowe	b03fd44240	Fix controls in HTML pages not responding to mouse events on tablet	2017-04-01 10:40:06 +13:00
Clément Brisset	9d0676dd87	Merge pull request #10088 from huffman/stable-merge ... Stable merge	2017-03-31 14:27:42 -07:00
howard-stearns	5c8b2ba1c3	restore lost code	2017-03-31 13:28:14 -07:00
Seth Alves	54c66aff07	use tablet-ui stylus as default, rather than avatar finger	2017-03-31 13:18:40 -07:00
Vladyslav Stelmakhovskyi	7558765042	Script log now back to HUD	2017-03-31 14:20:15 +02:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
ZappoMan	53c439ffba	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
Anthony J. Thibault	22901a40c8	Expose Avatar skeletons to JavaScript	2017-03-30 17:27:40 -07:00
Ryan Huffman	150dcd7dec	Merge remote-tracking branch 'upstream/master' into stable-merge	2017-03-30 14:22:27 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -07:00
Triplelexx	8aa3e56ad4	remove dead code	2017-03-30 19:47:50 +01:00
Triplelexx	57d6213175	remove dead code	2017-03-30 19:42:25 +01:00
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -07:00
Triplelexx	ae3f04288d	cleanup	2017-03-30 14:56:04 +01:00
Triplelexx	aa9a2532a9	fix for displaying "Bookmark Avatar" dialog in tablet ui	2017-03-30 13:54:33 +01:00
Triplelexx	bec70976d8	change hidden overloading	2017-03-30 12:07:19 +01:00
David Rowe	06910d1881	Add comment re scrollbar stability in tablet	2017-03-30 14:20:02 +13:00
David Rowe	f954767b84	Get entities list and entity properties scrollbars working on tablet	2017-03-30 14:04:03 +13:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Howard Stearns	af25e0e21f	Don't consider changes to location details as update-worthy if we're not discoverable.	2017-03-29 17:55:57 -07:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Howard Stearns	3a7edebb94	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -07:00
Delamare2112	3ebe1a0015	Add AvatarInputs::loudnessToAudioLevel	2017-03-29 14:01:27 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Delamare2112	2f6add3398	Expose LimitlessSpeechRecognition to scripts	2017-03-29 12:56:08 -07:00
Delamare2112	4f7cbd5b7c	Add limitless connection and scripting interface	2017-03-29 12:47:58 -07:00
samcake	9bc7e41642	Remove extra calls for binding default textures, not needed	2017-03-29 10:57:08 -07:00
Vladyslav Stelmakhovskyi	209de29b2a	Intial commit. Basically works. Need some testing	2017-03-29 17:36:05 +02:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Triplelexx	255e781cc7	check-in after menu experiments ... https://highfidelity.fogbugz.com/f/cases/3714	2017-03-29 00:48:14 +01:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	39ec53d69a	Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy ... Mark the system TabletProxy object as Cpp ownership.	2017-03-28 10:08:05 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Anthony J. Thibault	ec6ef01600	Mark the system TabletProxy object as Cpp ownership. ... This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.	2017-03-28 09:53:00 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Dante Ruiz	65be71fa69	min diff	2017-03-28 00:05:02 +01:00
Dante Ruiz	7434cc5644	force vto to false on start up	2017-03-28 00:02:02 +01:00
howard-stearns	85347e3269	new location protocol	2017-03-27 15:55:05 -07:00
Dante Ruiz	02535722ba	removed visible to others opition from general settings	2017-03-27 23:31:41 +01:00
Andrew Meadows	18544581e6	remove warnings about implicit float cast	2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub	c986077a4f	Merge pull request #10007 from hyperlogic/feature/ik-debug-draw ... Added Developer > Avatar > Show IK Targets	2017-03-27 14:29:02 -07:00
David Kelly	5c1e085e7b	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 11:29:18 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Dante Ruiz	cba7adf32a	removed qDebug	2017-03-27 19:08:41 +01:00
Dante Ruiz	f4255735a9	make login screen show up on the tablet on startup	2017-03-27 18:03:38 +01:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	a1db20c5fc	cleanup for QA ... added sorting	2017-03-26 22:18:37 +01:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Triplelexx	d1eee19d7d	move more Bookmark functionality into base class	2017-03-25 01:01:25 +00:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Anthony J. Thibault	49a95089d1	Remove hacks for debug rendering of IK targets ... A AnimContext class was introduced. This context is passed into every node during evaluation/overlay. It holds non-animVar "global" data passed from the application. (cherry picked from commit a028d3ba58)	2017-03-24 16:27:27 -07:00
Anthony J. Thibault	dd17b2e2f3	Added developer option to draw IK targets in world. ... (cherry picked from commit 7e7803c648)	2017-03-24 16:20:52 -07:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Dante Ruiz	6178a86a46	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-24 23:56:33 +01:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Anthony J. Thibault	f7de74109b	Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-24 15:10:26 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub	1972b140b9	Merge pull request #9976 from mittens/21215 ... Worklist #21215 - Removing Duplicate Status Icons for Submeshes	2017-03-24 08:52:12 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Anthony J. Thibault	bab9890fea	Added inputMode property to Web3DOverlay. ... This allows user to switch between Touch messages and Mouse messages. Added a sliderTestMain.js script which demonstrates this behavior.	2017-03-23 13:54:18 -07:00
Anthony J. Thibault	8915ecd23d	compile time option to switch from touch to mouse events for web tablet	2017-03-23 13:54:17 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	e708c6478e	Merge branch 'tablet-popup' into tablet-help	2017-03-23 17:35:45 +01:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Triplelexx	09cbace975	remove unused getBodyForwardDirection	2017-03-22 21:54:21 +00:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
trent	36619cd2e4	Fixed issue with duplicate physics status icons per sub-object.	2017-03-22 15:07:29 -04:00
Triplelexx	fd312f6bf8	rename fronts to forwards	2017-03-22 18:49:34 +00:00
Dante Ruiz	3a89654111	saving work	2017-03-22 19:14:53 +01:00
Triplelexx	8df0395754	change getFrontDirection to getForwardDirection	2017-03-21 22:28:12 +00:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Seth Alves	91cac892d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:04:58 -07:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Chris Collins	ea13151d55	Merge pull request #9945 from mnafees/21233 ... 21233: Remove Scripts Editor option from Edit menu and all related files	2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi	fb0adae0b1	Scripts debug window in Tablet UI	2017-03-21 15:04:38 +01:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Vladyslav Stelmakhovskyi	cedc3cf8b6	Fix naming. Move variable instantiation within scope	2017-03-20 23:43:01 +01:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Zach Fox	6c4b23195b	One-line warning fix...I swear I've done this before	2017-03-20 13:26:50 -07:00
Zach Fox	0506fc0033	New goTo() behavior; Fix goBack	2017-03-20 12:55:38 -07:00
Vladyslav Stelmakhovskyi	13cd500c2e	Make runningscripts able to open even if there is no scripts running	2017-03-20 20:46:37 +01:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 ... zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Chris Collins	af2748410d	Merge pull request #9932 from Triplelexx/21231 ... 21231 - Remove About Interface from File menu	2017-03-20 09:55:57 -07:00
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Chris Collins	ed27c550af	Merge pull request #9939 from ctrlaltdavid/21237 ... Disable Developer > Assets > ATP Asset Migration menu item	2017-03-20 06:29:33 -07:00
Chris Collins	2e6291f470	Merge pull request #9929 from ctrlaltdavid/21235 ... Replace Developer > Network > Disk cache editor with menu action	2017-03-20 06:26:36 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Mohammed Nafees	3612b9fccc	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
Triplelexx	8e086a8fc8	fix build error	2017-03-18 03:51:55 +00:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
David Rowe	ab7d82edb6	Use #ifdef instead of comment	2017-03-18 12:56:34 +13:00
David Rowe	38bb48e72c	Disable Developer > Assets > ATP Asset Migration menu item	2017-03-18 12:13:13 +13:00
David Rowe	e3b9d588ec	Merge branch 'master' into 21235 ... # Conflicts: # interface/src/Menu.cpp # interface/src/ui/DialogsManager.h	2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Triplelexx	eba6c8de5e	remove About Interface from File menu	2017-03-17 17:37:19 +00:00
Andrew Meadows	60e0eb0cf9	Merge pull request #9917 from Atlante45/fix/sit ... Cancel Avatar velocity when sitting down.	2017-03-17 10:04:25 -07:00
Atlante45	698791295a	Expose DriveKeys enum to JS	2017-03-16 20:03:27 -07:00
David Rowe	939b4f1612	Remove Developer > Network > Disk Cache Editor menu item and dialog	2017-03-17 13:49:09 +13:00
Atlante45	5a1ce4bb05	CR	2017-03-16 17:46:47 -07:00
Atlante45	9155cc6334	Fix windows warnings	2017-03-16 17:44:56 -07:00
David Rowe	e21d7d9edf	Add Developer > Network > Clear Disk Cache menu action	2017-03-17 13:34:11 +13:00
David Rowe	dc71f502f0	Delete Developer > Network > RAM Caches Size menu item and dialog	2017-03-17 13:09:06 +13:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Atlante45	42316e713d	CR drive keys	2017-03-16 16:24:52 -07:00
Atlante45	3e9474e878	CR	2017-03-16 16:24:36 -07:00
Atlante45	7517f224a8	Add MyAvatar drive keys capture capability	2017-03-16 15:44:17 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
Andrew Meadows	6f4d9bfba3	Merge pull request #9858 from kunalgosar/logBolding ... Change to Log Font and Formatting	2017-03-16 13:09:37 -07:00
Zach Fox	b3821bb02d	fix location vs AddressManager woes	2017-03-16 12:57:21 -07:00
Seth Alves	eba2417f41	Merge pull request #9912 from AndrewMeadows/model-cleanup-4 ... minor cleanup of render pipeline for models and avatars	2017-03-16 10:39:43 -08:00
kunalgosar	e7a16d4294	code standard fixes	2017-03-16 10:53:35 -07:00
Zach Fox	05fec328c0	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
Andrew Meadows	361e03fc78	remove unused variable	2017-03-15 16:57:31 -07:00
Seth Alves	693aee0628	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-03-15 16:54:40 -07:00
howard-stearns	84fd17bd88	use location.metaverseServerUrl instead of hardcoded value.	2017-03-15 16:33:23 -07:00
Andrew Meadows	d3fa28d4bc	remove cruft and fix indentation	2017-03-15 16:17:59 -07:00
howard-stearns	155e1b8e85	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 15:45:36 -07:00
Andrew Meadows	f250c0d298	simpler bindTransform() for ModelMeshPartPayload	2017-03-15 14:41:13 -07:00
Vladyslav Stelmakhovskyi	a4c0ce4240	Typo fix	2017-03-15 22:13:37 +01:00
Vladyslav Stelmakhovskyi	856e15060d	Implemented Domain Connection statistics for Tablet UI	2017-03-15 21:05:13 +01:00
Seth Alves	b66ff19595	prefer-avatar-finger-over-stylus setting now defaults to true	2017-03-15 09:51:30 -08:00
Anthony Thibault	495deba771	Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races ... Fixes for race conditions in DebugDraw	2017-03-15 10:38:26 -07:00
Zach Pomerantz	789bb7c855	rename audio(Mic)OutboundPPS	2017-03-15 13:30:39 -04:00
Seth Alves	c53b0dff93	Merge pull request #9891 from druiz17/tablet-xbox-fix ... Allow the user to bring up the tablet when a message is open	2017-03-15 08:43:28 -08:00
Seth Alves	563d59bda9	Merge pull request #9886 from vladest/tablet-ui-entity-statistics ... Tablet ui entity statistics	2017-03-15 08:40:52 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
Vladyslav Stelmakhovskyi	181c7da51a	Fixed warnings	2017-03-15 14:55:53 +01:00
Dante Ruiz	45829574c2	Allow the user to bring up the tablet when a message is open in the tablet	2017-03-15 00:02:42 +01:00
samcake	e0f0cc2102	Fix the unsupported ktx format, it was coming from the BUmp map case	2017-03-14 15:49:44 -07:00
Stephen Birarda	490cb83489	move advanced movement control changes to MyAvatar	2017-03-14 15:03:01 -07:00
Stephen Birarda	1fe02477b0	fix LX behaviour in snap/advanced/basic	2017-03-14 14:21:21 -07:00
Vladyslav Stelmakhovskyi	e2a4011b05	Coloring implemented	2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi	56d4bfe077	Servers stats added. TODO: coloring	2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi	d9ca8a826d	TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats	2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi	99c74cec41	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi	ee7dd458ca	Merge branch 'tablet-ui' into tablet-ui-graphics	2017-03-14 15:37:36 +01:00
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -07:00
Brad Davis	eab91d061d	Merge pull request #9868 from zzmp/ktx/local-not-roaming ... Use Local for WIN32 FileCache	2017-03-13 15:52:11 -07:00
Anthony J. Thibault	efc7fbacb1	Bug fix for potential crash when getting DebugDraw::instance ... (cherry picked from commit b0ad9a8110)	2017-03-13 15:23:10 -07:00
Ryan Huffman	8a1bd781f0	Fix overlay findRayIntersection not properly handing multiple drawInFront overlays	2017-03-13 14:44:14 -07:00
Brad Davis	3bef5ad528	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-13 14:30:25 -07:00
Zach Pomerantz	808973d7d2	use QStandardPaths instead of hardcoded paths	2017-03-13 17:26:42 -04:00
David Rowe	4dd7667fd7	Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi	9e9c64021c	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-13 19:54:40 +01:00
howard-stearns	db06c2650f	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-13 11:53:48 -07:00
Andrew Meadows	546f32431d	Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate ... Various noise gate, scope, and audio stats improvements	2017-03-13 11:52:16 -07:00
howard-stearns	ee3ca736fd	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-13 11:51:39 -07:00
Vladyslav Stelmakhovskyi	48db6201e5	Basic statistics showed. TODO: servers statistics, coloring, wrapping	2017-03-13 19:48:50 +01:00
Andrew Meadows	6e7f4b0418	Merge pull request #9829 from ZappoMan/addDoubleClick ... Add double click message support to entities and overlays	2017-03-13 10:44:54 -07:00
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
Seth Alves	4f71a5b234	Merge pull request #9864 from vladest/tablet-ui-lod-settings ... Add LOD settings to Tablet UI	2017-03-13 08:59:40 -08:00
Seth Alves	ffd4d1488c	Merge pull request #9866 from vladest/tablet-ui-lodtools ... Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi	49055cfa5c	Some statistics showed	2017-03-13 16:31:29 +01:00
Seth Alves	b3003acb97	Merge pull request #9856 from druiz17/tablet-imporove-dialogs ... Bring of menu window if tablet is closed on desktop	2017-03-12 12:20:29 -08:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi	81bc56f124	Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi	d70943dd6c	Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences	2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi	9f7c5a1603	Add LOD settings to Tablet UI	2017-03-11 11:54:44 +01:00
David Rowe	74839b24a3	Merge branch 'tablet-ui' into 21209	2017-03-11 15:56:38 +13:00
Brad Hefta-Gaub	6ce50269ac	add audio mixer in/out stats to the client stats	2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub	aa65f03509	fix mac warning and remove accidentally added whitespace	2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub	7eb4b8f5f7	expose AudioScope to QML	2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
Anthony J. Thibault	07e10ae862	Merge branch 'tablet-ui' into feature/can-touch-this	2017-03-10 17:05:26 -08:00
Dante Ruiz	8a973dae3c	fixed bring menu dialogs in tablet	2017-03-10 23:21:29 +00:00
David Rowe	71713b10f3	Merge remote-tracking branch 'upstream/tablet-ui' into 21209 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-11 09:14:06 +13:00
kunalgosar	a974282bdf	bolding timestamps on log	2017-03-10 11:55:36 -08:00
Dante Ruiz	78da936344	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs	2017-03-10 19:33:51 +00:00
Dante Ruiz	9b3810814e	fiexed putting menu items on the hud when tablet not open when on desktop screen	2017-03-10 18:40:18 +00:00
Seth Alves	fffff817a3	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 10:20:40 -08:00
Andrew Meadows	8ddcae2a15	restore transform of deactivated entities	2017-03-09 17:26:53 -08:00
Andrew Meadows	d4abdcb6c8	comments, namechange, and temporary debug code	2017-03-09 17:26:53 -08:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Anthony J. Thibault	d8f04d90a7	Merge branch 'master' into feature/can-touch-this	2017-03-09 14:24:10 -08:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
druiz17	8750982567	Merge pull request #9785 from druiz17/menuFix ... More dialog porting to tablet	2017-03-09 09:29:31 -08:00
Dante Ruiz	b58a27cf10	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-09 16:26:28 +00:00
Seth Alves	9435c58c2c	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1	2017-03-08 16:10:38 -08:00
Seth Alves	7f47835733	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 16:10:18 -08:00
David Rowe	1fc6d82456	Tablet and desktop versions of avatar attachments dialog	2017-03-09 13:04:57 +13:00
Seth Alves	28ade45f97	make maxFPS a property	2017-03-08 15:30:15 -08:00
Seth Alves	ae48dae96f	get rid of toggleTabletUI lockout period	2017-03-08 15:29:46 -08:00
Atlante45	97c376a09c	Revert "avoid unnecessary copy of priority_queue" ... This reverts commit e54812430e.	2017-03-08 14:08:58 -08:00
Atlante45	188287e345	Revert "minor cleanup" ... This reverts commit 14e7392a89.	2017-03-08 14:08:52 -08:00
Atlante45	9a9f07df71	Revert "expand avatar update time budget" ... This reverts commit 4bbbcb61be.	2017-03-08 14:08:48 -08:00
Atlante45	8bf9b70915	Revert "don't blend animations for otherAvatars" ... This reverts commit faa272c67c.	2017-03-08 14:08:33 -08:00
David Rowe	1e3c717fd4	Method to show appropriate desktop or tablet dialog	2017-03-09 09:55:47 +13:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
David Rowe	950f91965d	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Seth Alves	adc3581d63	remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay	2017-03-07 19:32:34 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Thijs Wenker	b54d6cb0e1	stop avatar controller while playing back a recording, which makes it not collide anymore	2017-03-08 00:07:49 +01:00
Vladyslav Stelmakhovskyi	a02807fb26	Merge branch 'menuFix' into menuFix_AssetServer	2017-03-07 21:07:53 +01:00
Anthony J. Thibault	b0ad9a8110	Bug fix for potential crash when getting DebugDraw::instance	2017-03-07 10:03:38 -08:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -08:00
Dante Ruiz	10ce732e91	Merge branch 'master' into menuFix	2017-03-07 16:15:54 +00:00
Brad Hefta-Gaub	b111bcb826	Merge pull request #9818 from ctrlaltdavid/21205 ... Remove Developer > Network > Bandwith Details dialog	2017-03-06 22:02:33 -08:00
David Rowe	fb1ff5be89	Port Developer > Network > Networking to tablet	2017-03-07 17:02:29 +13:00
David Rowe	51739f2f99	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
Vladyslav Stelmakhovskyi	0a36ebc5a0	Remove non relevant changes	2017-03-06 22:11:46 +01:00
David Rowe	af4bdd5943	Port Developer > Audio > Buffers to tablet	2017-03-07 09:57:02 +13:00
Vladyslav Stelmakhovskyi	6d9e7de6dc	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	4b02e550db	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 11:07:12 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Dante Ruiz	d5948079c7	Merge branch 'master' of github.com:highfidelity/hifi into menuFix	2017-03-06 16:29:37 +00:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -08:00
Ken Cooke	50f92cb934	redo unsafe optimization	2017-03-04 15:29:23 -08:00
Ken Cooke	46c5f96113	redo unsafe optimization	2017-03-04 15:24:03 -08:00
Ken Cooke	117bba8b6a	redo unsafe optimization	2017-03-04 15:17:09 -08:00
David Rowe	6385bb2b80	Open general settings dialog in tablet from tablet menu	2017-03-04 15:57:58 +13:00
David Rowe	0333122b23	Make Save and Cancel buttons close preferences dialog	2017-03-04 15:27:31 +13:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13:00
David Rowe	48ee661f02	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-04 08:58:48 +13:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
Dante Ruiz	f5324d5822	Merge branch 'master' of github.com:highfidelity/hifi into menuFix	2017-03-03 15:41:43 +00:00
Dante Ruiz	f867f4e739	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-03 15:40:41 +00:00
David Rowe	9384dfd89c	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-03 18:05:18 +13:00
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
David Rowe	b31cf23c8d	Fix tablet QML fonts path ... This is the path for running scripts from build/install directory rather than from source directory.	2017-03-03 17:45:23 +13:00
David Rowe	3285816fca	Fix up audio stats displayed in tablet	2017-03-03 16:45:35 +13:00
Seth Alves	807e15ade9	Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 ... avoid animation blending for other avatars	2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	f055711c76	refix	2017-03-02 16:47:19 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00
Seth Alves	88d6fe6a04	fix offset relative to endParent	2017-03-02 16:26:56 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Seth Alves	6a4d477381	fix up bounds handling in Line3DOverlay	2017-03-02 16:15:41 -08:00
David Rowe	b985b348ec	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 09:43:49 +13:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Dante Ruiz	ea804578ce	Merge branch 'master' into menuFix	2017-03-02 16:06:32 +00:00
Andrew Meadows	a55ab94cd9	other avatars use jointData no Rig animation	2017-03-02 07:52:02 -08:00
David Rowe	b592205f7e	Fix OSX warning	2017-03-02 18:45:42 +13:00
Anthony J. Thibault	4f03c06a94	Added General Preference to control stylus vs finger usage ... By default the finger is preferred over the stylus.	2017-03-01 18:07:53 -08:00
David Rowe	e445fe551f	Fix showing wrong version of dialog in desktop mode	2017-03-02 15:00:38 +13:00
Seth Alves	7f6b803652	3d-line-overlays can now have an endParentID and endParentJointIndex	2017-03-01 17:27:32 -08:00
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13:00
Seth Alves	7c4869eb73	fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother	2017-03-01 16:10:07 -08:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Anthony J. Thibault	465a9e2008	Responsiveness improvement to tablet ... PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued. This should reduce latency of laser and finger pressed onto the tablet.	2017-03-01 14:31:04 -08:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
samcake	664163eb17	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-28 18:13:01 -08:00
Andrew Meadows	148100b26f	fix bug drawing avatar above ground	2017-02-28 15:10:20 -08:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -08:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
samcake	576660f6ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 18:17:28 -08:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Atlante45	9ce10742ec	Move avatar not joint	2017-02-27 16:38:57 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	cbaaaa21c6	Use head orientation for sitting	2017-02-27 16:38:56 -08:00
Atlante45	e503542b6a	Fix transform computation	2017-02-27 16:38:55 -08:00
Atlante45	8c232b5abb	Initialize max offset to infinity	2017-02-27 16:38:55 -08:00
Atlante45	187cd0d5cf	Get IK error and stand up based on it	2017-02-27 16:38:55 -08:00
Atlante45	7132969083	Add hips pinning capability to MyAvatar	2017-02-27 16:38:54 -08:00
Atlante45	6821c8621f	More sit work	2017-02-27 16:38:54 -08:00
Seth Alves	df034ea6da	remove commented-out code	2017-02-27 11:27:59 -08:00
Seth Alves	8110921abf	git rid of _mouseToOverlays until I remember why I thought I needed it	2017-02-27 11:11:04 -08:00
Ryan Huffman	5b59939195	Merge pull request #9602 from huffman/feat/shortbow-entity-server ... Add shortbow to marketplace scripts	2017-02-27 11:09:52 -08:00
samcake	699d177b20	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 09:18:20 -08:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
sam	7a4ec35b99	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-25 13:01:09 -08:00
sam	a53d5e8fbd	adjusted the PLumber shape keys to coever non material shapes in main pass	2017-02-25 13:00:37 -08:00
Seth Alves	a2f527b28a	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-25 08:44:03 -08:00
Seth Alves	36bcaa8d0f	delete tablet overlays when switching domains	2017-02-25 08:43:06 -08:00
samcake	9ffdc03dc9	setting the shaeKeys for the overly properly because most of them are CustomPipleline	2017-02-24 18:25:24 -08:00
kunalgosar	d6c1f1c99a	Fixed Wed Entity not leaving Focus	2017-02-24 18:18:48 -08:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	34755dd75d	notify children of an overlay when the parent overlay moves	2017-02-24 13:57:49 -08:00
Brad Davis	cd8bba47cf	Add pending texture transfer size to tracked stats	2017-02-24 12:39:38 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
Dante Ruiz	89f5e5112f	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-24 15:25:32 +00:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
sam	8e122b3357	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-23 21:24:47 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
samcake	6d59144a4f	Trying to fix the emissive for overlay in front ?	2017-02-23 17:42:02 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Andrew Meadows	faa272c67c	don't blend animations for otherAvatars	2017-02-23 17:36:45 -08:00
Andrew Meadows	4bbbcb61be	expand avatar update time budget	2017-02-23 17:36:45 -08:00
Andrew Meadows	14e7392a89	minor cleanup	2017-02-23 17:36:45 -08:00
Andrew Meadows	e54812430e	avoid unnecessary copy of priority_queue	2017-02-23 17:36:45 -08:00
Brad Davis	61e341db75	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-23 17:22:03 -08:00
Seth Alves	a286c72b3b	cleanups	2017-02-23 15:12:45 -08:00
Brad Hefta-Gaub	1b7ec7d61e	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: libraries/avatars/src/AvatarData.cpp	2017-02-23 13:50:16 -08:00
Seth Alves	2c42309aaa	perfer tablet over other overlays for mouse-clicks	2017-02-23 13:32:24 -08:00
Seth Alves	84d9af14b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-23 10:40:18 -08:00
Chris Collins	de84e07281	Merge pull request #9714 from thoys/fix-recorder-js-playback ... Fix recorder.js playback in interface	2017-02-23 09:59:37 -08:00
Thijs Wenker	5033e7be11	CR fixes	2017-02-23 18:22:36 +01:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Brad Hefta-Gaub	06f0087459	wire up radius properly	2017-02-22 22:36:37 -08:00
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Seth Alves	1b26c3469f	fix signed/unsigned joint index problem	2017-02-22 20:39:34 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Seth Alves	a6b4f07674	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 12:07:31 -08:00
samcake	6938948501	Merge branch 'master' of https://github.com/highfidelity/hifi into texmex	2017-02-22 12:00:11 -08:00
Chris Collins	c967f9383a	Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements ... Multi-core Avatar Mixer	2017-02-22 11:20:28 -08:00
Brad Hefta-Gaub	05995163cf	add support for tuning sorting	2017-02-22 09:49:47 -08:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Brad Hefta-Gaub	01fd0860bf	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: interface/src/avatar/AvatarManager.cpp	2017-02-22 08:47:03 -08:00
Brad Hefta-Gaub	97fc88491f	Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly ... fix sorting algorithm for avatar render updates	2017-02-21 16:14:12 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
Andrew Meadows	dd447689e0	expose avatar sort coefficients for fine tuning	2017-02-21 15:09:44 -08:00
Brad Hefta-Gaub	2017ea4491	hacking on using sorted avatars for bandwidth budget	2017-02-21 14:18:00 -08:00
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
Andrew Meadows	27dd82b517	fix sorting algorithm for avatar render updates	2017-02-21 13:34:07 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Thijs Wenker	13b2b6086f	Fix recorder.js playback in interface	2017-02-21 19:47:26 +01:00
Dante Ruiz	f58a018c64	fixing merge conflicts	2017-02-21 15:46:41 +00:00
Brad Hefta-Gaub	ec8a95037d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-20 17:01:29 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
Brad Davis	07506b0078	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-19 14:00:52 -08:00
Brad Hefta-Gaub	598e79f697	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-19 13:29:37 -08:00
Menithal	d9f86612de	Fixed view toggle, Added new Notifications ... - View Toggle now only toggles if no other modifiers are pressed - More notification, and cases for notification - Parenting to existing parent - Unparenting when there is no parent - Unparenting single entities	2017-02-19 20:18:11 +02:00
Seth Alves	ea03f41b57	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-18 10:32:11 -08:00
Brad Hefta-Gaub	42d916a719	fix warnings	2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub	291b823cfa	const cleanup and fix crash	2017-02-17 18:28:07 -08:00
Chris Collins	ec07969c0b	Merge pull request #9703 from kunalgosar/logDisplayMode ... Logging HMD/Desktop Transitions	2017-02-17 17:07:02 -08:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -08:00
Seth Alves	39e1edafd2	merge from upstream	2017-02-17 13:16:12 -08:00
Seth Alves	5ddcbae934	save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet	2017-02-17 11:51:23 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
Seth Alves	4c1f5c1dc8	Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-17 09:58:58 -08:00
Seth Alves	2b02998fae	hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection	2017-02-17 09:47:40 -08:00
Seth Alves	81f6344023	allow overlays to be parents	2017-02-17 09:36:00 -08:00
Brad Davis	35a6359d59	Fixing transfer logic, adding stats display & profile ranges	2017-02-17 07:53:21 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
Dante Ruiz	80551cf0dd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-17 15:50:27 +00:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
Seth Alves	05c135b9d8	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
Seth Alves	c1e41311fc	working toward using uuids for overlay IDs	2017-02-16 17:18:09 -08:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Dante Ruiz	628b97bfc6	fixed merge issues	2017-02-17 00:08:31 +00:00
Dante Ruiz	afd56bbbbe	fixed qml font path issue for desktop and tablet	2017-02-17 00:01:12 +00:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Dante Ruiz	7ad8a389f6	refreshing with master	2017-02-16 08:13:17 -08:00
Dante Ruiz	2a97ebb076	updating branch with master	2017-02-16 08:11:50 -08:00
Dante Ruiz	896f9d7181	refreshing with master	2017-02-16 15:58:26 +00:00
Menithal	7a5665ff4f	Hotkey change to make AudioScope similar to earlier	2017-02-16 10:09:19 +02:00
Menithal	ff2c344eaa	Migrated Audioscope Hotkeys to use F2 instead of P ... Apparently ctrl + shift + P which was planned to be used in the client for unparenting entities did not work out, as the command went out of the main view. Migrating to ctrl + F2 and ctrl + alt + F2	2017-02-16 10:05:01 +02:00
Brad Davis	127a014b46	Clear caches on domain switch	2017-02-15 15:21:08 -08:00
Menithal	856cdcbd28	Merge remote-tracking branch 'origin' into parent-hotkey	2017-02-16 00:38:01 +02:00
Seth Alves	c0b5f7b005	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 11:36:50 -08:00
Clément Brisset	eba6a8f028	Merge pull request #9674 from Atlante45/fix/mac-macro ... Fix SSE2 macros for Macs	2017-02-15 11:29:55 -08:00
Seth Alves	792c7ff51f	PointerEvent will now relay keyboard modifiers	2017-02-15 10:41:56 -08:00
Menithal	ded365ca22	Merge remote-tracking branch 'origin' into parent-hotkey	2017-02-15 19:53:07 +02:00
Menithal	6302ae6bd5	Changed AudioScope Hotkeys, Allowing User Hotkeys ... AudioScope Open Hotkey changed from Ctrl + P to Ctrl + Alt + P and Audioscope Pause Hotkey changed from Ctrl + Shift + P to Ctrl + Shift + Alt + P	2017-02-15 19:48:29 +02:00
Dante Ruiz	485592751f	fixing merge changes	2017-02-15 15:38:22 +00:00
Dante Ruiz	22baab1359	updating branch with master	2017-02-15 15:24:08 +00:00
kunalgosar	4579ac4998	Changed button margin	2017-02-14 16:43:55 -08:00
kunalgosar	91a73b2689	Button styling	2017-02-14 16:13:40 -08:00
kunalgosar	5e5d76ead7	Implemented toggle prev search button	2017-02-14 16:13:40 -08:00
kunalgosar	c01d0b309e	Toggle next for search on Log	2017-02-14 16:13:40 -08:00
Anthony J. Thibault	5e25d073f3	WIP commit	2017-02-14 15:36:01 -08:00
Atlante45	1201932ee9	Fix SSE2 macros for Macos	2017-02-14 14:10:53 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Seth Alves	e323971062	Merge pull request #9671 from druiz17/general ... Moved general preference settings to the tablet	2017-02-14 10:11:33 -08:00
Brad Hefta-Gaub	f433347362	Merge pull request #9652 from sethalves/avatar-as-child-fixes ... some fixes for when an avatar is a child of something else	2017-02-14 09:07:47 -08:00
Dante Ruiz	888d4ff706	basic prefreneces done	2017-02-14 07:46:32 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	ba025d44e0	Merge pull request #9642 from AndrewMeadows/beware-humbletim ... fix performance problem for invalid "avatarEntityData"	2017-02-14 06:33:48 -08:00
Seth Alves	2e2a3c60d0	Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes	2017-02-14 06:26:20 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Seth Alves	bc5f563f57	make _parentID and _parentJointIndex private to avoid accidental direct access	2017-02-12 11:37:29 -08:00
Seth Alves	1164a1b3bf	some fixes for when an avatar is a child of something else	2017-02-12 08:27:39 -08:00
Kunal Gosar	c3f2f5779a	fix if else syntax	2017-02-11 15:46:49 -08:00
Kunal Gosar	975d844eee	syntax fix	2017-02-11 15:01:02 -08:00
Kunal Gosar	18e776bd29	emit signal only on change	2017-02-11 13:58:23 -08:00
kunalgosar	9c537726e5	Fix stuck in pause error with browsers	2017-02-10 18:13:09 -08:00
David Rowe	a08347936e	Make clicking the tablet mic icon or audio bar toggle the mute state	2017-02-11 15:11:27 +13:00
kunalgosar	691f61983a	added isAway property to MyAvatar	2017-02-10 17:28:12 -08:00
Andrew Meadows	d2315c15a1	avoid duplicate parse of AvatarEntityData entries	2017-02-10 13:14:20 -08:00
Andrew Meadows	563bf65e89	fix bug: performance problem for avatarEntities	2017-02-10 13:14:20 -08:00
Andrew Meadows	ee702f945f	cleanup around when to send identityPacket	2017-02-10 13:14:20 -08:00
Atlante45	3a30de79aa	CR	2017-02-09 13:04:43 -08:00
Atlante45	72ed1add94	CR log spam cleanup	2017-02-09 13:04:43 -08:00
Atlante45	6fbe3c9187	Windows specific changes	2017-02-09 13:04:43 -08:00
Atlante45	43d2501993	Add HMD friendly window for the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	0f39356e94	Only users with perm rez can see the log	2017-02-09 13:04:43 -08:00
Atlante45	35f8afe456	Handle domain reconnections	2017-02-09 13:04:43 -08:00
Atlante45	191121888c	Add log window to the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	2962dd6dc2	Factor LogDialog	2017-02-09 13:04:43 -08:00
Atlante45	fcb74bce10	First draft for entity script server log streaming	2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub	bc22326ec8	Merge pull request #9640 from ZappoMan/avatarSimulationStats ... New stats for avatar simulation	2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub	bb4654506a	CR	2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub	57e0dadd65	CR	2017-02-09 11:35:00 -08:00
samcake	850be620f9	Merge pull request #9606 from samcake/blue ... More intrumentation, Pixel Format clean up and minor improvments in texture transfers	2017-02-09 11:18:09 -08:00
Seth Alves	b34341b48e	Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos ... Remove avatarEntityData cruft from settings	2017-02-09 10:40:00 -08:00
Brad Hefta-Gaub	dd2ddcc291	cleanup	2017-02-09 09:57:32 -08:00
Brad Hefta-Gaub	ae071aec0d	add a bunch more stats for avatar processing	2017-02-09 09:52:09 -08:00
samcake	c62108c3c8	Resolve merging conflict	2017-02-09 09:49:59 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Seth Alves	908df7ee8a	Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs ... Fix for hidden cursor while using Export Entities / Import Entities form	2017-02-08 19:42:33 -08:00
Brad Hefta-Gaub	41dc498888	add inView simulation stats	2017-02-08 18:32:39 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub	c2171ca08f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats ... Conflicts: libraries/avatars/src/AvatarData.h	2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub	6c41a25032	more stats	2017-02-08 16:51:00 -08:00
Thijs Wenker	6957ac5f8b	Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread	2017-02-09 01:31:07 +01:00
Brad Hefta-Gaub	b399420190	CR	2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub	357cc052e1	first cut at simulation stats	2017-02-08 15:32:48 -08:00
Andrew Meadows	e02810458b	clear old avatarEntityData when saving settings	2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub	07cf87749f	Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots	2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub	89368afd68	add back accidentally removed line	2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub	eedfc4fd38	fix various bot related bugs	2017-02-08 12:35:00 -08:00
samcake	363db8a834	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-08 11:52:18 -08:00
Andrew Meadows	cc301d1c1a	remove legacy empty avatarEntityData settings	2017-02-08 11:50:15 -08:00
Clément Brisset	eb0a316b6f	Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances ... Allow multiple instances to run if environment variable is set	2017-02-07 15:32:31 -08:00
samcake	2975f73fc9	merging	2017-02-07 13:13:21 -08:00
Dante Ruiz	27e1bd50d0	reworded text	2017-02-06 19:52:51 +00:00
Dante Ruiz	5ff91c018b	snapshot fix	2017-02-06 19:39:57 +00:00
samcake	9fd1d5114c	Merge branch 'master' of https://github.com/highfidelity/hifi into purple	2017-02-06 10:16:41 -08:00
samcake	c864e57855	first pass on a working image class and the mip generation	2017-02-06 08:51:04 -08:00
samcake	e8cdee71ed	avoid assertion on mac	2017-02-03 22:49:41 -08:00
Seth Alves	9881dd261a	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-03 12:57:14 -08:00
Anthony J. Thibault	f8e6bd8c6b	Allow multiple instances to run if environment variable is set ... If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored, then you can have multiple copies of interface running on the same machine.	2017-02-03 10:53:26 -08:00
Ryan Huffman	0cc137d26b	Remove unintentionally added fps + download profiling	2017-02-03 10:14:34 -08:00
Ryan Huffman	537f639d16	Revert "Update scriptengine update rate to match displayPlugin target framerate" ... This reverts commit d5effc89776b0b2480db364f21384a245bdcd4f0.	2017-02-03 10:14:33 -08:00
Ryan Huffman	97719cd128	Update scriptengine update rate to match displayPlugin target framerate	2017-02-03 10:01:02 -08:00
Ryan Huffman	ce9f8bed1b	Remove duplicate fps/downloads PROFILE_COUNTER	2017-02-03 09:41:48 -08:00
Ryan Huffman	9d4fdfa38a	Add Test.profileRange	2017-02-03 09:19:10 -08:00
Ryan Huffman	e181c2a16e	Add script_udpate_rate to trace	2017-02-03 09:19:03 -08:00
Ryan Huffman	f2638637f7	Add thread names to traces	2017-02-03 09:18:58 -08:00
Anthony J. Thibault	b44e5b5a1f	tablet-ui: preferences for tablet ui scaling ... One for the tablet in HMD mode, one for desktop mode. The default desktop mode scaling factor is now 75%, which should reduce the size of the for users with low resolution monitors, while still being somewhat readable.	2017-02-02 14:05:07 -08:00
Seth Alves	43bf929e95	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-01 20:27:43 -08:00
Seth Alves	24510ee3fe	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-01 18:42:56 -08:00
Anthony J. Thibault	9d124983a6	Tablet-ui: fix tablet orientation for users in 2d desktop mode ... Double 180 flip. Once before to account for -z forward of camera. Once after to account for avatar 180 flip.	2017-02-01 17:48:28 -08:00
Anthony J. Thibault	2760065ee1	Bug fix for previous commit	2017-02-01 13:51:31 -08:00
Anthony J. Thibault	9be6fe2192	tablet-ui: Fix for keyboard focus box still being visible sometimes	2017-02-01 13:44:12 -08:00
Anthony J. Thibault	ca79397ee8	tablet-ui: Fix for keyboard focus ... Don't allow clicks on non-web entities from stealing focus away from web overlays.	2017-02-01 11:22:17 -08:00
Seth Alves	645aad7bb0	Merge pull request #9557 from hyperlogic/tablet-ui ... Fix for one-frame lag in the tablet stylus.	2017-01-31 13:37:56 -08:00
Anthony J. Thibault	0f75668923	Moved Model setting of _spatiallyNestableOverride to constructor	2017-01-31 09:36:21 -08:00
Seth Alves	5131d1edf2	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-01-31 09:22:16 -08:00
Seth Alves	7c2957cfa7	merge from upstream	2017-01-31 08:57:36 -08:00
Seth Alves	88948fa2b4	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting	2017-01-30 19:54:50 -08:00
Anthony J. Thibault	0962a15a06	Fix for one-frame lag in the tablet stylus.	2017-01-30 15:39:55 -08:00
Andrew Meadows	0809149a8c	harvest collision events before disowning	2017-01-30 13:21:23 -08:00
Anthony J. Thibault	39d68828ab	Disable FXAA on tablet overlay in desktop mode. ... This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is essential in 2D desktop mode. Two new shaders were introduced. simple_opaque_web_browser_overlay.slf simple_transparent_web_browser_overlay.slf These are tailored to write into the main framebuffer instead of the g-buffer.	2017-01-30 11:24:59 -08:00
Anthony J. Thibault	a9b478888c	First cut of Web3DOverlays without FXAA applied.	2017-01-30 11:24:58 -08:00
Seth Alves	541692c5ca	start on scripting interface to allow saving polyvox meshes to obj files	2017-01-28 15:38:18 -08:00
Seth Alves	fa61bbe2a6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 18:21:39 -08:00
ZappoMan	4c80422a73	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-26 14:34:58 -08:00
Seth Alves	db38503d57	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
samcake	19858bda78	Merge pull request #9493 from AndrewMeadows/otherAvatars ... optimize, prioritize, and timebox processing of avatar updates	2017-01-26 13:30:51 -08:00
Seth Alves	0b51b1d566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Andrew Meadows	5783db910b	remove some unhelpful trace profiling data	2017-01-26 08:35:26 -08:00
Andrew Meadows	82f52b9658	fix bug: Avatar instance not getting deleted	2017-01-26 08:35:26 -08:00
Andrew Meadows	2264c29604	less magic	2017-01-26 08:35:26 -08:00
Andrew Meadows	0f09e60acd	remove unhelpful comment	2017-01-26 08:35:26 -08:00
Andrew Meadows	01e14eec47	remove commented out cruft	2017-01-26 08:35:26 -08:00
Andrew Meadows	ac180758ad	sort, optimize, and timebox process avatar updates	2017-01-26 08:35:26 -08:00
Andrew Meadows	d3dcc2b415	remove cruft: billboard option for Head::simulate()	2017-01-26 08:35:26 -08:00
Andrew Meadows	887707426e	remove cruft: Head::getScalePivot()	2017-01-26 08:35:26 -08:00
Andrew Meadows	69a7b1ef76	move some stuff out of Avatar::simulate() ... call it explicity in AvatarManager::updateOtherAvatars()	2017-01-26 08:35:26 -08:00
Andrew Meadows	b8afc87ad9	remove cruft	2017-01-26 08:35:26 -08:00
Andrew Meadows	e65d9309b3	remove cruft: Avatar::setShouldDie()	2017-01-26 08:35:26 -08:00
Andrew Meadows	e363423992	compute priority of avatar and sort before update	2017-01-26 08:35:26 -08:00
Andrew Meadows	88bf126168	remove old avatar culling and LOD logic	2017-01-26 08:35:25 -08:00
Andrew Meadows	08bba5f45f	add and remove some profile data points	2017-01-26 08:35:25 -08:00
ZappoMan	3c3dcbbbaa	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-26 08:20:03 -08:00
Anthony J. Thibault	5eb7849a80	Support for Window.geometryChanged signal.	2017-01-25 16:43:35 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Seth Alves	ff8d13ecc7	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Seth Alves	98f1664a46	use a setting to decide which UI is enabled	2017-01-25 14:17:45 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Seth Alves	f18094f565	make use of tablet or HUD depend on a single variable. avoid some duplicated code	2017-01-25 12:00:34 -08:00
David Rowe	74b878a276	Fix threading of message box updates	2017-01-25 17:48:58 +13:00
Seth Alves	b679d94585	remove commented-out code	2017-01-24 16:04:22 -08:00
Seth Alves	601a35a9b6	try a different way of repairing tablet after a domain change	2017-01-24 15:49:49 -08:00
Seth Alves	19cf84dd5d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto	2017-01-24 12:49:47 -08:00
Seth Alves	df9bc91f01	fix near-grab to equip handoff	2017-01-24 11:39:26 -08:00
Seth Alves	4de0b94b6c	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto	2017-01-24 09:42:20 -08:00
Seth Alves	a28becfb1a	close tablet before changing domains	2017-01-24 09:42:12 -08:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Seth Alves	281b7a6eca	close tablet anytime AddressManager::hostChanged fires	2017-01-23 16:49:05 -08:00
Seth Alves	69252deb2e	close the tablet when going to a new domain	2017-01-23 16:28:56 -08:00
Seth Alves	200105c856	Merge pull request #9484 from hyperlogic/tablet-ui ... UI navigation work with game pads	2017-01-23 16:01:45 -08:00
Anthony J. Thibault	584a9a3c98	UI navigation work with game pads ... The tablet UI can be long lived, unlike the previous VRMenu. So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json. standard_navigation is always active. Also, standard_navigation.json has been changed. Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.	2017-01-23 15:22:49 -08:00
ZappoMan	81b5a3c585	more cleanup	2017-01-23 15:12:54 -08:00
ZappoMan	29fff2e556	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-23 13:09:59 -08:00
ZappoMan	292d472a59	checkpoint - got first cut at distance based rotation tolerance working	2017-01-23 13:06:29 -08:00
Seth Alves	be8bc9652b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 09:44:04 -08:00
Ryan Huffman	9b1cd52fb4	Add the ability to get the context that a script is running in	2017-01-23 08:58:01 -08:00
samcake	afd3c3b504	Merge pull request #9436 from AndrewMeadows/cauterization-cleanup ... Cleanup of code that decides not to render head when in first-person	2017-01-20 14:49:08 -08:00
Atlante45	04e81c5db7	Fix interface build	2017-01-20 10:53:57 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Stephen Birarda	25bd6fa2c1	move recording interface to Agent/Application only	2017-01-20 10:27:08 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Andrew Meadows	10cdea9cd8	cleanup model fade logic	2017-01-19 14:17:50 -08:00
Seth Alves	47b59ffae3	don't save tablet to Settings when logging out or switching domains	2017-01-19 14:10:48 -08:00
Andrew Meadows	9631864ae2	make soft attachments cauterized for MyAvatar	2017-01-19 12:56:07 -08:00
Andrew Meadows	5a2e337758	fix comments	2017-01-19 12:56:07 -08:00
Andrew Meadows	bfbef91f53	re-enable cauterization of meshes for MyAvatar	2017-01-19 12:56:07 -08:00
Andrew Meadows	1a3fa84985	add newline at EOF	2017-01-19 12:56:07 -08:00
Andrew Meadows	189da81bb1	fix for crash on unloaded model	2017-01-19 12:56:07 -08:00
Andrew Meadows	3dd8fd838b	move cauterization out of Model class	2017-01-19 12:56:07 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Brad Davis	70de00c6bf	Merge pull request #9421 from jherico/more_trace_details ... Additional trace details for GPU timing, frame data updates	2017-01-19 09:12:34 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
samcake	05304c72e0	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
Seth Alves	7c938728e5	don't do constant haptics if stylus touches tablet frame. home button triggers only once per click	2017-01-18 16:56:39 -08:00
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
Anthony J. Thibault	bcd94203e6	Raised min fps of tablet overlay for smoother scrolling	2017-01-18 15:32:39 -08:00
Seth Alves	c6d0c0909e	avoid unthreadsafe use of getJointIndex	2017-01-18 14:54:38 -08:00
Ryan Huffman	8137c59ef7	Add support for sending requests to entity script server	2017-01-18 11:15:29 -08:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
samcake	246dcbd0c0	Removing the warning	2017-01-17 15:01:27 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
Seth Alves	be165b567e	remove XXX comments	2017-01-17 13:32:58 -08:00
Seth Alves	e76f1c5937	if another avatar has something hung from their camera, don't act like their camera is my camera	2017-01-17 13:28:13 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Stephen Birarda	1e04aebb8d	add --fast-hearbeat command line switch for 1s stats	2017-01-17 11:25:40 -08:00
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00
samcake	83d1c3ad01	Adding support for the meta rendering	2017-01-16 17:47:58 -08:00
Stephen Birarda	1993e358d6	Merge pull request #9318 from birarda/ovr-platform-entitlement ... handle OVR Platform entitlement checks	2017-01-16 11:16:31 -08:00
Seth Alves	bd67715cd2	don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed	2017-01-16 08:54:56 -08:00
Chris Collins	2557c797af	Merge pull request #9300 from zzmp/graphics/forward-opaque ... Add opaques/skinned to forward rendering path	2017-01-16 08:48:18 -08:00
ZappoMan	c9c311e275	checkpoint for distance joints	2017-01-15 11:47:48 -08:00
Seth Alves	36fdaa6350	avoid a little pop when grabbing something with ignore-ik as true	2017-01-15 10:10:54 -08:00
ZappoMan	c884b276e2	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-14 22:15:22 -08:00
Seth Alves	9de8144f0d	merge from upstream	2017-01-13 10:17:03 -08:00
Seth Alves	f9a36d68ad	Merge pull request #9363 from ctrlaltdavid/21127 ... Make Clara.io downloads convert textures to PNG	2017-01-13 10:14:43 -08:00
Seth Alves	481cc47f79	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-13 09:28:18 -08:00
ZappoMan	aed1b69ee0	make the avatar bounding box be avatar local and only change when it actually changes	2017-01-12 17:19:06 -08:00
Seth Alves	cc4f4ac506	fix merge from upstream	2017-01-12 17:08:14 -08:00
Seth Alves	208c4686c4	merge from upstream	2017-01-12 15:44:27 -08:00
Brad Davis	659badd8bf	Change minimum threadpool size 1	2017-01-12 14:43:31 -08:00
samcake	ca53235d54	Merge pull request #9358 from AndrewMeadows/model-cleanup ... minor cleanup for Model rendering code	2017-01-12 14:30:16 -08:00
samcake	b9e8f7ee14	Merge pull request #9359 from jherico/cached_qml_surfaces ... Eagerly cache QML surfaces for Web3D overlays	2017-01-12 14:28:35 -08:00
Dante Ruiz	7d84aae670	closing tablet when taking snapshot	2017-01-12 17:29:38 +00:00
Brad Davis	2de83d42bc	Add process and system CPU usage to traces	2017-01-12 09:19:08 -08:00
David Rowe	8cd7e1b377	Improve user messages	2017-01-12 15:48:25 +13:00
David Rowe	b41f8c754d	Add updateable message box to JavaScript API	2017-01-12 15:46:53 +13:00
Andrew Meadows	b3e336de3d	remove cruft: unused function arguments	2017-01-11 15:02:18 -08:00
Brad Davis	f235a52a6d	Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet	2017-01-11 14:21:29 -08:00
ZappoMan	5b76eaaf52	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-11 10:22:14 -08:00
Seth Alves	bacc796730	Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again	2017-01-11 09:54:26 -08:00