6369 commits

Author	SHA1	Message	Date
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -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
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08: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
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
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
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13: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
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -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
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
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
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	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	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -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
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00: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
Seth Alves	1d446064be	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 08:23:36 -08:00
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
Dante Ruiz	f58a018c64	fixing merge conflicts	2017-02-21 15:46:41 +00:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -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
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
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
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
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
Brad Davis	127a014b46	Clear caches on domain switch	2017-02-15 15:21:08 -08: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
Anthony J. Thibault	5e25d073f3	WIP commit	2017-02-14 15:36:01 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13: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
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -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
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	43d2501993	Add HMD friendly window for the ESS log	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
Seth Alves	9881dd261a	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-03 12:57:14 -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	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	24510ee3fe	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-01 18:42:56 -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	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
Andrew Meadows	0809149a8c	harvest collision events before disowning	2017-01-30 13:21:23 -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	3c3dcbbbaa	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-26 08:20:03 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -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	29fff2e556	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-23 13:09:59 -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
Atlante45	04e81c5db7	Fix interface build	2017-01-20 10:53:57 -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
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	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -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
Stephen Birarda	1e04aebb8d	add --fast-hearbeat command line switch for 1s stats	2017-01-17 11:25:40 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -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
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	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
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	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
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
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
Brad Davis	1dd2747ef9	Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.	2017-01-10 10:44:04 -08:00
Dante Ruiz	2fc76d64fd	clean up unused code and files	2017-01-10 09:13:46 -08:00
druiz17	28c8d527df	Merge pull request #9340 from fayeli/tablet-hide-yellow ... Ability to disable yellow highlight around Web Overlays	2017-01-10 09:11:51 -08:00
Faye Li Si Fi	93e4f9126f	disable drawing highlight if "showKeyboardFocusHighlight" flag is false	2017-01-09 11:01:15 -08:00
Brad Hefta-Gaub	ef7b9bfde0	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-09 10:07:05 -08:00
Seth Alves	668bc35227	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge	2017-01-06 13:31:13 -08:00
Atlante45	428a7f3bf8	Log Dialog doesn't float on top	2017-01-05 17:49:39 -08:00
Seth Alves	d072b1524a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:27:11 -08:00
Stephen Birarda	46086cdcce	set the OCULUS_STORE property with oculus store arg	2017-01-05 14:02:35 -08:00
Brad Hefta-Gaub	acca9dbe87	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo ... Conflicts: libraries/networking/src/udt/PacketHeaders.cpp libraries/networking/src/udt/PacketHeaders.h	2017-01-04 18:07:22 -08:00
Atlante45	56a25dfdee	Check setting value changed	2017-01-04 11:56:24 -08:00
Brad Hefta-Gaub	60d48bcd49	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-03 14:42:59 -08:00
Zach Pomerantz	01cf48807c	change Render.RenderForwardTask to Render.Forward	2017-01-03 14:47:48 -05:00
Zach Pomerantz	26cfc83e20	Merge branch 'master' into graphics/fetch-cull-sort	2017-01-03 14:04:39 -05:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub	84eca0159e	Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval ... Conflicts: tests/networking/src/ResourceTests.cpp	2016-12-29 16:42:52 -08:00
Zach Pomerantz	0e9da87549	FetchSortCull->FetchCullSort	2016-12-29 19:27:37 -05:00
Brad Hefta-Gaub	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
Atlante45	f79c6e08f5	Track dropped frames as reported by the Oculus SDK	2016-12-28 14:18:23 -08:00
Brad Hefta-Gaub	73bfc069da	more work on only sending changes	2016-12-27 17:19:55 -08:00
Zach Pomerantz	ca1a14e5b0	add RenderFetchSortCull task	2016-12-23 15:54:22 -05:00
Andrew Meadows	2209c0ebba	remove debug hook for dumping stats to logs	2016-12-21 10:55:59 -08:00
Andrew Meadows	8ab6974233	optimizations for processing avatar joint data	2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub	be62df2001	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer	2016-12-21 08:59:29 -08:00
David Kelly	50554e934e	Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn	2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub	d09afa9454	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer ... Conflicts: assignment-client/src/avatars/AvatarMixer.h assignment-client/src/avatars/AvatarMixerClientData.h libraries/avatars/src/AvatarData.cpp libraries/networking/src/udt/PacketHeaders.h	2016-12-20 16:25:12 -08:00
David Kelly	7750e86c13	Only send machine fingerprint when not logged in ... While at it, no longer grabbing it at all when starting up, as that was just a dev thing. Should consider not sending MAC address too, but we may revisit that later.	2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub	2079b1ff7e	cleanup comments	2016-12-20 10:45:36 -08:00
Seth Alves	ab3c833dd5	diff minimization	2016-12-20 09:23:21 -08:00
Seth Alves	36e843178a	diff minimization	2016-12-20 09:21:41 -08:00
Brad Hefta-Gaub	6a7fa63327	classify ScriptEngine errors better, and send them as signal to JS	2016-12-20 09:00:01 -08:00
Seth Alves	d8ee4d86b0	merge from upstream	2016-12-20 08:43:19 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Brad Davis	bfc4a6e038	Fix stat tracker missing in agents	2016-12-20 07:45:35 -08:00
Ryan Huffman	9a517d7257	Update req tutorial version for Oculus Touch	2016-12-20 07:45:35 -08:00
Ryan Huffman	a72f8cac0e	Update to only send users to tutorial if they have Vive or Touch	2016-12-20 07:45:35 -08:00
Ryan Huffman	4e29d7a2b8	Add send-to-tutorial logic for Oculus Touch	2016-12-20 07:45:35 -08:00
Brad Davis	d0d6b1f87e	tracing polish	2016-12-20 07:45:35 -08:00
Andrew Meadows	e03e57a480	adding profile stats relating to avatar CPU costs	2016-12-20 07:45:35 -08:00
Ryan Huffman	21bab49f79	Add chrome tracing support	2016-12-20 07:45:35 -08:00
David Rowe	898372e841	Fix crash after manually closing Clara download status message box	2016-12-20 07:45:35 -08:00
David Rowe	6d0bb3bdc7	Make manually closing message box code more correct	2016-12-20 07:45:35 -08:00
Zach Pomerantz	13d3ffd47c	change render forward flag to HIFI_...	2016-12-20 07:45:35 -08:00
David Rowe	3ebfc130c0	Scale all imported Clara models to have max dimension of exactly 1m	2016-12-20 07:45:35 -08:00
David Rowe	d933b3506f	Fix Clara download status message box not auto-closing	2016-12-20 07:45:35 -08:00
David Rowe	fa9aef8b22	Fix crashing if manually close Clara download status message box	2016-12-20 07:45:35 -08:00
David Rowe	7a9cf498dc	Increase resize timeout to 5 mins to improve the odds of model rezzing ... Model needs to rez in order for its initial dimensions to be obtained from FBX.	2016-12-20 07:45:35 -08:00
David Rowe	a63beedff4	Rescale models if necessary to have their largest dimension be 1m ... Models are still rescaled beforehand if thought to be in cm.	2016-12-20 07:45:35 -08:00
David Rowe	e9dbb32277	Handle unzip failure	2016-12-20 07:45:35 -08:00
David Rowe	0ec1dc6c85	Log requested ATP mapping of model upload	2016-12-20 07:45:35 -08:00
David Rowe	d02e217b49	Don't make downloaded Clara.io models dynamic	2016-12-20 07:45:35 -08:00
David Rowe	932b05c1ba	Rework Clara.io download user messaging to have no user interaction	2016-12-20 07:45:35 -08:00
David Rowe	c4ff129f86	Inform user if can't do Clara.io download because can't write to ATP	2016-12-20 07:43:48 -08:00
David Rowe	f3899736e8	Auto-close Clara model download progress box when model added to world	2016-12-20 07:43:48 -08:00
David Rowe	825225fcb2	Make Clara.io models grabbable and dynamic by default	2016-12-20 07:43:48 -08:00
David Rowe	591bc245bd	Fix model being left invisible if not auto-resized	2016-12-20 07:43:48 -08:00
David Rowe	a4ff4f61b9	Increase auto-resize timeout for Clara.io asset download from ATP	2016-12-20 07:43:48 -08:00
David Rowe	5b8a9c0bcd	Add extra logging for Clara.io asset resizing	2016-12-20 07:43:48 -08:00
howard-stearns	8d300eac76	pal prototype	2016-12-20 07:43:48 -08:00
David Rowe	25651800dd	Code review	2016-12-20 07:43:48 -08:00
David Rowe	9f4df9bd07	Fix model auto-scaling to 1% not being seen by observers take 2	2016-12-20 07:43:48 -08:00
David Rowe	58edbf4eaf	Fix model auto-scaling to 1% not being seen by observers	2016-12-20 07:43:48 -08:00
Seth Alves	67093dc519	don't flutter tablet when menu button is pressed. start on a stylus	2016-12-20 07:43:48 -08:00
David Rowe	7a36e4eed8	Fix keyboard focus when switch highlight between overlays and entities	2016-12-20 07:42:21 -08:00
David Rowe	d13e990ebe	Rescale large Clara.io models to 1% instead of 10%	2016-12-20 07:42:21 -08:00
David Rowe	f749c76ced	First pass at controller interaction with 3D Web overlay	2016-12-20 07:42:21 -08:00
David Rowe	367e758dc6	Fix compiler warning	2016-12-20 07:42:21 -08:00
David Rowe	d06a0ce9f5	Auto-resize Clara.io models if larger than 10m as likely in cm or mm	2016-12-20 07:42:21 -08:00
David Rowe	527757cd22	Add further user feedback on Clara download progress	2016-12-20 07:40:28 -08:00
David Rowe	4cbd64b75e	Improve temporary download directory robustness	2016-12-20 07:40:28 -08:00
David Rowe	5843185683	Tidying	2016-12-20 07:40:28 -08:00
David Rowe	5fbdd64fff	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00
David Rowe	e85bc50333	Tidying	2016-12-20 07:38:25 -08:00
David Rowe	44f36a9dae	Highlight Web overlay with focus	2016-12-20 07:38:25 -08:00
David Rowe	92b72af71c	Direct keyboard input to Web overlay when has focus	2016-12-20 07:38:25 -08:00
David Rowe	e3444e1861	Add mouse press, move, and release handling to Web overlay	2016-12-20 07:38:25 -08:00
David Rowe	1987719cfd	Display Clara.io download information	2016-12-20 07:33:55 -08:00
David Rowe	43ebdf97cb	Tidy UI text	2016-12-20 07:33:55 -08:00
David Rowe	6329b670c9	Improve error handling for case that don't have permissions	2016-12-20 07:33:55 -08:00
David Rowe	bf2bcc0b80	Add user feedback on download process	2016-12-20 07:33:55 -08:00
David Rowe	e41d178534	Default collision shap to hull per submesh instead of static	2016-12-20 07:33:55 -08:00
David Rowe	e1a135591f	Code tidying	2016-12-20 07:33:55 -08:00
David Rowe	4cabf49b23	Handle duplicate Clara download asset names	2016-12-20 07:33:55 -08:00
David Rowe	0ccff32365	Delete temporary directory after content has been used	2016-12-20 07:33:55 -08:00
David Rowe	7e8fc12258	Automatically download Clara model to ATP and add to world	2016-12-20 07:33:55 -08:00
David Rowe	467741f348	Add parameter that enables automatically adding download model to world	2016-12-20 07:33:55 -08:00
Brad Hefta-Gaub	c65471e880	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam ... Conflicts: libraries/script-engine/src/FileScriptingInterface.cpp	2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub	0c9ff87feb	add support for an HMD script debug log window	2016-12-19 19:34:14 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Brad Davis	ee3c8e6efd	Merge pull request #9225 from jherico/chrome_tracing ... Additional work on tracing	2016-12-16 17:53:55 -08:00
Brad Davis	2d73588361	Fix stat tracker missing in agents	2016-12-16 17:34:00 -08:00
Ryan Huffman	217d46704d	Update req tutorial version for Oculus Touch	2016-12-16 15:41:04 -08:00
Ryan Huffman	b9598a28f3	Update to only send users to tutorial if they have Vive or Touch	2016-12-16 15:05:17 -08:00
Ryan Huffman	c953ceb58b	Add send-to-tutorial logic for Oculus Touch	2016-12-16 15:05:17 -08:00
samcake	1ded581895	Merge pull request #9217 from zzmp/feat/render-forward-bounds ... Render bounds in Forward Render Task	2016-12-16 14:57:14 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Andrew Meadows	ee6a9f4506	adding profile stats relating to avatar CPU costs	2016-12-16 13:41:31 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub	8497ad1e29	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer	2016-12-15 16:42:41 -08:00
David Rowe	9aaf55e6a3	Fix crash after manually closing Clara download status message box	2016-12-16 12:49:26 +13:00
Howard Stearns	ba8b585368	Merge pull request #9202 from howard-stearns/pal-proto ... People Action List prototype	2016-12-15 13:56:12 -08:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
David Rowe	b8114b29b2	Make manually closing message box code more correct	2016-12-16 09:47:11 +13:00
Zach Pomerantz	41f6990051	change render forward flag to HIFI_...	2016-12-15 14:53:51 -05:00
samcake	7a29dbe7d4	Merge pull request #9207 from zzmp/feat/render-forward-empty ... Forward render task (empty and only used with RENDER_FORWARD set)	2016-12-15 09:57:18 -08:00
Seth Alves	26639aac15	Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings	2016-12-15 07:00:46 -08:00
David Rowe	16418d52d2	Scale all imported Clara models to have max dimension of exactly 1m	2016-12-15 20:11:29 +13:00
David Rowe	349765ad74	Fix Clara download status message box not auto-closing	2016-12-15 16:00:07 +13:00
David Rowe	23b8bf7aab	Fix crashing if manually close Clara download status message box	2016-12-15 13:35:58 +13:00
Atlante45	0dec97fc03	Make Steamworks a plugin	2016-12-14 15:37:49 -08:00
David Rowe	eb293fb579	Increase resize timeout to 5 mins to improve the odds of model rezzing ... Model needs to rez in order for its initial dimensions to be obtained from FBX.	2016-12-15 12:26:53 +13:00
David Rowe	c82cceccac	Rescale models if necessary to have their largest dimension be 1m ... Models are still rescaled beforehand if thought to be in cm.	2016-12-15 12:25:56 +13:00
David Rowe	dbd00e39a8	Handle unzip failure	2016-12-15 11:52:34 +13:00
Anthony J. Thibault	d4f9d21ce8	Pass tablet QQuickItem to TabletScriptingInterface ... Also, moved TabletScriptingInterface to script-engine library for easy access, baby.	2016-12-14 14:04:48 -08:00
David Rowe	17c54a5fae	Log requested ATP mapping of model upload	2016-12-15 10:01:19 +13:00
David Rowe	5af57d7bbc	Don't make downloaded Clara.io models dynamic	2016-12-15 09:38:06 +13:00
Anthony J. Thibault	db0b2ba7d3	Fleshing out TabletScriptingInterface. ... Added TabletProxy and TabletButtonProxy	2016-12-14 12:08:41 -08:00
David Rowe	934f48362a	Rework Clara.io download user messaging to have no user interaction	2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub	a7750501c6	first cut at adding view frustum support to avatar mixer	2016-12-13 18:58:11 -08:00
David Rowe	2b0529bcea	Inform user if can't do Clara.io download because can't write to ATP	2016-12-14 14:45:33 +13:00
Zach Pomerantz	bc59be12ef	create flagged forward render task	2016-12-13 19:19:30 -05:00
howard-stearns	6fc27ac8d6	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-13 09:39:51 -08:00
David Rowe	2df7c189a2	Auto-close Clara model download progress box when model added to world	2016-12-14 01:22:47 +13:00
David Rowe	5344cc6155	Make Clara.io models grabbable and dynamic by default	2016-12-14 01:15:12 +13:00
David Rowe	c9a00e86d1	Fix model being left invisible if not auto-resized	2016-12-13 18:31:24 +13:00
David Rowe	ea7d84ec7d	Increase auto-resize timeout for Clara.io asset download from ATP	2016-12-13 17:55:44 +13:00
David Rowe	aefa116207	Add extra logging for Clara.io asset resizing	2016-12-13 17:55:22 +13:00
David Rowe	1f3045ad30	Merge branch 'master' into 21089 ... Conflicts: interface/src/Application.cpp	2016-12-13 14:05:24 +13:00
Stephen Birarda	b4f43e01b1	Merge pull request #9189 from huffman/feat/help-touch ... Add support for oculus touch in help menu	2016-12-12 16:48:00 -08:00
howard-stearns	712543a39a	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-12 16:37:41 -08:00
howard-stearns	4b5aae3c55	pal prototype	2016-12-12 16:37:16 -08:00
Seth Alves	d97be52542	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2016-12-12 16:24:17 -08:00
David Rowe	efb784f703	Code review	2016-12-13 13:11:21 +13:00
samcake	9155f11b3d	Merge pull request #9190 from jherico/test_mode ... Add test mode to interface	2016-12-12 15:37:05 -08:00
Brad Davis	2a43f5fbef	Add test mode to interface	2016-12-12 14:51:11 -08:00
Zach Fox	7030c7b0a6	Space bubble improvements (#9142) ... * The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash. * The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale. * Space bubble collision detection is now more accurate and reliable. * CTRL + N toggles the bubble. * The "Bubble" HUD button has been moved to the proper location.	2016-12-12 14:22:54 -08:00
Ryan Huffman	9f166d82ce	Add support for oculus touch in help menu	2016-12-12 13:44:09 -08:00
Clément Brisset	84bf93b0fc	Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll ... Restores "Select Audio DLL at runtime"	2016-12-12 13:38:34 -08:00
David Rowe	8a399c7cc0	Fix model auto-scaling to 1% not being seen by observers take 2	2016-12-12 17:01:02 +13:00
David Rowe	4f0c429e7f	Fix model auto-scaling to 1% not being seen by observers	2016-12-11 17:08:36 +13:00
Chris Collins	c912d77a95	Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit ... Honor reorient and quit request from OVR	2016-12-09 16:03:41 -08:00
David Rowe	a52d8d1982	Merge branch 'master' into 21089	2016-12-10 11:47:43 +13:00
David Rowe	e956608fa4	Fix keyboard focus when switch highlight between overlays and entities	2016-12-09 18:31:52 +13:00
David Rowe	bad8d20dd9	Rescale large Clara.io models to 1% instead of 10%	2016-12-09 17:02:06 +13:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
Atlante45	aa1d90108c	No updater command line argument	2016-12-08 16:35:30 -08:00
Clément Brisset	06331494af	Revert "Revert "Select Audio DLL at runtime""	2016-12-08 14:14:03 -08:00
David Rowe	4c236b293e	First pass at controller interaction with 3D Web overlay	2016-12-09 01:47:40 +13:00
David Rowe	5313a682ad	Fix compiler warning	2016-12-08 19:48:51 +13:00
David Rowe	7eacdb69b5	Auto-resize Clara.io models if larger than 10m as likely in cm or mm	2016-12-08 19:17:26 +13:00
David Rowe	639d7a5d97	Add further user feedback on Clara download progress	2016-12-08 18:36:50 +13:00
Atlante45	7b0b777051	Honor reorient and quit request from OVR	2016-12-07 17:29:54 -08:00
Howard Stearns	2eb8d9d0c4	Merge pull request #9153 from davidkelly/dk/machineFingerprint ... Machine fingerprint	2016-12-06 16:34:45 -08:00
David Kelly	562cd12bca	More CR feedback ... Breaking into 2 functions - one public, one private, so I can avoid nested control structures and so on in dealing with errors on the windows side of things. So, no more namespace, back to a class with 2 static functions, one public one private	2016-12-06 15:17:47 -08:00
David Rowe	186d3f18ef	Improve temporary download directory robustness	2016-12-07 11:55:17 +13:00
David Rowe	eafd51ba9e	Merge branch 'master' into 21089	2016-12-07 11:27:15 +13:00
David Rowe	8e30674069	Tidying	2016-12-07 09:28:35 +13:00
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
David Kelly	dc47c5fc0c	CR feedback ... lame mistake - it is always the error branches that get you.	2016-12-06 11:12:50 -08:00
David Kelly	c40aadfea4	whitespace	2016-12-05 17:13:12 -08:00
Anthony J. Thibault	89ae3b3d6e	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" ... This reverts commit efe9571ab8, reversing changes made to 333e9ec7f4.	2016-12-05 15:18:03 -08:00
Anthony J. Thibault	e8b5b56df7	Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode" ... This reverts commit 119653bceb, reversing changes made to a69d77ffbe.	2016-12-05 15:16:49 -08:00
Andrew Meadows	119653bceb	Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode ... Fix for reset sensors while in desktop mode.	2016-12-05 13:46:53 -08:00
Anthony J. Thibault	349f0355ae	Fix for reset sensors while in desktop mode. ... Previously hitting ' a.k.a. reset sensors, would teleport you to the last position you were in before you switched into desktop mode, or the spawn location. This fixes that behavior but not re-centering the avatar while in desktop mode.	2016-12-05 10:42:20 -08:00
David Rowe	2f42f4cfa5	Merge branch 'master' into 21089	2016-12-05 18:33:38 +13:00
David Rowe	71de106594	Tidying	2016-12-04 15:14:47 +13:00
David Rowe	b84bcaf629	Highlight Web overlay with focus	2016-12-04 13:42:12 +13:00
David Rowe	38e6c8075c	Direct keyboard input to Web overlay when has focus	2016-12-04 12:28:44 +13:00
David Rowe	6dbb7129e6	Add mouse press, move, and release handling to Web overlay	2016-12-03 17:09:09 +13:00
David Kelly	643353a31e	Initial push ... Works on windows, have not tried it on mac. Lots more to do, but need to get it pushed to remote just in case.	2016-12-02 15:46:20 -08:00
Clément Brisset	3659e8e585	Revert "Select Audio DLL at runtime"	2016-12-02 14:15:11 -08:00
Seth Alves	efe9571ab8	Merge pull request #8691 from highfidelity/out-of-body-experience ... Room Scale HMD comfort features.	2016-12-01 11:09:39 -08:00
Atlante45	e6b9d3604d	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-12-01 09:45:50 -08:00
Brad Hefta-Gaub	c9545ca920	Merge pull request #9129 from Atlante45/audio-dll ... Select Audio DLL at runtime	2016-11-30 15:42:21 -08:00
Atlante45	1d8c97b337	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-30 10:22:16 -08:00
Atlante45	db263df03e	Select Audio DLL at runtime	2016-11-29 19:42:59 -08:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Brad Davis	3b07e31eab	Working on OpenGL debuggability	2016-11-29 13:15:56 -08:00
howard-stearns	5188de924f	allow for SnapshotReview dialog to be up during a change of href for all ... media capture	2016-11-22 11:09:43 -08:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Zach Fox	7f4613f136	Add checkbox for GIF and length selector	2016-11-18 14:39:30 -08:00
Zach Fox	20a2d1275a	Bugfixes and GIF uploads workinggit add -A!	2016-11-18 14:39:30 -08:00
Zach Fox	a81289a0d7	Huge progress today. Buggy behavior with multiple snapshots remains	2016-11-18 14:39:29 -08:00
Zach Fox	8f9ffd2bc5	Framerate is stable, and GIF duration is correctgit add -A!	2016-11-18 14:39:29 -08:00
Zach Fox	25471d9fae	Still unstable, but maybe better?	2016-11-18 14:39:29 -08:00
Zach Fox	fc21cae904	More stable than ever! Uses external GifCreator lib. Still frame timing issues.	2016-11-18 14:39:29 -08:00
Zach Fox	f726ea546f	code cleanup; simultaneous gif and still capture	2016-11-18 14:39:29 -08:00
Zach Fox	1158ae8b3d	Much more stability.	2016-11-18 14:39:29 -08:00
Zach Fox	d91158f07c	Small changes, still trying to figure out judder	2016-11-18 14:39:29 -08:00
Zach Fox	0c4c97d3f9	GIF speed is wrong. Need to save both still and animated.	2016-11-18 14:39:29 -08:00
Zach Fox	152e0aee17	I think I'm very close to a PR...	2016-11-18 14:39:29 -08:00
Zach Fox	045dfff158	It's workinggit add -A! Stack corruption errors? Must fix.	2016-11-18 14:39:29 -08:00
Zach Fox	c39a8da3b8	Getting theregit add -A!	2016-11-18 14:39:29 -08:00
Zach Fox	e656a4413f	Comments - still crashing...	2016-11-18 14:39:28 -08:00
Zach Fox	1912ab1467	still crashing, feeling closer	2016-11-18 14:39:28 -08:00
Zach Fox	b6dd795b00	It crashes, but it's the start of a new architecture	2016-11-18 14:39:28 -08:00
Zach Fox	ed1d087a68	Starting cleanup procedure...	2016-11-18 14:39:28 -08:00
Zach Fox	ee21d1ccc7	IT WORKSgit add -A! Mega amounts of cleanup to do now.	2016-11-18 14:39:28 -08:00
Zach Fox	21d4590075	Just using usleep won't work	2016-11-18 14:39:28 -08:00
Zach Fox	76121a2bcd	Getting somewheregit add -A!	2016-11-18 14:39:28 -08:00
Zach Fox	912c9db1c1	More progress. Corrupted output GIF.	2016-11-18 14:39:28 -08:00
Zach Fox	704476c197	Initial progressgit add -A!	2016-11-18 14:39:28 -08:00
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13:00
Andrew Meadows	6bb3dd6830	Merge hifi/master into hifi/out-of-body-experience	2016-11-14 15:08:04 -08:00
Brad Davis	c7d68aa9cf	Add stutter stat logging	2016-11-10 13:15:35 -08:00
David Rowe	84795439ea	Display Clara.io download information	2016-11-10 16:29:48 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
Brad Hefta-Gaub	5454dca82e	Merge pull request #9030 from highfidelity/stable ... Update master with Stable hotfix	2016-11-07 18:48:54 -08:00
David Rowe	8cceda1cfe	Tidy UI text	2016-11-08 13:23:44 +13:00
David Rowe	afd2a900a3	Improve error handling for case that don't have permissions	2016-11-08 13:22:50 +13:00
Chris Collins	eec8e2f19b	Merge pull request #9000 from samcake/punk ... Add Frame Timing and GPU memory to the Stats and user activity log	2016-11-07 16:17:20 -08:00
Atlante45	f34cf64f3e	Disable updater on Steam	2016-11-07 16:09:56 -08:00
David Rowe	090065ee34	Add user feedback on download process	2016-11-08 13:05:35 +13:00
Seth Alves	24556fc70d	Merge pull request #8980 from huffman/feat/default-to-hmd ... Update interface to default to HMD display plugin	2016-11-07 13:36:39 -08:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
Andrew Meadows	ccdf383151	Merge hifi/master into hifi/out-of-body-experience	2016-11-07 08:24:26 -08:00
Atlante45	ae29fe8ab2	Logging improvements	2016-11-04 14:26:19 -07:00
Ryan Huffman	0cec62b3a3	Revert "Update interface to default to HMD display plugin" ... This reverts commit bbef071723.	2016-11-04 12:27:15 -07:00
Ryan Huffman	0dac2c999e	Revert "Remove unused 'first' variable" ... This reverts commit 26e0d02d60.	2016-11-04 12:27:04 -07:00
Ryan Huffman	3ad9c1a797	Add check to go into HMD on first run if available	2016-11-04 12:26:20 -07:00
samcake	76aa541d4a	Adding the frame gpu and batch timer	2016-11-04 11:49:52 -07:00
samcake	7655f906f1	Starting adding a timer for the frame	2016-11-03 19:26:30 -07:00
Clément Brisset	00a94bdd6d	Merge pull request #8974 from huffman/feat/help-select-xbox-tab ... Update help window to auto select xbox or vive controller tab on availability of device	2016-11-03 14:42:23 -07:00
howard-stearns	3a072b5bf9	tell desktop about preference changes	2016-11-03 12:17:28 -07:00
Zach Fox	9a22c29788	Get ready for merge	2016-11-03 11:20:08 -07:00
Zach Fox	b74c1d3476	tabs to spaces	2016-11-03 10:42:15 -07:00
Zach Fox	a12e0325bf	Making progress...	2016-11-03 10:39:55 -07:00
David Rowe	427c8008c6	Merge branch 'master' into 21089	2016-11-03 09:18:25 +13:00
Ryan Huffman	26e0d02d60	Remove unused 'first' variable	2016-11-01 16:40:41 -07:00
Ryan Huffman	bbef071723	Update interface to default to HMD display plugin	2016-11-01 16:23:53 -07:00
David Rowe	10490a9fad	Default collision shap to hull per submesh instead of static	2016-11-02 10:45:00 +13:00
Ryan Huffman	3147ea9e33	Update help window to auto select xbox or vive controller tab on availability of device	2016-11-01 13:43:55 -07:00
David Rowe	93beaa81c0	Code tidying	2016-11-01 13:27:05 +13:00
David Rowe	cee8b66ce9	Handle duplicate Clara download asset names	2016-11-01 13:26:05 +13:00
David Rowe	3ca2c19075	Delete temporary directory after content has been used	2016-11-01 12:31:35 +13:00
David Rowe	8ab56fe871	Automatically download Clara model to ATP and add to world	2016-10-31 16:02:20 +13:00
David Rowe	12747d26e0	Add parameter that enables automatically adding download model to world	2016-10-30 13:58:17 +13:00
Seth Alves	e15043754c	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 11:36:09 -07:00
Brad Davis	012e215f62	Merge pull request #8922 from ZappoMan/report45hzTarget ... when vive is on i5 report a correct target frame rate so we can see that in metaverse stats	2016-10-27 14:03:07 -07:00
Brad Hefta-Gaub	bfe6ebb44f	some tweaks	2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub	510786bc0f	Merge pull request #8923 from Atlante45/steamvr ... Add getter for SteamVR's buildID to SteamClient	2016-10-27 11:38:35 -07:00
Seth Alves	f47aeae2a7	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
Brad Hefta-Gaub	c6d89f181a	CR feedback	2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub	d778b3b4ce	fix the timing of the launchedFromSteam property	2016-10-27 10:00:48 -07:00
Andrew Meadows	38e4ac0ae9	Merge master into out-of-body-experience	2016-10-26 16:59:31 -07:00
Atlante45	f26ddc6f8b	Add getter for SteamVR's buildID to SteamClient	2016-10-26 14:51:48 -07:00
Zach Pomerantz	4913654f44	Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order	2016-10-25 17:49:30 -07:00
Brad Hefta-Gaub	56b0995047	Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix ... Crash on exit fix for render items	2016-10-25 17:34:46 -07:00
Chris Collins	3b31b28622	Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits ... fix a couple of crash-on-exits	2016-10-25 17:03:21 -07:00
Zach Pomerantz	78a04255ab	amend qml/audio ordering comment	2016-10-25 16:35:56 -07:00
Zach Pomerantz	5413d97089	cleanup qml before audio	2016-10-25 15:54:08 -07:00
Anthony Thibault	23aa626755	Destroy render scene & engine before Application is destroyed ... Many render items/payloads contain smart pointers back to the objects that added them to the scene, including entity and avatar objects. Currently, those render items are destroyed when the scene is destroyed very late in the application life-cycle. There are rare crashes that can occur when these render items are destroyed. Possibly, due to them referencing objects that have already been destroyed via raw pointers. In an effort to eliminate these crashes, we now destroy the scene earlier, within Application::aboutToQuit() which is connected to the QCoreApplication::aboutToQuit signal. Also, we guard against null scene pointer dereferences. Any location that accesses the scene off the main thread, now checks the validity of the scene pointer.	2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub	822e088240	tweak format of gl_info	2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub	e22a2e9e2f	add gl info and gpu free memory to user stats	2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub	272055b6ee	add location and build info to user activity stats	2016-10-25 14:19:44 -07:00
Seth Alves	3903a51062	fix a couple of crash-on-exits	2016-10-25 13:58:48 -07:00
Chris Collins	9846614468	Merge pull request #8879 from AndrewMeadows/show-physics-stats ... add Bullet profile info to PerformanceTimer stats	2016-10-25 06:29:27 -07:00
Clément Brisset	dd45500313	Merge pull request #8891 from huffman/fix/disconnected-dialog-updates ... Fix several aspects of the "disconnected" dialog	2016-10-24 15:39:16 -07:00
Brad Davis	da9eb0433c	Remove workaround for QML HDPI offscreen rendering bug	2016-10-24 11:51:40 -07:00
Ryan Huffman	32b5c84bec	Update ConnectionMonitor to init at end of startup	2016-10-24 10:27:27 -07:00
Andrew Meadows	51a9a99381	Merge hifi/master into hifi/out-of-body-experience	2016-10-24 08:13:42 -07:00
David Kelly	aa31d3d8cc	Heartbeats need to happen while waiting for sandbox ... We can only know if sandbox is up by waiting for the http request to succeed or fail. In the common case (fail since it isn't up yet), we have to wait until a connect timeout in http. Seems that is a couple seconds, and in that time we really upset the deadlock watchdog thread since it keeps a moving average of heartbeat times. Simple solution, updateHeartbeat while waiting, and right before we start.	2016-10-21 14:43:39 -07:00
Brad Hefta-Gaub	ba9d9f6ab7	Merge pull request #8860 from davidkelly/dk/2004 ... Fix for sandbox startup issue	2016-10-21 14:24:08 -07:00
Andrew Meadows	e44672180a	add Bullet profile info to PerformanceTimer stats	2016-10-21 13:22:22 -07:00
David Kelly	20b140317c	PR feedback ... bool to indicate sandbox is actually running.	2016-10-20 17:01:09 -07:00
Clément Brisset	b63eb6ba9f	Merge pull request #8665 from zzmp/feat/audio-stats ... move audio stats to QML/JS, with graphs	2016-10-20 16:43:49 -07:00
David Kelly	ab02fd79a0	since we know the state, use that boolean	2016-10-20 10:12:26 -07:00
howard-stearns	6f283a4893	fix resize on plugin switch	2016-10-20 09:39:02 -07:00
David Kelly	5b7f0cb358	Fix for sandbox startup issue ... Move determinedSandboxState=true until after we spawn it.	2016-10-19 13:51:20 -07:00
Stephen Birarda	18523558f7	move HFWebEngineProfile back to interface/networking	2016-10-18 20:04:11 -07:00
Stephen Birarda	9f2627d31d	Merge pull request #8828 from birarda/web-engine-interceptor ... move HF access token to authorization header	2016-10-18 17:24:58 -07:00
Stephen Birarda	f8e0d7ad88	move QWebEngine classes to ui library	2016-10-18 12:53:32 -07:00
Stephen Birarda	c4cec8eb1e	use desktop profile again, move classes to networking subdir	2016-10-18 10:22:31 -07:00
Brad Hefta-Gaub	0d48eb55b9	Merge pull request #8835 from zzmp/fix/entity-del-deadlock ... fix deadlock when removing tablet	2016-10-18 01:21:55 -07:00
Zach Pomerantz	95eb52ad17	bail early when removing entity focus	2016-10-17 14:02:22 -07:00
Brad Hefta-Gaub	dcab5a5dbc	fix unix warning	2016-10-17 13:12:24 -07:00
Brad Hefta-Gaub	c575e19b81	more CR feedback	2016-10-17 13:09:10 -07:00
Brad Hefta-Gaub	d5c87a0db6	CR feedback	2016-10-17 12:02:23 -07:00
Stephen Birarda	b4b5c648c2	use a QWebEngineProfile request interceptor for auth in HTTP header	2016-10-17 11:34:37 -07:00
Stephen Birarda	89a4bc8434	add custom QWebEngine request interceptor	2016-10-17 11:34:10 -07:00
Brad Hefta-Gaub	d46170bec0	auto shutdown of sandbox when interface quits	2016-10-17 07:55:24 -07:00
Anthony J. Thibault	81db8f7e08	Merge branch 'master' into out-of-body-experience	2016-10-13 17:27:15 -07:00
Chris Collins	90b283f83b	Merge pull request #8806 from huffman/fix/atp-script-cache ... Update ScriptCache to clear ATP assets when disconnected from a domain	2016-10-13 16:30:29 -07:00
Ryan Huffman	decb94b719	Update ScriptCache to clear ATP assets when disconnected from a domain	2016-10-13 14:05:53 -07:00
Andrew Meadows	d54c07ed14	Merge 'master' into 'out-of-body-experience'	2016-10-12 13:35:27 -07:00
Atlante45	eaca3b672f	Switch to JSON for application settings	2016-10-12 10:20:19 -07:00
Brad Davis	28771cbda9	Additional plugin debugging, better plugin resource cleanup	2016-10-11 19:40:02 -07:00
Andrew Meadows	abb05bc686	Merge pull request #8753 from ctrlaltdavid/21068 ... Improve indication of user not being logged in	2016-10-11 10:40:37 -07:00
Andrew Meadows	55c90e7bca	Merge branch 'master' into out-of-body-experience	2016-10-07 15:18:08 -07:00
Ryan Huffman	c995e51128	Fix compilation bugs in Application	2016-10-07 10:30:18 -07:00
Ryan Huffman	b839926396	Remove unnecessary lambda for location initialization on startup	2016-10-07 10:30:18 -07:00
Ryan Huffman	9ddeda389e	Update initial run logic	2016-10-07 10:30:18 -07:00
Ryan Huffman	20b93a7afa	Add redirection to entry on first turn if you don't have Vive	2016-10-07 10:30:18 -07:00
Ryan Huffman	216cf2b4bc	Update tutorial to work with HMD + Hand Controllers only	2016-10-07 10:30:18 -07:00
Ryan Huffman	1699299de9	Fix location that server content version is looked for	2016-10-07 10:30:18 -07:00
Ryan Huffman	37096910fc	Fix tutorial begin location	2016-10-07 10:30:18 -07:00
Ryan Huffman	9c7ea6ac7c	Update logic for going to tutorial on launch	2016-10-07 10:30:18 -07:00
Ryan Huffman	1e0772d613	Remove unused variable	2016-10-07 10:30:18 -07:00
Ryan Huffman	4c3cb83d47	Set default preferred device to vive and rift	2016-10-07 10:30:18 -07:00
Ryan Huffman	9f53652dfb	Add routing of new users to tutorial	2016-10-07 10:30:18 -07:00
Howard Stearns	3a294e77d4	Merge pull request #8745 from huffman/feat/new-help-window ... Update the help window	2016-10-07 10:01:47 -07:00
David Rowe	c76bb01359	Make Interface title say if user not logged in	2016-10-07 15:39:46 +13:00
Anthony J. Thibault	cc7a6ada38	Merge branch 'master' into out-of-body-experience	2016-10-05 17:16:39 -07:00
David Rowe	1a745094e2	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-06 09:29:09 +13:00
Clément Brisset	d18394f249	Merge pull request #8596 from huffman/feat/my-avatar-self-id ... Add ability to parent overlays to MyAvatar for use across servers	2016-10-05 12:03:01 -07:00
Anthony J. Thibault	aab974e6ae	Merge branch 'master' into out-of-body-experience	2016-10-04 11:17:52 -07:00
Ryan Huffman	b5eb943c1d	Add hmd stats to stats event	2016-10-03 15:12:14 -07:00
Ryan Huffman	dafb5c5bab	Add processor information to launch user activity event	2016-10-03 15:11:56 -07:00
David Rowe	caf1a93354	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp	2016-10-04 10:51:14 +13:00
David Rowe	4818ad2615	Merge branch 'master' into 21055	2016-10-04 08:46:30 +13:00
samcake	0189e3aea7	Github is borked ?	2016-10-03 11:29:17 -07:00
samcake	5adedbbb8b	replace the simple log by a unique log	2016-10-03 11:27:15 -07:00
samcake	0df69b8e15	Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug	2016-10-03 10:06:58 -07:00
Anthony J. Thibault	eccd01e88f	Merge remote-tracking branch 'upstream/master' into out-of-body-experience	2016-09-29 16:36:25 -07:00
Thijs Wenker	3d14a32d17	fix controller::ScriptingInterface not found warning in AC	2016-09-29 22:11:12 +02:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
Anthony J. Thibault	961d262df1	Improved body follow behavior ... * follow helper lean re-centering / reconciliation now modifies bodySensorMatrix, NOT the character controller. * The character controller now always follows the bodySensorMatrix (in world space). This decouples the lean re-centering velocity from the velocity used to move the character controller. We can now independently tune these things separately.	2016-09-27 16:38:48 -07:00
Zach Pomerantz	b9c4018b8e	expose AudioStats to qml/js	2016-09-26 15:35:29 -07:00
Zach Pomerantz	277eefafd7	remove the audio stats dialog	2016-09-23 14:39:07 -07:00
Zach Pomerantz	d0f4a29031	Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection	2016-09-23 13:12:39 -07:00
Anthony J. Thibault	98ffea2fb9	Merge branch 'master' into out-of-body-experience	2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub	5d3d4bdbd9	add support for redirection on domain at max capacity	2016-09-21 18:12:38 -07:00
Zach Pomerantz	9e2ec27b29	always play audio injectors locally	2016-09-21 17:20:51 -07:00
Seth Alves	2468b56079	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub	fd474f6319	add basic support for master vs stable builds	2016-09-19 14:14:32 -07:00
Seth Alves	d67701f7bb	new logging category for deadlock debug prints	2016-09-15 13:02:18 -07:00
Seth Alves	4470338663	catagorize some qDebugs	2016-09-14 21:39:45 -07:00
Ryan Huffman	23450e929b	Add special avatar id for attaching overlays	2016-09-13 16:33:58 -07:00
Andrew Meadows	954d690b8a	expose setting avatar collisionless	2016-09-12 16:24:08 -07:00
Seth Alves	e020351c93	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-12 11:22:12 -07:00
Howard Stearns	b949c83a05	remove jpg error popup behavior	2016-09-10 11:18:14 -07:00
Seth Alves	8899c0b790	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-10 10:43:07 -07:00
Brad Hefta-Gaub	258c83f864	Merge pull request #8551 from jherico/texture_load_test_pbo ... Stuttering: Sparse Textures	2016-09-09 13:47:27 -07:00
Seth Alves	f6398315b1	avoid a crash-on-exit	2016-09-09 11:48:14 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Brad Davis	bc6b43b7be	Add debug option to lower texture resolution	2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub	3d54600843	Merge pull request #8513 from Atlante45/feat/network-port ... Add settings to change local port	2016-09-08 18:10:32 -07:00
SamGondelman	99176588cc	remove old webwindowclass that relied on qwebkit	2016-09-06 17:36:59 -07:00
SamGondelman	9d447d4dcc	enabled qnetworkrequest redirects everywhere I could find them	2016-09-06 17:35:06 -07:00
Atlante45	eb007b24cd	Use invalid port to signal no value passed	2016-09-06 11:59:07 -07:00
Brad Davis	94210d2e69	Use dynamic count for global thread pool	2016-09-02 15:23:35 -07:00
Brad Davis	91bfa7677c	Updating stats display for threaded rendering	2016-09-02 14:41:49 -07:00
Zach Pomerantz	441005bba0	use existing defaults for zoneless keylight	2016-08-31 09:47:53 -07:00
Zach Pomerantz	372c52fea5	restore default ambient skybox	2016-08-30 17:07:34 -07:00
Brad Davis	617633b85c	Moving to custom context creation	2016-08-29 11:21:54 -07:00
Brad Davis	587d015c57	Give names to offscreen contexts for easier debugging	2016-08-26 19:09:26 -07:00
Zach Pomerantz	24162f0f3d	set skybox default color to empty color	2016-08-25 12:37:23 -07:00
James B. Pollack	d9ebad7976	Merge pull request #8372 from elisa-lj11/zip_project ... Added Clara.io to the marketplace	2016-08-24 15:53:58 -07:00
Zach Pomerantz	c740b263a8	detect unset skybox	2016-08-23 15:16:26 -07:00
Howard Stearns	89b00883dd	Merge pull request #8428 from highfidelity/discovery ... Snapshot of Snapshot-Discovery to master	2016-08-23 14:32:10 -07:00
elisa-lj11	cdc5dde40e	Merge remote-tracking branch 'highfidelity/master' into zip_project	2016-08-23 11:22:43 -07:00
Brad Hefta-Gaub	21bc06f154	Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration ... handControllerGrab and web entity input integration	2016-08-23 09:59:25 -07:00
Zach Pomerantz	cbb115bbcc	fix typo argee->agree	2016-08-22 16:34:23 -07:00
Anthony J. Thibault	d015c5cfb5	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-22 14:13:17 -07:00
howard-stearns	d0b58d8f8e	move thread safety into Application from caller	2016-08-22 12:49:51 -07:00
Anthony J. Thibault	b6a4904068	remove explicit check for WebEntity from setKeyboardFocus ... Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer	2016-08-22 10:56:35 -07:00
howard-stearns	b8b345fb43	Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2	2016-08-19 13:04:39 -07:00
elisa-lj11	4aab389305	Merge remote-tracking branch 'highfidelity/master' into zip_project	2016-08-19 11:32:37 -07:00
Anthony J. Thibault	8bb6bb7c6f	generalized keyboard focus interface ... Removed dynamic casts to RenderableWebEntityItem, instead virtual methods were added to EntityItem to facilitate this. * bool wantsKeyboardFocus() * void setProxyWindow() * QObject* getEventHandler()	2016-08-19 10:56:52 -07:00
James B. Pollack	98f0290565	Merge pull request #8436 from huffman/feat/more-user-activity-data ... Add more user activity data	2016-08-19 10:48:28 -07:00
elisa-lj11	4c434e875e	fixed merge conflicts in Application.cpp	2016-08-19 09:46:22 -07:00
howard-stearns	f6670a6374	new optional aspect-ratio argument to snapshot chain (javascript through ... c++ display plugin). When non-zero, it pulls out the largest piece from the center that maintains that ratio. Snapshot button uses 1.91.	2016-08-18 16:29:42 -07:00
Brad Hefta-Gaub	1cec7b2db0	Merge pull request #8429 from SamGondelman/loadingFade2 ... Don't do fade effect once physics kick in	2016-08-18 12:46:24 -07:00
Clément Brisset	d1fb723b01	Merge pull request #8444 from zzmp/fix/skybox ... fix flashing in default skybox, and allow skybox lighting without textures	2016-08-18 11:07:09 -07:00
Ryan Huffman	25b9d756ca	Update entity edit tracking to track count rather than bool	2016-08-17 16:54:04 -07:00
howard-stearns	e75f950ac7	Signal receivedHifiSchemeURL	2016-08-17 16:34:59 -07:00
Ryan Huffman	fbe971e730	Fix hand_pose_changed event	2016-08-16 17:46:21 -07:00
Anthony J. Thibault	03322a9c49	Fix for using hardware mouse in HMD mode	2016-08-16 17:09:59 -07:00
Anthony J. Thibault	7de8cc6422	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-16 16:49:57 -07:00
Anthony J. Thibault	36d87ddd7c	Added EntityItem::wantsHandControllerPointerEvents method	2016-08-16 16:23:45 -07:00
Stephen Birarda	3355a90e7d	Merge pull request #8413 from huffman/feat/atp-bandwidth ... Add asset server bandwidth to stats	2016-08-16 15:54:11 -07:00
Anthony J. Thibault	c407818d63	send pointer events from handControllerGrab.js to webEntities	2016-08-16 15:26:14 -07:00
Zach Pomerantz	8c559bc65d	use lights from nontextured skyboxes	2016-08-16 13:27:22 -07:00
Zach Pomerantz	4d0c819173	remove peaking irradiance from default background	2016-08-16 13:26:33 -07:00
howard-stearns	2b75240771	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-16 11:14:36 -07:00
Ryan Huffman	2598d27cf3	Add hand_pose_changed implementation for stats	2016-08-15 10:29:19 -07:00
samcake	8d12a23efb	Merge pull request #8325 from jherico/deferred_batches_threaded ... Threaded rendering	2016-08-15 09:59:44 -07:00
Ryan Huffman	b5e2913eb9	Move node received bandwidth tracking to LimitedNodeList	2016-08-15 09:23:02 -07:00
Brad Davis	5b09748c00	Merge pull request #8431 from imgntn/assetbutton ... Open Asset Browser with Button from Edit.js Toolbar	2016-08-13 12:04:21 -07:00
Brad Davis	cac529a1b1	Display plugins now use gpu::Context API	2016-08-12 22:29:00 -07:00
Brad Davis	d548da02d9	Expose whether nsight is running to the app, disable some stuff under nsight	2016-08-12 22:28:50 -07:00
Brad Davis	adcfd55cc0	Batch replay reprojection	2016-08-12 22:28:23 -07:00
Bradley Austin Davis	274321de8a	First pass at threaded rendering	2016-08-12 22:18:36 -07:00
Anthony J. Thibault	1be434342b	Work In Progress snapshot ... * Added new PointerEvent type. * Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents * All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents * Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents * Events from handControllerGrab.js to entities are currently broken.	2016-08-12 17:11:59 -07:00
Clément Brisset	5a1c7bd4e6	Merge pull request #8407 from highfidelity/steam ... Steam integration	2016-08-12 16:55:48 -07:00
Zander Otavka	62f4e3536b	Expose showing asset server to script interface	2016-08-12 15:18:30 -07:00
SamGondelman	ccca6d935f	don't fade after physics kick in	2016-08-12 14:35:22 -07:00
howard-stearns	df3769166e	Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master	2016-08-12 14:16:16 -07:00
Atlante45	e4dd4c1a41	Merge branch 'master' of https://github.com/highfidelity/hifi into steam	2016-08-12 10:38:05 -07:00
Ryan Huffman	211da3c428	Add more user activity tracking data	2016-08-11 16:49:29 -07:00
howard-stearns	e6746acf4c	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
Anthony J. Thibault	8dac45c99e	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-10 11:27:21 -07:00
Zander Otavka	4e16998b45	Disable loading client scripts over ATP	2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub	d8f1847fde	Merge pull request #8365 from huffman/feat/default-skybox ... Default skybox change	2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub	d8edf5c85a	Merge pull request #8357 from sethalves/fsm-arrows-dont-walk ... FSM arrow keys don't make the avatar walk	2016-08-09 11:17:00 -07:00
Ryan Huffman	8ee3f680c9	Change default skybox ambient intensity from 3.5 to 2.0	2016-08-08 16:03:03 -07:00
Ryan Huffman	eaa77edc25	Replace 'Stars' menu option with 'Default Skybox'	2016-08-08 16:03:03 -07:00
Ryan Huffman	9cbfe195cd	Adjust commenting out of old stars rendering code	2016-08-08 16:03:03 -07:00
Ryan Huffman	4c662b0d60	Add static consts for default skybox values	2016-08-08 16:03:03 -07:00
Ryan Huffman	5b69ca03f0	Move default skybox out of global and make irradiance gen optional	2016-08-08 16:03:03 -07:00
Ryan Huffman	35ea9908cd	Add default skybox	2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub	55c690d016	Merge pull request #8368 from huffman/feat/domain-connection-display ... Automatically show address bar after disconnected for X seconds	2016-08-08 15:56:29 -07:00
Atlante45	f08b2f9257	Remove temporary override to reload QML	2016-08-08 15:39:44 -07:00
Atlante45	7ec2f98cf2	Join lobby on startup	2016-08-08 15:39:25 -07:00
Atlante45	42c9a695ff	Invite friends in HMD	2016-08-08 15:39:25 -07:00
Atlante45	205df0cf51	login UI first draft	2016-08-08 15:39:25 -07:00
Atlante45	cea0e182c0	Interface login through steam	2016-08-08 15:39:25 -07:00
David Kelly	c8f3a898d2	First cut of a snapshot uploader ... Will need to test end-to-end shortly, etc...	2016-08-08 15:27:27 -07:00
Ryan Huffman	fb14628a7e	Handle case in entity loading priority function where max dim size is <= 0	2016-08-08 10:39:27 -07:00
Ryan Huffman	d367583426	Clean up priority loading implementation	2016-08-08 08:53:06 -07:00
Ryan Huffman	d48bc96cf9	Add ability to set number of concurrent downloads	2016-08-08 08:53:06 -07:00
Ryan Huffman	4f9be2ae72	Fix camera position not being set for angular loading	2016-08-08 08:53:06 -07:00
elisa-lj11	b1b2ea48b2	Made code more QA; extra browser and download widget close upon download	2016-08-04 17:01:19 -07:00
elisa-lj11	a94a304700	Downloads from Clara.io and uploads to asset server	2016-08-04 16:59:38 -07:00
elisa-lj11	6152fa28b7	Download through QML ... It kind of works, not crashing like before, but the weird ghost file/type error is still happening with multiple downloads	2016-08-04 16:58:31 -07:00
elisa-lj11	eab7714d70	working within webview to access url	2016-08-04 16:57:19 -07:00
elisa-lj11	76a847d34f	testing for URL bug	2016-08-04 16:53:09 -07:00
elisa-lj11	212e4f9cca	making quazip work	2016-08-04 16:48:14 -07:00
elisa-lj11	4f33e1502f	starting the zip project	2016-08-04 16:46:56 -07:00
Ryan Huffman	8044910bf2	Add show-address-bar when disconnected from domain	2016-08-04 14:39:53 -07:00
Seth Alves	40a5e4abc8	in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk	2016-08-03 13:54:25 -07:00
Anthony J. Thibault	0ab15f0dcd	fixed one frame lag on webEntity keyboard highlight overlay. ... Also, made overlay not draw in front.	2016-08-02 15:35:59 -07:00
Howard Stearns	c2d1f08551	Merge pull request #8342 from highfidelity/dk/snapshot ... Snapshot button	2016-08-02 15:31:50 -07:00
Anthony J. Thibault	6d768d8327	hand controllers send touch events instead of mouse events to web entities ... This gives a much better experience when scrolling web content.	2016-08-02 15:23:46 -07:00
David Kelly	1d7cdff2bc	Snapshot button plus script ... Minor change to allow snapshots to not notify (though the old way with CTRL+S still does). Added button to do it, saves them to disk. The plan is for us to add UI to share (or not) the snapshot. That's why we are not going through the notifications. Also, the script makes sure to hide/unhide hud and overlays. Next we will upload the pick to AWS via data-web (if you are logged in), and _then_ make the share UI.	2016-08-01 18:21:01 -07:00
Anthony Thibault	cf7450beb7	handControllerGrab and web entity input integration	2016-07-29 17:50:45 -07:00
Brad Hefta-Gaub	e879f22c95	fix behavior with no entity server	2016-07-28 15:15:52 -07:00
Bradley Austin Davis	a9740b803f	Defer batch execution to the end of the frame generation	2016-07-26 16:13:48 -07:00
Brad Hefta-Gaub	2d199fe3d0	rename function for better clarity	2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub	83dc9ea6bb	punish slow scripts and don't send updates while physics is still loading	2016-07-25 21:46:30 -07:00
Ryan Downe Karpf	91714aaca6	Merge pull request #8258 from AlexanderOtavka/edit-model-ui ... Edit model dialog improvements	2016-07-22 17:11:52 -07:00
James B. Pollack	5202038210	Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor ... Vive HMD fixes to prevent user from becoming embedded in the floor.	2016-07-22 09:04:40 -07:00
samcake	853f31f6ea	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-20 10:49:27 -07:00
Anthony J. Thibault	837b19ed1b	fix for pushing avatar into floor when exiting away mode. ... * Removed MyAvatar.reset() access from JavaScript * Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation. * Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history. * Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes are facing the same direction as the current HMD orientation. away.js now uses the above new API's instead of MyAvatar.reset()	2016-07-19 14:42:24 -07:00
samcake	ff132fa712	Gathering the diffusion passes in the SUrfaceGEometryPAss job	2016-07-19 02:11:22 -07:00
Anthony J. Thibault	7fd40a5d10	MacOS: fix crash when touchscreen device is nullptr.	2016-07-18 17:08:17 -07:00
samcake	744474982d	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-17 13:28:03 -07:00
Zander Otavka	71f62c02fc	Add basic implementation of customPrompt ... Still missing the warning and diabling of dynamic checkbox when the static mesh is selected.	2016-07-15 17:35:55 -07:00
samcake	a3f6ed6a89	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-15 09:22:34 -07:00
Brad Davis	882139ebcf	Allow scripts to override the navigation focus state set by QML dialogs	2016-07-14 12:10:46 -07:00
samcake	3ab56062d4	Address some warnings and syntax issues	2016-07-14 12:06:02 -07:00
Stephen Birarda	6b6513d5f9	immediately fade out ignored avatars	2016-07-13 15:06:31 -07:00
Stephen Birarda	bb68e777e6	add a scripting interface to ignore users	2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub	487aacde3c	Merge pull request #8216 from huffman/feat/improved-domain-loading ... Update max request limit and number of processing threads	2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub	f8910d475e	Merge pull request #8225 from ZappoMan/codecPlugins ... Audio codec plugins	2016-07-13 14:47:03 -07:00
samcake	8acc18ae8b	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-13 11:42:07 -07:00
Ryan Huffman	fcd59ea94f	Update target number of processing threads to be based on system	2016-07-12 17:44:23 -07:00
Brad Hefta-Gaub	b8d79ec263	Merge pull request #8179 from SamGondelman/snapshotFix3 ... Various snapshot improvements	2016-07-12 15:28:51 -07:00
samcake	5d4b55eeea	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-12 09:19:28 -07:00
samcake	ba7590712a	BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore	2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub	bcee128de0	Merge pull request #6959 from Triplelexx/20769 ... CR for Job #20769 - Touchscreen camera input for Interface	2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub	f3f72f3c93	Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins	2016-07-11 13:15:27 -07:00
Ryan Huffman	26545b2b99	Add new help.html info window	2016-07-09 04:22:42 -07:00
Stephen Birarda	11aafc0f48	use endsWith for scriptURL check	2016-07-08 16:00:06 -07:00
Stephen Birarda	43967dc9a6	handle running of non .svo.json JSON files from mp CDN	2016-07-08 15:47:56 -07:00
Ryan Huffman	489d2e4ca5	Update max request limit and number of processing threads	2016-07-08 15:33:11 -07:00
Stephen Birarda	5bce924eda	keep signature for askToLoadScript	2016-07-08 14:34:42 -07:00
Stephen Birarda	216e47b29a	hide the long URL prefix of scripts from marketplace	2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub	9333c7dcca	Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins	2016-07-06 13:26:19 -07:00
SamGondelman	04184ee1fb	added snapshot notification in desktop mode	2016-07-05 17:21:57 -07:00
Brad Davis	d6250d4c5a	Fix export entities by region	2016-07-05 10:37:53 -07:00
SamGondelman	218b26b521	removed snapshot share dialog, ctrl s shouldn't leave you moving	2016-07-01 10:58:55 -07:00
SamGondelman	69ffd63ba7	fix snapshot sharing window	2016-06-30 15:42:48 -07:00
Brad Hefta-Gaub	ec0ca1d173	Merge pull request #8146 from huffman/fix/launch-version ... Add version to launch user activity	2016-06-28 17:13:10 -07:00
Howard Stearns	da61100b6d	Merge pull request #8150 from highfidelity/vive-ui ... merge vive-ui to master	2016-06-28 13:31:55 -07:00
Ryan Huffman	b36a39b2bc	Add version to launch user activity	2016-06-28 09:59:59 -07:00
Andrew Meadows	58e05b2e90	Merge pull request #8143 from AlexanderOtavka/remove-cam-slots ... namechange Camera::_rotation --> Camera::_orientation	2016-06-28 09:49:54 -07:00
Brad Davis	8561581ab2	Merge pull request #8121 from SamGondelman/miniMirrorFix ... Mini mirror/multi-monitor bug fixes	2016-06-27 22:04:39 -07:00
Zander Otavka	235ee4bd46	Refactor Camera scripting interface a little ... get/setRotation has been removed, as it was a duplicate of get/setOrientation, but undocumented and barely used. get/setTransform and get/setPerspective have been changed to methods from slots, since glm::mat4 is not exposed to the scriping interface so they don't work in scripting.	2016-06-27 13:06:12 -07:00
Triplelexx	aae3555b63	update TouchscreenDevice ... * fix threading issue with zoom gesture * KeyboardMouseDevice touchpad disabled to prevent interference * device supported based on QTouchDevice::devices().count()	2016-06-27 21:01:06 +01:00
Brad Davis	f90a351400	Don't reposition windows prior to selecting the initial display plugin	2016-06-24 16:31:24 -07:00
Triplelexx	6542604d13	resolve conflicts with TouchscreenDevice ... updated to master	2016-06-24 05:19:28 +01:00
Triplelexx	fd4d9761ce	merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping	2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub	d7bffc3eab	first cut at negotiating codecs	2016-06-23 17:14:41 -07:00
howard-stearns	f8391f0062	fix reticle bugs	2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub	be37921845	first cut at codec plugins	2016-06-23 10:42:02 -07:00
howard-stearns	67f76db7e4	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-22 15:58:53 -07:00
Ryan Huffman	2621add8e3	Fix nearby_avatars not tracking	2016-06-22 09:17:28 -07:00
SamGondelman	78a1845afe	fixed resizing of qml overlays when device pixel ratio changes	2016-06-21 18:13:11 -07:00
Ryan Huffman	70be7b3273	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
howard-stearns	8421931c56	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub	160a5de271	CR feedback	2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub	c322317878	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00
Ryan Huffman	6d753e317b	Fix more osx warning	2016-06-21 10:51:31 -07:00
Ryan Huffman	a77dea9048	Fix osx warning	2016-06-21 10:30:05 -07:00
Ryan Huffman	cee897d6d3	Fix osx warning	2016-06-20 16:44:07 -07:00
Ryan Huffman	ab057010d6	Add changed display mode tracking	2016-06-20 16:09:34 -07:00
Ryan Huffman	1eaa9e40cd	Cleanup nearby avatar tracking	2016-06-20 16:09:17 -07:00
Ryan Huffman	3aac0cc4fb	Update fps useractivity with more general stats	2016-06-20 16:02:36 -07:00
Ryan Huffman	7b3b01a96a	Add more values to launch UserActivity	2016-06-20 16:02:14 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Bradley Austin Davis	5bc8b53d1b	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub	d8d4eb65ec	Merge pull request #8059 from Atlante45/feat/steamworks ... Initial Steamworks integration	2016-06-16 18:49:51 -07:00
Ryan Huffman	c7955900ab	Add new user activity events	2016-06-16 13:17:18 -07:00
Ryan Huffman	8b3b62aad7	Add UserActivityLogger scripting interface	2016-06-16 10:25:38 -07:00
Bradley Austin Davis	33e9caa636	Simplify overlay conductor, menu interation	2016-06-15 17:24:39 -07:00
David Rowe	657f8fdad5	Fix reporting of JSON export failure	2016-06-15 14:12:49 +12:00
Atlante45	1403fad04e	Add cmd line opt to disable settings reset popup	2016-06-14 16:34:46 -07:00
Atlante45	5560ba9a4c	Quit application when SteamVR requests it	2016-06-14 16:29:50 -07:00
Howard Stearns	213479c530	Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements ... HMD UI re-centering while driving improvements.	2016-06-13 14:28:50 -07:00
Brad Davis	0ddee876c3	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-13 13:03:46 -07:00
Anthony J. Thibault	ab4bef7d55	Fixes based on PR feedback ... * The "Clear Overlay When Driving" avatar preference is obeyed. * sensor reset will also center the ui.	2016-06-13 11:19:47 -07:00
Seth Alves	4c45d081cd	merge from upstream	2016-06-10 19:57:46 -07:00
Stephen Birarda	3c4f336e72	re-instate NodeList reset on limit of check ins reached	2016-06-10 09:11:25 -07:00
Stephen Birarda	12e5851ba4	fix connection denial message, put version back	2016-06-09 15:53:19 -07:00
Stephen Birarda	4b5a554122	remove check in version downgrading from NodeList	2016-06-09 15:53:19 -07:00
Seth Alves	1977efae4f	Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid	2016-06-08 10:36:52 -07:00
Howard Stearns	bf48099286	Merge pull request #8032 from jherico/pin-button ... Add a constant hud toggle button to the UI	2016-06-08 10:33:11 -07:00
Brad Davis	ca6e86e767	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-06-07 21:51:47 -07:00
Brad Davis	29d9f51b58	Adding missed file	2016-06-07 16:46:17 -07:00
Seth Alves	b2f63a2132	hook up can-rez-tmp and can-write-to-asset-server	2016-06-07 16:17:58 -07:00
Atlante45	399517fcbd	Activate Inputs after menus are setup	2016-06-06 13:28:36 -07:00
Atlante45	26acc6fd8b	Typo	2016-06-06 13:28:36 -07:00
Atlante45	24bbb8db3f	Remove input plugin menu dependency	2016-06-06 13:28:36 -07:00
Atlante45	ee62a211ac	Remove "Input Devices" menu	2016-06-06 13:28:36 -07:00
Atlante45	992fa63932	Allow ordered list of preferred plugins	2016-06-06 13:28:36 -07:00
Atlante45	932838b1e3	Setup preferred display plugin	2016-06-06 13:28:36 -07:00
Atlante45	d8493f960a	Add command line option to enable/disable plugins	2016-06-06 13:28:36 -07:00
Brad Davis	b7d1659852	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub	c85923c69b	Merge pull request #7956 from jherico/web_entity_crash ... fix crash on click on non-visible web-entity	2016-06-03 10:29:55 -07:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Brad Davis	bf734395e5	More invisible web entity fixes	2016-06-02 16:37:45 -07:00
Brad Davis	ac5912df01	Fix crash on shutdown of SteamVR	2016-05-27 13:40:47 -07:00
Brad Hefta-Gaub	fb9f6185db	CR feedback	2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub	183f38e4f0	pop up warning if domain over capacity	2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub	2eef07e414	cleanup and dead code removal	2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub	12a1857280	check point with protocol refusal working	2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub	1cf8236860	Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck	2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub	1d9981e624	first cut at support for verifying all protocol version compatibility	2016-05-24 13:31:19 -07:00
Zach Pomerantz	7dabce9cff	Check throttle before idling/painting	2016-05-23 19:04:35 -07:00
Brad Hefta-Gaub	ac49feda22	Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS ... Conflicts: libraries/entities/src/EntityEditPacketSender.h	2016-05-21 09:23:45 -07:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Davis	07562f72af	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub	770fab956f	remove dead code	2016-05-20 12:23:06 -07:00
Zach Pomerantz	2026226fe2	Handle vsync without halving fps	2016-05-20 09:04:39 -07:00
Seth Alves	1de9598243	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 16:37:40 -07:00
Zach Pomerantz	9a4b30a50b	Fix AvatarInputs phantom movement	2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub	cef4a49c35	Merge pull request #7867 from huffman/fix/query-octree-crash ... Fix crash in JurisdictionMap	2016-05-19 11:53:54 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Ryan Huffman	ce6ae40432	Replace foreach use with for()	2016-05-18 15:38:54 -07:00
Ryan Huffman	dd093e3fcd	Make AccountManager a DependencyManager singleton	2016-05-18 15:38:54 -07:00
Ryan Huffman	cf49c8e2bf	Add getUserAgent function that includes plugin information	2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub	4df4829280	Merge pull request #7902 from jherico/gpu_breakup ... moving GL backend out of GPU	2016-05-18 11:35:35 -07:00
Seth Alves	3380b2a668	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-17 19:10:33 -07:00
Ryan Huffman	47d897f669	Fix processOctreeStats recreating JurisdictionMap for every stat packet	2016-05-17 15:12:14 -07:00
Ryan Huffman	ef6d758e7f	Fix JurisdictionMap multithreading issues ... Make octal code pointers use shared_ptr, add locks around access.	2016-05-17 10:59:51 -07:00
Brad Davis	34e574c148	Merge pull request #7816 from zzmp/perf/idle-event ... Drive render loop from DisplayPlugin instead of busy wait	2016-05-17 09:36:09 -07:00
Brad Davis	5ba8372c21	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
Brad Hefta-Gaub	166fbdece5	Merge pull request #7853 from zzmp/fix/shutdown ... Fix hang on exit from dying scripts	2016-05-16 10:17:34 -07:00
Seth Alves	3876a8037c	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-16 09:51:20 -07:00
Brad Hefta-Gaub	0d5fdbdb6e	Merge pull request #7879 from howard-stearns/fix-reticle-offset ... fix reticle position offset	2016-05-13 17:17:23 -07:00
Zach Pomerantz	65e81077cb	Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event	2016-05-13 16:24:42 -07:00
Zach Pomerantz	59e4b9c356	Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown	2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub	65aae42714	move firstRun.set() to correct place	2016-05-13 13:28:02 -07:00
howard-stearns	40f7212b1e	Make uses of getReticlePosition consistent with respect to window offset.	2016-05-12 16:37:03 -07:00
Seth Alves	fcd2e45d67	merge from upstream	2016-05-11 18:45:32 -07:00
Zach Pomerantz	25deaf5bda	Repost missed Presents with low priority	2016-05-11 18:27:48 -07:00
Anthony Thibault	8fecb51dde	Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw ... Eye tracking bug fix and debug rendering improvements	2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub	d656f61c64	Merge pull request #7759 from jherico/app_plugin_type ... Don't expose raw pointer to the display plugin	2016-05-11 14:49:22 -07:00
Brad Hefta-Gaub	e01681eb52	Merge pull request #7856 from ZappoMan/NUEtweaks ... don't show help or login on first run	2016-05-11 10:53:09 -07:00
Zach Pomerantz	2d4fd783bd	Rename Paint/Idle events to Present	2016-05-10 16:09:04 -07:00
Brad Hefta-Gaub	a17acc6f6b	rename functions	2016-05-10 15:52:07 -07:00
Anthony J. Thibault	80a349c65b	Merge branch 'master' into tony/improved-avatar-debug-draw	2016-05-10 14:50:13 -07:00
Zach Pomerantz	4711c23d9d	Delay AvatarInputs instantiation to first paint	2016-05-10 14:39:23 -07:00
Zach Pomerantz	783be53125	Trigger Idle from present Paint	2016-05-10 14:39:23 -07:00
Zach Pomerantz	c3f41cdd89	Add PAINT_DELAY_DEBUG log	2016-05-10 14:39:23 -07:00
Seth Alves	f90b9ec65d	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub	350743454b	Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 ... use smart pointers for entity simulations	2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub	33c5cb519a	cleanup firstRun with a common setting	2016-05-10 11:32:29 -07:00
Clément Brisset	c3ce463b6c	Merge pull request #7854 from zzmp/refactor/delayLoad ... Clean up resource cache's encapsulation of asynchronous loading	2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub	22f4beab1a	on first run, go to home or entry	2016-05-10 10:45:57 -07:00
Seth Alves	4c1f815870	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub	d7eee98acc	Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum ... resurrection of threadsafe ViewFrustum	2016-05-10 09:06:38 -07:00