45817 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	6a076bcee4	PRoviding a fix for the macOS build	2016-08-19 11:09:12 -07:00
samcake	a4945fe45c	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-08-19 10:00:40 -07:00
Chris Collins	a9fbc4ec2c	Merge pull request #8448 from huffman/feat/domain-specify-backup-location ... Add backup directory setting to domain server	2016-08-18 16:45:50 -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
Brad Davis	37192e8251	Merge pull request #8472 from zzmp/fix/buffer-debug-flood ... fix log flood in debug mode from Buffer::Iterator (c)end access	2016-08-18 12:06:45 -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
Zach Pomerantz	813fefd599	reimplement buffer get for (c)end	2016-08-18 11:26:25 -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
samcake	b5296410c3	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-08-18 10:20:33 -07:00
James B. Pollack	54a5bf3b23	Merge pull request #8465 from sethalves/fix-3d-overlay-lines ... fix -- make 3d-line overlays work again	2016-08-18 09:06:26 -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
Brad Davis	89df5768f3	Merge pull request #8435 from imgntn/touch_grip ... Map oculus touch grip to trigger	2016-08-17 16:38:58 -07:00
Clément Brisset	8b54c92494	Merge pull request #8459 from ctrlaltdavid/21032 ... QA READY: Fix Asset Browser dialog	2016-08-17 15:37:43 -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
David Rowe	9fa4a20e55	Fix Asset Browser dialog	2016-08-18 09:37:26 +12:00
Brad Hefta-Gaub	87964c89da	Merge pull request #8453 from huffman/feat/sandbox-logs-button ... Add a button to the sandbox log window to open the log directory	2016-08-17 10:47:04 -07:00
Ryan Huffman	8ba105d1e4	Fix open-log-dir button handler	2016-08-17 09:36:42 -07:00
Ryan Huffman	0e259dcd29	Add open log dir button to server-console	2016-08-17 09:29:45 -07:00
Brad Hefta-Gaub	f66b36ff07	Merge pull request #8441 from imgntn/marketplace_spawn_location ... Better create locations for Entities	2016-08-17 09:09:00 -07:00
Brad Hefta-Gaub	1ad1c48adc	Merge pull request #8414 from jherico/logging_fix ... Categorize some debug logging in FBX parsing	2016-08-17 09:07:27 -07:00
Brad Hefta-Gaub	cd28df6c2e	Merge pull request #8446 from sethalves/local-velocity-for-scripts ... Local velocity for scripts	2016-08-17 09:06:54 -07:00
Brad Hefta-Gaub	f16cbbe270	Merge pull request #8445 from huffman/fix/procedural-entity-render ... Fix transparency on procedural shapes	2016-08-17 09:04:31 -07:00
James B. Pollack	0810ad0e7b	use square of sides	2016-08-16 18:13:42 -07:00
James B. Pollack	e9c2a1d509	cleanup prints	2016-08-16 18:03:34 -07:00
James B. Pollack	06787029b7	small	2016-08-16 17:58:35 -07:00
Ryan Huffman	727d59ab27	Add backup directory setting to domain server	2016-08-16 17:33:32 -07:00
Seth Alves	f5f88fbacc	Merge branch 'master' of github.com:highfidelity/hifi into local-velocity-for-scripts	2016-08-16 16:47:27 -07:00
Seth Alves	7bc1235c54	local velocity and angular velocity in scripts is now handled the way local position and rotation are	2016-08-16 16:47:13 -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
Ryan Huffman	dae8461773	Fix transparency on procedural shapes	2016-08-16 15:42:17 -07:00
Chris Collins	b80828d262	Merge pull request #8442 from sethalves/grab-adjustments ... don't show equip sphere until hand is in position to equip. widen unequip/drop cone	2016-08-16 14:59:28 -07:00
Zach Pomerantz	d6d9871a96	unused var nits	2016-08-16 14:36:54 -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
Seth Alves	c85e8d0580	don't show equip sphere until hand is in position to equip. widen unequip/drop cone	2016-08-16 11:18:12 -07:00
James B. Pollack	1632f4cb3d	better create locations	2016-08-16 10:52:05 -07:00
James B. Pollack	5a2c7cf58e	cleanup	2016-08-16 09:58:18 -07:00
Chris Collins	2ec54c4fd7	Merge pull request #8439 from huffman/fix/transparent-against-procedural-skybox ... Fix transparent items not being rendered correctly against procedural skybox	2016-08-16 09:19:51 -07:00
Ryan Huffman	1d2ea3be03	Fix transparent items not being rendered correctly against procedural skybox	2016-08-15 16:35:25 -07:00
Brad Davis	8fdecc6e56	Merge pull request #8438 from zzmp/fix/amd-cubemap ... fix cubemaps on AMD cards running GL 4.5	2016-08-15 16:06:32 -07:00
Zach Pomerantz	af915c7923	replace cube tex DSA transfer with EXT	2016-08-15 15:31:04 -07:00
James B. Pollack	b4943a4c4b	Merge pull request #8437 from huffman/fix/assets-example ... Fix assets example not using correct API	2016-08-15 15:27:39 -07:00
James B. Pollack	f143c62e9c	whoops	2016-08-15 11:53:32 -07:00
James B. Pollack	a078b20f9d	make it work with click	2016-08-15 10:24:24 -07:00
James B. Pollack	493adca04f	map oculus grip to trigger	2016-08-15 10:02:53 -07:00
samcake	8d12a23efb	Merge pull request #8325 from jherico/deferred_batches_threaded ... Threaded rendering	2016-08-15 09:59:44 -07:00
James B. Pollack	8c7f89ce44	Merge pull request #8425 from imgntn/pistol_sensitivity ... Adjust pistol sensitivity	2016-08-15 09:50:34 -07:00
Ryan Huffman	9773c58da6	Fix assets example not using correct API	2016-08-15 09:28:26 -07:00
Ryan Huffman	b5e2913eb9	Move node received bandwidth tracking to LimitedNodeList	2016-08-15 09:23:02 -07:00