16801 commits

Author	SHA1	Message	Date
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
Anthony J. Thibault	38ac6fff03	Hand Controller rendering is camera relative ... Basically, when using the third person camera in HMD mode. If the controllers are shown. They should be shown in front of the users camera, not in front of the users avatar. To accomplish this, two new faux joint indices are introduced. CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX. These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network). They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call. These new indices are now used by the controllerDisplay.js for the hand controller rendering. They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.	2016-11-17 11:33:12 -08:00
Ryan Huffman	c6b64081fc	Add Overlays jsdocs	2016-11-16 12:01:05 -08:00
Ryan Huffman	7e9df928f4	Add jsdoc comments to Menu	2016-11-16 10:49:50 -08:00
Brad Hefta-Gaub	84573d373b	Merge pull request #9070 from huffman/fix/docs ... Add jsdoc to Camera	2016-11-15 13:46:16 -08:00
Andrew Meadows	d749697c46	scan bottom points during hover-HMD-drive	2016-11-15 12:05:44 -08:00
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13:00
Andrew Meadows	a04b7ae297	fix hover-drive in HMD	2016-11-15 11:45:09 -08:00
Andrew Meadows	6bb3dd6830	Merge hifi/master into hifi/out-of-body-experience	2016-11-14 15:08:04 -08:00
Andrew Meadows	5f0761598e	Merge pull request #8926 from AndrewMeadows/drive-hmd2 ... improved driving for HMD	2016-11-14 14:40:19 -08:00
Ryan Huffman	3fcc2d3fa5	Add jsdoc to Clipboard	2016-11-14 13:52:16 -08:00
Ryan Huffman	7e2bb0e5ed	Cleanup camera docs	2016-11-14 13:51:51 -08:00
Ryan Huffman	ec86b82079	Add jsdoc to Camera	2016-11-14 12:14:24 -08:00
Chris Collins	0876dbc809	Merge pull request #9050 from sethalves/last-edited-by ... lastEditedBy property for entities	2016-11-11 16:02:18 -08:00
Chris Collins	b9b90cc646	Merge pull request #9047 from jherico/stutter ... Add stutter tracking	2016-11-11 11:39:00 -08:00
Seth Alves	15c247fc5e	quiet warnings	2016-11-11 06:37:22 -08:00
Seth Alves	5629db9109	Merge pull request #9049 from birarda/max-min-av-scale ... add a min/max avatar scale in domain-server settings	2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub	6db3556dc5	Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd ... Disable viewpoint menus in hmd	2016-11-10 17:52:50 -08:00
Stephen Birarda	020942c826	better handling for a flipped min/max scale	2016-11-10 16:50:36 -08:00
Stephen Birarda	88c63332de	protect flipped min/max scale in avatar mixer settings	2016-11-10 16:21:48 -08:00
Brad Davis	16060d50af	Merge pull request #9041 from jherico/disable_incremental ... Remove incremental texture transfers	2016-11-10 15:43:20 -08:00
Stephen Birarda	272d0c845e	add clarifying comments about target scale changes	2016-11-10 15:25:15 -08:00
Stephen Birarda	d5722c1654	fix clamping of scale and DRY it up	2016-11-10 15:03:13 -08:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
Stephen Birarda	53769f4edf	change scale for avatar if domain limited scale changes	2016-11-10 14:58:04 -08:00
Stephen Birarda	9fdde49d14	clamp target scale changes on both ends	2016-11-10 14:54:42 -08:00
Stephen Birarda	6f442a74b1	request settings from agents and debug results	2016-11-10 14:43:15 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Brad Davis	c7d68aa9cf	Add stutter stat logging	2016-11-10 13:15:35 -08:00
Brad Davis	90f55f0cd5	Add stutter tracking	2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub	ff559aa4a1	Merge pull request #9042 from hyperlogic/feature/jsdoc ... Generate JS documentation from comments in C++ source	2016-11-10 10:17:39 -08:00
Brad Davis	db98a742b6	Remove incremental transfers	2016-11-10 08:35:35 -08:00
David Rowe	84795439ea	Display Clara.io download information	2016-11-10 16:29:48 +13:00
Anthony J. Thibault	839b1a3c5e	Added some jsdoc comments to the C++ source	2016-11-09 18:09:10 -08:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
samcake	f5fd4bf8d1	Merge pull request #9014 from jherico/texture_derez ... Re-enable downsampling for non-sparse textures	2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub	770bf35d2b	CR feedback	2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub	cf3d1011f4	remove scripts from avatar attached entities for other avatars	2016-11-09 12:26:57 -08:00
Brad Davis	192c72ff99	Update menu, initial state for texture management	2016-11-09 12:09:25 -08:00
Howard Stearns	666d2dd2fc	Merge pull request #9031 from davidkelly/dk/2178 ... Log snapshot upload and user story creation errors	2016-11-08 12:11:16 -08:00
David Kelly	1766ebab2c	Added a bit more logging	2016-11-08 09:08:34 -08: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 Kelly	3105299670	Log snapshot upload and user story creation errors ... Plus, if the body of the error is empty, put something in there so the script will not think it was successful.	2016-11-07 18:13:10 -08:00
David Rowe	76de7bf03c	Fix typo	2016-11-08 13:53:37 +13: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
samcake	449add6b34	Fix bad variable initialization	2016-11-04 13:29:27 -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	3db1831841	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2016-11-04 09:59:28 -07:00
samcake	7655f906f1	Starting adding a timer for the frame	2016-11-03 19:26:30 -07:00
Brad Hefta-Gaub	7cca8f0a66	Merge pull request #8993 from samcake/blue ... Prevent sparse texture on AMD gpus for now	2016-11-03 16:48:52 -07:00
samcake	1086585559	fixing the test to actually capture ati correctly and add the report to the ui	2016-11-03 15:15:05 -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
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
howard-stearns	b6e440f891	delete this and formatting	2016-11-03 13:26:50 -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	e9e1d0cb2f	Remove erroneous exclamation mark	2016-11-03 11:10:32 -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
howard-stearns	52cc03c5a2	Get snapshot location data from file, which now uses shareable place info.	2016-11-01 14:44:39 -07: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	3ad748cfe2	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 16:41:39 -07:00
Zach Pomerantz	be23668ca8	delete websurfaces on shutdown	2016-10-28 14:29:52 -07: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	e9db8be435	Fix linux build	2016-10-27 16:51:52 -07:00
Brad Davis	018d945b85	Display warning overlay instead of scene when below min spec	2016-10-27 15:51:26 -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
Chris Collins	ab8e5759b0	Merge pull request #8929 from ZappoMan/addAudioStatsToMenu ... add a menu item to run audio stats script	2016-10-27 10:43:20 -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
Brad Hefta-Gaub	76344f3253	add a menu item to run audio stats script	2016-10-26 22:41:56 -07:00
Andrew Meadows	5e273664db	improved ray tests for HMD driving	2016-10-26 17:28:35 -07:00
Andrew Meadows	38e4ac0ae9	Merge master into out-of-body-experience	2016-10-26 16:59:31 -07:00
Brad Davis	1c89fa2291	Make threaded submit in OpenVR controllable from menu	2016-10-26 15:28:42 -07:00
Atlante45	f26ddc6f8b	Add getter for SteamVR's buildID to SteamClient	2016-10-26 14:51:48 -07:00
Brad Hefta-Gaub	e464858c4c	use SteamClient::isRunning() instead of command line param	2016-10-26 14:08:18 -07:00
Brad Hefta-Gaub	5f2b4c2a7f	CR feedback	2016-10-26 13:27:11 -07:00
Brad Hefta-Gaub	f95a731249	add app property when the app was launched from steam	2016-10-26 13:22:03 -07:00
Chris Collins	d25a4fb1cb	Merge pull request #8910 from zzmp/fix/qml-audio-shutdown-order ... fix shutdown order of qml/audio	2016-10-26 11:37:54 -07:00
Brad Davis	ce627eeea1	Updated metrics	2016-10-25 17:49:51 -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
Brad Hefta-Gaub	001cfc7e15	Merge pull request #8901 from samcake/blue ... Adding more detailed counters for texture memory consumption	2016-10-25 16:19: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
samcake	507d3e5a39	IMprove the counting and namoing of the new couters the gl swapchain	2016-10-25 12:28:07 -07:00
Brad Hefta-Gaub	1bbf0179dd	Merge pull request #8894 from ZappoMan/xboxLasers ... Adds support for "lasers" to the Oculus+xbox controller	2016-10-25 09:18:00 -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
sam	6b2b68e691	trying to add counters for the default FBO	2016-10-25 03:36:23 -07:00
Brad Hefta-Gaub	62f63f32a7	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 20:24:29 -07:00
samcake	58b81e3b0c	Adding counter for the amount of memory used in texture for Framebuffers	2016-10-24 18:34:16 -07:00
Anthony J. Thibault	69bd4ccea2	Show hand controllers when out-of-body for more then 3/4 of a second ... Without the timer, the hands can flicker in and out of visibility when lightly brushing against collision.	2016-10-24 18:16:05 -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 Hefta-Gaub	a25d50387e	gak	2016-10-24 14:47:10 -07:00
Ryan Huffman	e0c109d6ca	Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired	2016-10-24 14:45:41 -07:00
Ryan Huffman	bbf5afeb8d	Remove use of start() w/o param in ConnectionMonitor	2016-10-24 14:35:38 -07:00
Ryan Huffman	5077ec2044	Remove unused indicateDomainConnectionFailure	2016-10-24 14:35:09 -07:00
Ryan Huffman	f3ef0cebed	Update ConnectionMonitor to not show poopup on domain connection refusal	2016-10-24 14:27:28 -07:00
Andrew Meadows	42c6996aee	fix warning about unused variable	2016-10-24 14:05:28 -07:00
Brad Davis	da9eb0433c	Remove workaround for QML HDPI offscreen rendering bug	2016-10-24 11:51:40 -07:00
Ryan Huffman	e7023b3d99	Add ConnectionFaiureDialog qml	2016-10-24 10:52:46 -07:00
Ryan Huffman	5b58e8ae97	Fix ConnectionHandler not handling connected-but-need-auth condition	2016-10-24 10:44:33 -07:00
Ryan Huffman	84bcefc147	Update ConnectionMonitor to increase timeout on startup	2016-10-24 10:28:13 -07:00
Ryan Huffman	32b5c84bec	Update ConnectionMonitor to init at end of startup	2016-10-24 10:27:27 -07:00
Andrew Meadows	8ecc23f62b	HMD drive stops against simple walls	2016-10-24 08:26:44 -07:00
Andrew Meadows	06866957d0	first pass (theoretical) HMD ray-traced step logic	2016-10-24 08:26:44 -07:00
Andrew Meadows	66479808ba	cleanup velocity calculation in HMD mode	2016-10-24 08:26:44 -07:00
Andrew Meadows	51a9a99381	Merge hifi/master into hifi/out-of-body-experience	2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub	0f8967970a	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub	a282d83546	more work on extra lasers	2016-10-24 07:46:04 -07:00
Brad Davis	861b69aa94	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
Brad Davis	62de2af944	Add more GPU stats, make stats easier to read	2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub	ee1f3ac38c	Merge pull request #8881 from jherico/offscreen_texture_memory_stats ... Report offscreen texture memory usage in stats	2016-10-21 19:15:59 -07:00
Ryan Downe Karpf	f5a116fc92	Merge pull request #8880 from hyperlogic/feature/controller-display ... Show hand controllers in away.js	2016-10-21 17:43:52 -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
Anthony J. Thibault	c431c69d60	Merge branch 'master' into feature/controller-display	2016-10-21 13:48:07 -07:00
Andrew Meadows	e44672180a	add Bullet profile info to PerformanceTimer stats	2016-10-21 13:22:22 -07:00
Brad Davis	1bd398ae5e	Report offscreen texture memory usage in stats	2016-10-21 11:31:37 -07:00
Anthony J. Thibault	60f728585a	away.js now shows hand controllers in away mode. ... * controllerDisplayManager is now part of default scripts. * Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers and sendLocalMessage. * removed previous version of controllerDisplayManger from tutorial.	2016-10-21 10:40:39 -07:00
Brad Hefta-Gaub	6279b273fc	Merge pull request #8867 from jherico/offscreen_textures ... Fix offscreen QML texture leak, improve texture sharing for same size surfaces	2016-10-20 17:07:29 -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
Brad Davis	9523660027	Fix offscreen QML texture leak, improve texture sharing for same size surfaces	2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub	8a071f18b3	more work	2016-10-20 11:18:20 -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
Brad Hefta-Gaub	bf732127ca	Merge pull request #8856 from jherico/geometry_ids ... Remove the use of implicit ids in geometry cache	2016-10-20 08:14:49 -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
Brad Hefta-Gaub	aa50f460c3	Merge pull request #8851 from jherico/qml_limit ... Rate limit QML web surfaces	2016-10-19 12:04:47 -07:00
Brad Davis	2705ee7030	Remove the use of implicit ids in geometry cache	2016-10-19 11:18:25 -07:00
Seth Alves	e247f0aa34	Merge pull request #8850 from zzmp/fix/model-attachment-lifetime ... ensure model attachment lifetimes	2016-10-19 09:56:02 -07:00
Andrew Meadows	f414ffaf98	fix crash in MyCharacterController on shutdown	2016-10-18 21:03:02 -07:00
Stephen Birarda	18523558f7	move HFWebEngineProfile back to interface/networking	2016-10-18 20:04:11 -07:00
Brad Davis	61e5e2861e	Rate limit QML web surfaces	2016-10-18 19:29:11 -07:00
Zach Pomerantz	a9bad592f9	ensure model attachment lifetimes	2016-10-18 18:01:18 -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
Andrew Meadows	a4308f08a4	remove debug cruft	2016-10-18 16:50:19 -07:00
Andrew Meadows	6a445a0a98	more correct steepest walkable slope detection	2016-10-18 16:48:33 -07:00
Andrew Meadows	5a04c7ceee	remove tabs in formatting	2016-10-18 13:09:42 -07:00
Stephen Birarda	f8e0d7ad88	move QWebEngine classes to ui library	2016-10-18 12:53:32 -07:00
Andrew Meadows	ecc6cb49ae	more correct hitFraction adjustments	2016-10-18 11:42:31 -07:00
Stephen Birarda	c4cec8eb1e	use desktop profile again, move classes to networking subdir	2016-10-18 10:22:31 -07:00
Stephen Birarda	a45677c2a2	mark intercept override, only add header for HTTPS	2016-10-18 10:03:46 -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
Brad Hefta-Gaub	13e5c31d0d	Merge pull request #8829 from jherico/gpu_leak ... Fix GPU buffer leak in geometry cache / overlays	2016-10-18 01:12:44 -07:00
Chris Collins	a9dd31f59d	Merge pull request #8833 from jherico/gpu_stats ... Add GPU buffer and texture current counts to the main stats display	2016-10-17 21:03:23 -07:00
Andrew Meadows	6f5f6d2493	adding ray shotgun scan for avatar motion ... using the shotgun scan results to deterimine if slope is walkable	2016-10-17 17:58:52 -07:00
Brad Davis	99ed7ac08c	Fix shutdown crash (hopefully)	2016-10-17 17:38:10 -07:00
howard-stearns	7a3c14683e	switchable placeholder for domain-connection failure, currently a modal	2016-10-17 14:50:46 -07:00
Zach Pomerantz	95eb52ad17	bail early when removing entity focus	2016-10-17 14:02:22 -07:00
Brad Davis	1e9c369660	Add GPU buffer and texture current counts to the main stats display	2016-10-17 14:02:14 -07:00
Chris Collins	f1b2dd8b1a	Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory ... check for empty snapshot dir, and default to temp	2016-10-17 13:21:58 -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 Davis	dde79ef3c5	Fix GPU buffer leak in geometry cache / overlays	2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub	d5c87a0db6	CR feedback	2016-10-17 12:02:23 -07:00
Stephen Birarda	edc83f547b	only add token for HFWebEngineProfile if present	2016-10-17 11:34:37 -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
Howard Stearns	baea0f5cb0	create a directory chooser that works in hmd, and use it	2016-10-16 17:27:51 -07:00
Howard Stearns	615325c17f	check for empty snapshot dir, and default to temp	2016-10-16 12:25:32 -07:00
Andrew Meadows	72ad974b3e	improved shape prevents avatar walking up walls	2016-10-15 16:00:02 -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
Brad Hefta-Gaub	0e1b377227	Merge pull request #8785 from jherico/oculus_crash ... Additional plugin debugging, better plugin resource cleanup	2016-10-13 13:54:34 -07:00
Brad Hefta-Gaub	37e58d123e	Merge pull request #8793 from AndrewMeadows/recenter-above-ground2 ... prevent avatar from recentering below ground	2016-10-13 13:50:06 -07:00
Chris Collins	7ec1e05165	Merge pull request #8791 from hyperlogic/bug-fix/avatar-hold-action-deadlock-fix ... Deadlock fix in avatar grab action.	2016-10-13 13:48:28 -07:00
Anthony J. Thibault	f0dba9e766	Prevent crash on exit. ... If you or another user begins to near-grab an object while you exit the application, you might run into this crash. The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's. When it is destroyed, via the Application destructor, it will release these pointers. This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager. However at this point the AvatarManager has already been destroyed, leading to a null dereference. The fix is to check the AvatarManager pointer first.	2016-10-12 16:29:05 -07:00
Andrew Meadows	d54c07ed14	Merge 'master' into 'out-of-body-experience'	2016-10-12 13:35:27 -07:00
Andrew Meadows	867fc3ccbf	prevent avatar from recentering below ground	2016-10-12 13:23:44 -07:00
Anthony J. Thibault	ba4c356d7f	Deadlock fix in avatar grab action. ... Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them. The network thread does this when hold actions from other avatars are received.	2016-10-12 11:05:19 -07:00
Atlante45	d5429e76da	Warnings fixes and cleanup	2016-10-12 10:20:19 -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	ef465d4443	prevent avatar from recentering below ground	2016-10-11 16:37:29 -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
Ryan Huffman	54498a8f3f	Add the ability to ignore invisible entities in findRayIntersection	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
David Rowe	e2e762f9e7	Merge branch 'master' into 21055 ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2016-10-07 11:27:35 +13:00
Ryan Downe Karpf	877d62069e	Merge pull request #8750 from ctrlaltdavid/21066 ... QA READY: Improve address bar address entry	2016-10-06 14:45:25 -07:00
Chris Collins	80ecf88935	Merge pull request #8731 from huffman/feat/interface-run-server ... Add flag to interface to have it start the sandbox server	2016-10-06 09:18:41 -07:00
David Rowe	a347936b68	Fix location not being updated after using back and forwards buttons	2016-10-06 16:47:49 +13:00
Anthony J. Thibault	b0c7564b60	Fix for debug assert in glm::lerp()	2016-10-05 18:06:49 -07:00
Anthony J. Thibault	2fdd5e4368	Build fixes for change in getMyAvatar() from DepenencyManager ... It now returns a smart_ptr, not a raw pointer.	2016-10-05 17:57:48 -07:00
Anthony J. Thibault	cc7a6ada38	Merge branch 'master' into out-of-body-experience	2016-10-05 17:16:39 -07:00
Chris Collins	bc6797fc3a	Merge pull request #8733 from zzmp/fix/audio-channel-swap ... fix intermittent channel swapping	2016-10-05 15:54:25 -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
Zach Pomerantz	afce8c4a45	STEREO_FACTOR -> AudioConstants::STEREO	2016-10-05 13:02:28 -07: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
Clément Brisset	3f64847888	Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures ... Fix model overlay visibility and texture properties	2016-10-05 11:54:11 -07:00
Howard Stearns	32db63e177	Merge pull request #8737 from highfidelity/domain-check ... Domain check	2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub	415b492c8c	Merge pull request #8715 from jherico/offscreen_fences2 ... Support external GL textures with proper fencing	2016-10-05 05:13:06 -07:00
Ryan Huffman	ff8f45d36c	Fix application directory path	2016-10-04 16:47:59 -07:00
Ryan Huffman	224c35d568	Clean up launch server in main.cpp	2016-10-04 16:47:59 -07:00
Ryan Huffman	0aba1d3e54	Fix server arguments causing crash on startup	2016-10-04 16:47:58 -07:00
Ryan Huffman	fe6382d1b6	Update server content path to be relative	2016-10-04 16:47:58 -07:00
Ryan Huffman	392ecb0dae	Update interface to launch server	2016-10-04 16:47:58 -07:00
Ryan Huffman	847a5cc7a1	Remove old texture setting code in ModelOverlay	2016-10-04 16:25:48 -07:00
Ryan Huffman	93d995a5ae	Fix model overlay visible not working	2016-10-04 16:25:40 -07:00
Ryan Huffman	c683c82817	Fix setting textures in model overlays	2016-10-04 16:24:43 -07:00
Anthony J. Thibault	aab974e6ae	Merge branch 'master' into out-of-body-experience	2016-10-04 11:17:52 -07:00
Anthony Thibault	60aff44f33	Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix ... Remove frame lag and jitter from near grabbed physical objects.	2016-10-04 11:14:22 -07:00
Anthony J. Thibault	dcd425a165	Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls	2016-10-04 10:56:44 -07:00
Brad Davis	8c5028158f	Fix crash on destroying web entities and overlays	2016-10-03 18:02:21 -07:00
Brad Davis	ca3572f991	Support external GL textures with proper fencing	2016-10-03 17:09:10 -07:00
Anthony J. Thibault	327fcc970b	Remove frame lag from near grabbed physical objects. ... In the game loop, physics occurs before avatar update. Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when the physics is run on the next update. After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.	2016-10-03 16:01:54 -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
howard-stearns	4fcddfdf2b	Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check	2016-10-03 13:02:32 -07:00
howard-stearns	0809484e33	Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus	2016-10-03 13:01:51 -07: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
Clément Brisset	becee3bba3	Merge pull request #8685 from thoys/ac-fixes ... Assignment Client fixes	2016-09-30 11:05:58 -07:00
David Kelly	621e3fc000	Expose triggerOption to scripts, plus _physicsEnabled ... Now any menu item can be triggered. Plus you can do a Window.isPhysicsEnabled to detect when we are done loading assets and such. Whee!	2016-09-30 09:06:17 -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
Andrew Meadows	d29386c43f	better tracking of avatar gravity setting	2016-09-29 11:14:19 -07:00
Brad Hefta-Gaub	38eccd32a8	add developer menu support to enable/disable dynamic texture management	2016-09-29 10:18:54 -07:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
Anthony J. Thibault	62dc250237	removed DebugDraw calls	2016-09-27 16:48:15 -07: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
Anthony J. Thibault	0a72805874	Tuned transition from idle to back to reduce foot sliding	2016-09-26 10:41:16 -07:00
Anthony J. Thibault	203ff95849	Animation tuning to reduce foot sliding. ... * Navigation walk speed has been reduced * Tuned IdleToWalk timescale and interp time to reduce foot sliding * Tuned fwd, back and lateral characteristicSpeeds to better match the animations. This reduces foot sliding when moving forward and backward. * Reduced rig state machine hysteresis to 1/60th of a second.	2016-09-26 09:59:50 -07:00
Anthony Thibault	10c5da5728	Smooth transition of hands from in-body to out-of-body modes.	2016-09-24 14:28:56 -07:00
Anthony Thibault	27e6c0f872	Added debug draw path trace for left and right feet	2016-09-24 13:01:16 -07:00
Anthony J. Thibault	f4c4b3474b	capsule projection and distance tests now work for non-vertical capsules	2016-09-23 16:55:38 -07:00
Anthony J. Thibault	9567ec11af	Prevent character from walking when pinned against collision. ... This is fixed by using the pre-action velocity from CharacterController, which does not include any motors or follow velocity. This pre-action velocity reflects the actual rigid body velocity after collision constraints are resolved. This should prevent the character f	2016-09-23 15:22:52 -07:00
Chris Collins	be33524990	Merge pull request #8636 from zzmp/clean/audio-config ... strip unused audio settings, hide the rest	2016-09-23 15:08:48 -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
Zach Pomerantz	a9318d052b	Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config	2016-09-23 13:11:52 -07:00
Brad Davis	f33d3a3b36	Migrate logging functionality to shared library	2016-09-23 12:04:58 -07:00
Brad Davis	a7f0ba24ed	Dynamic texture memory management	2016-09-23 12:04:42 -07:00
Anthony J. Thibault	b68dbab994	Fix for incorrect hand offset when backing into collision. ... We know properly account for the offset of the head due to clamping from a small maxHipsOffset. This means the hands should look more natural when you are out-of-body and are moving your hand controllers.	2016-09-23 11:47:44 -07:00
Anthony J. Thibault	98ffea2fb9	Merge branch 'master' into out-of-body-experience	2016-09-22 18:08:23 -07:00
Andrew Meadows	06ff984f90	sky-hook for walking up steps	2016-09-22 09:48:59 -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	e2ff738fc3	strip unused audio settings ... - remove parameters on the jitter buffer algorithm, these are now static - remove parameters on the output starve detection algorithm, now static - move interface audio settings to the Developer menu	2016-09-21 17:35:27 -07:00
Zach Pomerantz	9e2ec27b29	always play audio injectors locally	2016-09-21 17:20:51 -07:00
Ken Cooke	b14f43b11e	Merge pull request #8610 from zzmp/test/audio-jitter ... add audio jitter simulator testing tool	2016-09-21 16:43:36 -07:00
Anthony J. Thibault	1f7dc25f12	MyAvatar.addThrust() works again.	2016-09-21 11:48:54 -07:00
Anthony J. Thibault	4c99848f29	disable vertical re-centering behavior	2016-09-20 17:05:01 -07:00
Anthony J. Thibault	4afd60f22a	Flying behavior now works again	2016-09-20 16:01:39 -07:00
Seth Alves	2468b56079	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-20 13:28:20 -07:00
Andrew Meadows	7258835f3f	restore orientation from physics to Avatar	2016-09-20 09:14:11 -07:00
Andrew Meadows	59e6ca8f8d	avatar follows HMD using velocity motor	2016-09-20 08:29:55 -07:00
Andrew Meadows	8dd5c9b92b	fix kinematic motion for ground and hover	2016-09-20 08:29:55 -07:00
Andrew Meadows	80b970f2d9	adding MyAvatar::_canonicalScale, but not used yet	2016-09-20 08:29:55 -07:00
Andrew Meadows	e6d40e6e4d	Merge pull request #8625 from hyperlogic/bug-fix/oobe-desktop-motor-fix ... Fixed motor velocity	2016-09-19 17:04:54 -07:00
Anthony J. Thibault	6f0acb3826	Fixed motor velocity in HMD mode	2016-09-19 16:56:36 -07:00
Anthony J. Thibault	a028d3ba58	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.	2016-09-19 15:03:46 -07:00
Brad Hefta-Gaub	fd474f6319	add basic support for master vs stable builds	2016-09-19 14:14:32 -07:00
Chris Collins	3d9f231543	Merge pull request #8609 from zzmp/fix/audio-stats ... fix audio network stats	2016-09-19 09:08:35 -07:00
Andrew Meadows	c77f6a7c16	Merge pull request #8614 from hyperlogic/out-of-body-experience ... Turn and drive the HMD with linear velocity	2016-09-16 15:43:29 -07:00
Andrew Meadows	20418d5f58	fix hips sweep test	2016-09-15 18:39:57 -07:00
Zach Pomerantz	bbbe070af1	bring audio network latencies to standard	2016-09-15 18:19:58 -07:00
Zach Pomerantz	5b03d3e13d	render audio network stats immediately	2016-09-15 18:19:57 -07:00
Zach Pomerantz	177466e4c7	calculate unplayed ms on all streams/buffers as max	2016-09-15 17:54:41 -07:00
Anthony J. Thibault	c7caf9fe06	Turn and drive the HMD with linear velocity	2016-09-15 17:08:36 -07:00
Andrew Meadows	83157b573a	measure max hips offset and clamp it in IK	2016-09-15 14:55:04 -07:00
Zach Pomerantz	53f5899a69	add audio jitter simulator	2016-09-15 14:51:39 -07:00
Anthony J. Thibault	d51898f60d	Merge branch 'out-of-body-experience' of github.com:highfidelity/hifi into out-of-body-experience	2016-09-15 14:23:38 -07:00
Zach Pomerantz	9792d025fa	clean up audio stats	2016-09-15 13:09:06 -07:00
Seth Alves	d67701f7bb	new logging category for deadlock debug prints	2016-09-15 13:02:18 -07:00
Andrew Meadows	821570fa76	fix Windows build and minor format/namechange	2016-09-15 09:32:03 -07:00
Seth Alves	4470338663	catagorize some qDebugs	2016-09-14 21:39:45 -07:00
Andrew Meadows	f5c5c68937	adding kinematic character controller demo	2016-09-14 11:43:52 -07:00
Seth Alves	59db640cb5	add explaining comment	2016-09-14 11:33:03 -07:00
Seth Alves	8734661a0e	add explaining comment	2016-09-14 11:28:22 -07:00
Seth Alves	e5e9bb0052	Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments	2016-09-14 11:28:10 -07:00
Seth Alves	e6a1c14de6	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-14 09:43:19 -07:00
Ryan Huffman	e506491026	Remove blank lines	2016-09-13 16:35:13 -07:00
Ryan Huffman	23450e929b	Add special avatar id for attaching overlays	2016-09-13 16:33:58 -07:00
Anthony J. Thibault	bc130eaf26	ramp support with comfort mode option	2016-09-13 16:26:10 -07:00
Anthony J. Thibault	0fde3a2d76	Fix for TRUNCATE_IK_CAPSULE globals	2016-09-13 10:26:38 -07:00
Anthony J. Thibault	362e185098	Revert "When out-of-body have your avatar face toward your HMD." ... This reverts commit ffb1bae1f0.	2016-09-13 09:54:19 -07:00
Andrew Meadows	954d690b8a	expose setting avatar collisionless	2016-09-12 16:24:08 -07:00
Anthony J. Thibault	ffb1bae1f0	When out-of-body have your avatar face toward your HMD.	2016-09-12 16:20:13 -07:00
David Rowe	fe8b3b4d0d	Merge branch 'master' into 21040	2016-09-13 09:12:47 +12:00
Anthony J. Thibault	baee5180c1	Moved outOfBody detection into MyAvatar::FollowHelper ... in preparation for different follow behavior for in-body and out-of-body.	2016-09-12 11:52:27 -07:00
Anthony J. Thibault	5e0c2286ec	Use OUTOFBODY_HACK as searchable token	2016-09-12 10:58:06 -07:00
Seth Alves	51fe9b2a80	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-12 09:59:19 -07:00
Howard Stearns	b949c83a05	remove jpg error popup behavior	2016-09-10 11:18:14 -07:00
Anthony J. Thibault	86351ca21c	Teleport bugs ... * made HMD.setPosition thread safe * changed script to use HMD.position = foo;	2016-09-09 17:32:02 -07:00
Andrew Meadows	97623f489c	expose setting HMD sensorToWorld from JS script	2016-09-09 16:32:57 -07:00
Andrew Meadows	0f248c4540	expose MyAvatar::setSensorToWorldMatrix()	2016-09-09 16:31:36 -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
Anthony J. Thibault	7e7803c648	Added developer option to draw IK targets in world.	2016-09-09 12:50:34 -07:00
Brad Hefta-Gaub	dbf29ba79d	Merge pull request #8569 from jherico/gli ... Stuttering: Upgrade GLM & add GLI integration	2016-09-09 12:11:08 -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 Hefta-Gaub	fddbeb6d11	Merge pull request #8588 from zzmp/test/audio-jitter ... add a test for audio jitter in DEV/PR builds	2016-09-09 10:17:34 -07:00
David Rowe	ce58edc4e0	Add frustum property to JavaScript Camera object	2016-09-09 18:56:05 +12:00
Brad Davis	bc6b43b7be	Add debug option to lower texture resolution	2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub	b56ad737d4	Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation ... Web Entities Virtual Keyboard + Event Bridge support	2016-09-08 18:36:46 -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
Zach Pomerantz	e785c0cdf8	add test for audio jitter	2016-09-08 17:50:11 -07:00
Andrew Meadows	bc56df0be1	out-of-body with reduced recovery speeds	2016-09-08 14:31:31 -07:00
Seth Alves	624cc655dd	disable code that backs-up in time to pick release velocity	2016-09-07 13:24:53 -07:00
Anthony J. Thibault	dc0d0c2d5c	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-07 09:49:55 -07:00
SamGondelman	99176588cc	remove old webwindowclass that relied on qwebkit	2016-09-06 17:36:59 -07:00
SamGondelman	716647037e	removed unused code	2016-09-06 17:36:54 -07:00
SamGondelman	9d447d4dcc	enabled qnetworkrequest redirects everywhere I could find them	2016-09-06 17:35:06 -07:00
Brad Davis	20deae3242	Working on Qt 5.6 compatibility	2016-09-06 17:35:04 -07:00
Atlante45	eb007b24cd	Use invalid port to signal no value passed	2016-09-06 11:59:07 -07:00
Atlante45	9f07511fd8	Move setter to LimitedNodeList	2016-09-06 10:18:42 -07:00
Atlante45	fcf44911a3	Fix Windows warning	2016-09-06 10:18:42 -07:00
Atlante45	a8de6f0a57	Add settings to change local port	2016-09-06 10:18:42 -07:00
Seth Alves	37db1cba26	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-06 09:38:44 -07:00
Anthony J. Thibault	9122a33fff	only raise the webEntity virtual keyboard in HMD mode	2016-09-02 16:53:40 -07:00
Seth Alves	342f7edff3	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-02 16:12:41 -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
Seth Alves	25f6e1d79d	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub	b3e5e21f40	Merge pull request #8559 from birarda/android-interface ... create a foundation for interface target compile on android	2016-09-01 13:10:45 -07:00
Seth Alves	1a9f43cb67	fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled	2016-09-01 12:17:34 -07:00
Seth Alves	dc31525794	remove some left-over code	2016-08-31 16:39:57 -07:00
Seth Alves	280b603747	remove some leftover code	2016-08-31 16:30:51 -07:00
Seth Alves	74dc2ce493	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 16:26:21 -07:00
Chris Collins	02afa460ff	Merge pull request #8557 from jherico/location_bar ... Don't show address bar when starting up in a connected state	2016-08-31 16:03:37 -07:00
Brad Davis	b9a97712d5	Don't show address bar when starting up in a connected state	2016-08-31 15:17:57 -07:00
Stephen Birarda	feef76cbab	add tools, no plugins, add InterfaceActivity	2016-08-31 11:31:07 -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
Seth Alves	cdd08bd38e	more anti-jitter changes	2016-08-30 14:59:30 -07:00
Seth Alves	78f54a7f33	get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away	2016-08-30 14:39:11 -07:00
Seth Alves	5bda94b2ba	use same data as used for drawing show-hand-targets for controller joints in MyAvatar	2016-08-30 12:39:30 -07:00
Seth Alves	2a9ffc1529	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 10:26:14 -07:00
Stephen Birarda	74fac8c7c9	Merge pull request #8512 from birarda/shareable-address ... add shareable address from default name, leverage for steam join/invite	2016-08-30 09:35:24 -07:00
Seth Alves	87fbbd68ae	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-29 17:37:58 -07:00
Brad Hefta-Gaub	f3d157c396	Merge pull request #8500 from jherico/gl_context ... Custom OpenGL context creation	2016-08-29 16:22:21 -07:00
Howard Stearns	a1ae9eebf2	Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning ... Silence address bar log warning	2016-08-29 11:48:43 -07:00
Brad Davis	617633b85c	Moving to custom context creation	2016-08-29 11:21:54 -07:00
howard-stearns	01af8899bf	silence address bar dialog qml warning	2016-08-29 10:47:22 -07:00
Seth Alves	178a68c967	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-29 10:21:07 -07:00
Seth Alves	3fb10d0eea	action for arrow flight, etc	2016-08-28 19:08:13 -07:00
Seth Alves	76b72e32f0	Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers	2016-08-27 09:06:45 -07:00
Brad Davis	587d015c57	Give names to offscreen contexts for easier debugging	2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub	3d6691f3d1	Merge pull request #8527 from zzmp/fix/skybox-default-color ... fix skybox default	2016-08-26 15:14:44 -07:00
Seth Alves	9394a25a1c	remove some anti-jitter code that was doing more harm than good	2016-08-26 12:47:19 -07:00
Seth Alves	9884426ad8	replace debugging aborts with asserts	2016-08-26 06:13:33 -07:00
Seth Alves	174a95a005	do some hokey pokey to avoid jitter of held entities while walking	2016-08-25 18:49:47 -07:00
Seth Alves	3b278adba3	Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers	2016-08-25 17:28:18 -07:00
Brad Hefta-Gaub	10c465f591	Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering ... Improved web entity rendering	2016-08-25 16:49:00 -07:00
Seth Alves	dfae5b64bd	attempt to avoid jitter of held entity while walking	2016-08-25 16:42:40 -07:00
Seth Alves	232917fcf8	when processing AvatarActionHold for another's avatar, use their hand-controller joint information	2016-08-25 16:02:58 -07:00
Seth Alves	7c5b8cb75d	send faux joints to the avatar-mixer	2016-08-25 15:21:29 -07:00
Zach Pomerantz	24162f0f3d	set skybox default color to empty color	2016-08-25 12:37:23 -07:00
Anthony J. Thibault	e82f6a90af	Improved web entity rendering ... * fading now works properly * web browsers are now fully opaque.	2016-08-25 11:04:23 -07:00
Seth Alves	39f52b3682	start on faux avatar joint that represent hand controllers	2016-08-25 10:58:23 -07:00
Andrew Meadows	d7bb555987	make menu wording more correct	2016-08-25 08:53:08 -07:00
Andrew Meadows	25fb7aacad	ShapeManager hands out const shape pointers	2016-08-24 22:26:56 -07:00
Anthony J. Thibault	c2af948e25	Merge branch 'master' into feature/handheld-marketplace	2016-08-24 16:07:04 -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
Howard Stearns	3f30b23b78	Merge pull request #8496 from huffman/fix/address-bar-popup ... Fix address bar being opened when moving between places on same domain	2016-08-23 13:08:31 -07:00
Stephen Birarda	9461ca0cfc	use the facing shareable address for steam location	2016-08-23 11:56:18 -07:00
elisa-lj11	cdc5dde40e	Merge remote-tracking branch 'highfidelity/master' into zip_project	2016-08-23 11:22:43 -07:00
Stephen Birarda	fbe784155e	add a shareable address return to address manager	2016-08-23 11:19:14 -07:00
Anthony J. Thibault	c6ea64926c	Sensor space entity support ... You can do this by parenting an entity to an avatar's -2 joint index. This will mean that the entity will follow the avatar as it moves in the world, but will not follow the avatar's position as it moves in sensor space. Essentially, this gives you the ability to place objects in the user's physical room. WebTablets now are located in this feature and no longer jitter.	2016-08-23 10:13:06 -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
elisa-lj11	2d2cb45c5d	Merge remote-tracking branch 'highfidelity/master' into zip_project	2016-08-22 16:05:16 -07:00
howard-stearns	056b90c662	separate into four files	2016-08-22 15:01:55 -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
howard-stearns	80afc6a3b4	pr review comments	2016-08-22 10:59:21 -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
Ryan Huffman	bd86318611	Fix address bar being opened when moving between places on same domain	2016-08-22 10:36:56 -07:00
Seth Alves	9bcda1bb45	merge from upstream	2016-08-20 15:25:04 -07:00
howard-stearns	a3d64dbd9c	code cleanup	2016-08-19 14:14:31 -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
howard-stearns	4492c4e64e	Allow javascript to safely open the correct login window (or answer that ... it is unneded).	2016-08-18 14:19:36 -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
Chris Collins	140b0c4d02	Merge pull request #8462 from jherico/openvr_random_position_fix ... Address issues with random camera locations	2016-08-18 11:51:47 -07:00
Seth Alves	15ce40ecf4	merge from upstream	2016-08-18 11:46:02 -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
Seth Alves	ccaf7379fc	missed some more due to conditional compilation	2016-08-18 10:31:53 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Seth Alves	8487f825a0	don't return reference to local variables	2016-08-18 08:01:42 -07:00
Seth Alves	2ff35768aa	make 3d-line overlays work again	2016-08-17 18:45: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
Brad Davis	a32ab77b7d	Address issues with random camera locations caused by bad HMD sensor poses	2016-08-17 15:22:30 -07:00
howard-stearns	347b20e506	expose to scripts the ability to show dedicated qml windows such as ... preferences	2016-08-17 09:54:15 -07:00
howard-stearns	2a099d5577	expose to scripts the ability to open the feed	2016-08-17 09:53:26 -07:00
howard-stearns	48ff26eeb7	provide a way to programmatically show the feed (showing address bar in ... feed mode).	2016-08-17 09:50:38 -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	6d7edd38cc	Rename clearViewTransform	2016-08-12 22:28:59 -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	51a6f3552f	Cleanup	2016-08-12 22:28:46 -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	2641c0fd76	Merge pull request #8427 from howard-stearns/pull-from-master ... Pull from master	2016-08-12 14:18:05 -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
Stephen Birarda	c330e005dd	Merge pull request #8426 from Atlante45/steam ... New metaverse web API	2016-08-12 13:32:41 -07:00
Brad Davis	e2f7b443fd	Merge pull request #8339 from sethalves/overlay-children ... 3D Overlays can be children	2016-08-12 12:16:21 -07:00
howard-stearns	df0ceb17e8	send (hi res image) details as a json string	2016-08-12 11:09:22 -07:00
James B. Pollack	7866786da9	Merge pull request #8406 from AlexanderOtavka/script-load ... Disable loading client scripts over ATP	2016-08-12 11:01:14 -07:00
Atlante45	19b3aa9c89	New metaverse web API	2016-08-12 10:42:32 -07:00
Clément Brisset	7c698b8cbb	Merge pull request #8423 from Atlante45/steam ... Update Steam branch	2016-08-12 10:40:53 -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
Seth Alves	c363ca9887	3d-model overlays can now be children	2016-08-11 15:29:09 -07:00
Seth Alves	15e2140cb2	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-11 15:06:58 -07:00
Atlante45	c34153b67b	Change Web API arg name to be more descriptif	2016-08-11 11:57:43 -07:00
Ryan Huffman	b6620f128b	Add asset server bandwidth to stats	2016-08-11 11:06:36 -07:00
David Kelly	f8f99721c3	Minor update to add details ... And, now reflects data-web's slightly updated json structure for returning info on an uploaded snapshot.	2016-08-10 14:25:00 -07:00
Anthony J. Thibault	8dac45c99e	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub	5bd5fc43d3	Merge pull request #8408 from SamGondelman/miniMirrorFade ... Mini mirror fades with overlays	2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	50a4c8b496	mini mirror fades with overlays	2016-08-09 18:02:56 -07:00
Zander Otavka	4e16998b45	Disable loading client scripts over ATP	2016-08-09 17:36:59 -07:00
David Kelly	d4f376879d	PR feedback	2016-08-09 15:05:23 -07:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
David Kelly	18990821df	Added 'path' to user stories, works now. ... yay	2016-08-09 14:15:49 -07:00
David Kelly	8457acd234	First guess on how to deal with place ... Fall back to host when there is no place. Probably better ideas, like specify the name and the type (a place, a domain if no place, etc...) will come soon.	2016-08-09 13:42:48 -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
Atlante45	25b60d0c62	CR feedback	2016-08-09 10:07:57 -07:00
Seth Alves	607c168493	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-09 09:01:55 -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	6854f9fda4	Remove stars shaders and renderable	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	51b45f8f73	Steam invite are facing the current position	2016-08-08 15:39:25 -07:00
Atlante45	aa2ae31aab	CR UI fixes	2016-08-08 15:39:25 -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	a13950752b	Update steam location with discoverability	2016-08-08 15:39:25 -07:00
Atlante45	f0ff975248	UI wiring	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
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -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
Seth Alves	38314b180b	Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk	2016-08-08 06:30:18 -07:00
SamGondelman	771e105fa2	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-05 16:52:01 -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	f277a019bf	FileScriptingInterface ... Created new .cpp and .h for the download and unzipping of a model	2016-08-04 16:46:56 -07:00
elisa-lj11	4f33e1502f	starting the zip project	2016-08-04 16:46:56 -07:00
howard-stearns	fed775ff83	simple snapshot confirmation	2016-08-04 15:52:39 -07:00
Ryan Huffman	d775a92dab	Update implementation of ConnectionMonitor timeout	2016-08-04 14:45:10 -07:00
Ryan Huffman	a37bcdafda	Remove debug logging in ConnectionMonitor	2016-08-04 14:40:41 -07:00
Ryan Huffman	8044910bf2	Add show-address-bar when disconnected from domain	2016-08-04 14:39:53 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -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
SamGondelman	2eb0c7735f	working on fading shape entities	2016-08-03 13:30:05 -07:00
Anthony J. Thibault	75b88b0794	WebEntities now support custom hifi url handling ... WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml. marketplace urls and hifi urls should work properly in web entities.	2016-08-03 10:20:15 -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
Seth Alves	79121133df	remove unneeded change	2016-08-02 12:00:45 -07:00
Seth Alves	528f417f74	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-02 11:55:17 -07:00
Seth Alves	f91df4997d	re-enable falling-back to default avatar if an avatar's url is bad	2016-08-02 11:55:11 -07:00
Seth Alves	75f9626c2d	if MyAvatar simulation is cut short (due to no skeleton), still update the head position	2016-08-02 11:50:53 -07:00
Seth Alves	56af36ae64	set head position of other avatars even if they can't be drawn	2016-08-02 11:29:43 -07:00
Seth Alves	229b8d3b5e	testing a more explicit fix of the audio failure	2016-08-02 10:46:11 -07:00
Seth Alves	ed4b0b3589	call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url.	2016-08-02 09:57:17 -07:00
Anthony J. Thibault	ed7eaebea8	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-02 09:23:18 -07:00
Seth Alves	5a1fe39737	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-01 18:57:32 -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
Seth Alves	b953e6f0ff	when an avatar URL fails, switch to the default	2016-08-01 18:12:30 -07:00
Ryan Huffman	604c8f4a36	Merge pull request #8337 from humbletim/fix-Assets-getMapping ... fix Assets.getMapping(path, callback) to return a value	2016-08-01 13:32:08 -07:00
Seth Alves	28e0ca2e49	when a parent of a 3d overlay is deleted, delete the overlay	2016-08-01 10:55:34 -07:00
Seth Alves	70becfaff1	avoid some unneeded SpatiallyNestable transform-locks	2016-08-01 08:20:24 -07:00
Seth Alves	6f3146f872	oops, position and rotation are local, by this point	2016-08-01 08:00:51 -07:00
Seth Alves	182829e64c	get transform once rather than 3 times	2016-08-01 07:49:57 -07:00
Seth Alves	bddff3341a	angry De Morgan	2016-08-01 07:49:22 -07:00
Seth Alves	627048db84	pull missing location properties from overlay	2016-07-31 16:36:14 -07:00
Seth Alves	e4e86c245e	3d overlays can be children of entities or avatars	2016-07-31 14:11:56 -07:00
Anthony Thibault	cf7450beb7	handControllerGrab and web entity input integration	2016-07-29 17:50:45 -07:00
Anthony Thibault	f71a59276c	Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering ... Fix alpha cut-outs and incorrect gamma on web overlays and entities	2016-07-29 17:44:46 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Brad Hefta-Gaub	e879f22c95	fix behavior with no entity server	2016-07-28 15:15:52 -07:00
Anthony Thibault	ea310bcc43	Web Entities now render correctly as well	2016-07-28 14:11:19 -07:00
Anthony Thibault	be6e401e9a	Merge branch 'master' into bug-fix/web3doverlay-rendering	2016-07-28 11:20:35 -07:00
humbletim	3e0ef7d43a	make Assets.getMapping(path) actually return the mapping	2016-07-28 10:13:30 -04: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
Anthony J. Thibault	fb84f058d6	Fix alpha cut-outs and incorrect gamma on Web3DOverlays	2016-07-25 15:56:05 -07:00
Brad Hefta-Gaub	4f04dbc926	Merge pull request #8308 from jherico/overlay_multi_edit ... Allow atomic editing of multiple overlays from scripts	2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub	41e02276e5	Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override ... Support for animGraphUrl override in FST file.	2016-07-23 13:42:46 -07:00
Brad Davis	121a0f0f5e	Allow atomic editing of multiple overlays from scripts	2016-07-23 11:41:58 -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
Anthony Thibault	2429b82b5e	Support for animGraphUrl override in FST file.	2016-07-21 17:17:08 -07:00
samcake	853f31f6ea	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-20 10:49:27 -07:00
Howard Stearns	0b5cdcef42	Merge pull request #8252 from howard-stearns/suggestions ... suggestions	2016-07-19 15:46:23 -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
Anthony Thibault	897627ebd6	Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes ... Mac OS X fixes	2016-07-19 11:18:46 -07:00
samcake	ff132fa712	Gathering the diffusion passes in the SUrfaceGEometryPAss job	2016-07-19 02:11:22 -07:00
samcake	3638a3b9c3	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-18 23:15:21 -07:00
Anthony J. Thibault	7fd40a5d10	MacOS: fix crash when touchscreen device is nullptr.	2016-07-18 17:08:17 -07:00
howard-stearns	abb63139f6	Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions	2016-07-18 16:29:49 -07:00
Seth Alves	2d73b23c56	when deciding on the release velocity of something thrown, don't include a zero velocity caused by seeing the same controller data as last frame	2016-07-18 14:44:41 -07:00
Zander Otavka	d75c2e2a6f	Merge branch 'master' into edit-model-ui	2016-07-18 13:11:51 -07:00
samcake	a44aee84ce	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-18 10:16:55 -07:00
samcake	744474982d	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-17 13:28:03 -07:00
Brad Davis	03cb6175ab	Support triangle and hexagon shapes, add shape support to overlays.	2016-07-15 22:02:17 -07:00
Howard Stearns	d446e1bcf5	Phone home with suggestions activity usage.	2016-07-15 19:15:58 -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
Sam Gondelman	e24b064ccd	Merge pull request #8244 from BingShearer/logrolling ... Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size	2016-07-15 14:14:44 -07:00
Bing Shearer	9ee64d114b	Sam's space.	2016-07-15 13:47:36 -07:00
Brad Hefta-Gaub	574aaa9f28	Merge pull request #8248 from jherico/edit_toolbar ... Migrate edit.js toolbar to the new toolbar API	2016-07-15 12:42:13 -07:00