5259 commits

Author	SHA1	Message	Date
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
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