46856 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	5b4829e7b6	Brining back support for the ambinet lighting	2016-09-30 16:24:57 -07:00
samcake	337fe155b7	clean up warning and merge with upstream	2016-09-30 11:01:25 -07:00
sam	e143c05ef8	Keep on investigating the shading cost per light	2016-09-30 02:41:21 -07:00
samcake	2a0e67ee2a	REvisiting the full lighting code to optimize the perf	2016-09-29 19:06:26 -07:00
Clément Brisset	b69a49d7bc	Merge pull request #8690 from Atlante45/console ... CR for Backup old content on update	2016-09-29 17:55:29 -07:00
Atlante45	f17a062399	CR	2016-09-29 17:08:34 -07:00
Chris Collins	e165c0515a	Merge pull request #8680 from Atlante45/console ... Backup old content on update	2016-09-29 16:30:58 -07:00
Chris Collins	b3fd9eeb63	Merge pull request #8688 from zzmp/fix/fade-injectors ... fix incorrect repetition with fade for injectors on the mixer	2016-09-29 16:05:02 -07:00
Atlante45	b83243d65d	Fixed CSS madness	2016-09-29 15:49:47 -07:00
Atlante45	165e609851	Update instructions UI	2016-09-29 15:43:11 -07:00
Zach Pomerantz	43c40aa090	avoid repetition with fade on injectors	2016-09-29 15:25:41 -07:00
Chris Collins	01d2d9243a	Merge pull request #8682 from ZappoMan/graphicsSettings ... add developer menu support to enable/disable dynamic texture management	2016-09-29 15:11:43 -07:00
Atlante45	701c710857	Fix windows odd folder name issue	2016-09-29 12:15:48 -07:00
Brad Hefta-Gaub	38eccd32a8	add developer menu support to enable/disable dynamic texture management	2016-09-29 10:18:54 -07:00
Atlante45	4830b5c2a0	Backup old domain.	2016-09-28 19:17:52 -07:00
samcake	bb5493106f	smaller struct descriptions	2016-09-28 18:33:34 -07:00
samcake	b09151f2a2	Rearrange the light struc description in the shader side, needs the c++ to match now	2016-09-28 18:32:35 -07:00
samcake	21b7e9dfe8	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-28 10:04:13 -07:00
samcake	cd9dff57be	back to normal	2016-09-28 10:03:51 -07:00
Brad Davis	f73cd1d65e	Merge branch 'RC-21' back into master ... Conflicts: libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp	2016-09-28 09:58:13 -07:00
Brad Davis	31fb395c27	Add support for disabling incremental texture transfers ... Conflicts: libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp	2016-09-28 09:56:50 -07:00
Brad Hefta-Gaub	aff9999f4b	Merge pull request #8673 from jherico/incremental_disable ... Add support for disabling incremental texture transfers	2016-09-28 09:54:19 -07:00
samcake	81e0266e7e	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-28 09:34:29 -07:00
Brad Davis	7361b9a166	Add support for disabling incremental texture transfers	2016-09-28 09:23:15 -07:00
Brad Hefta-Gaub	ff73fa322e	Merge pull request #8668 from ZappoMan/hacktest ... automatic (runtime) disabling of sparse textures systems with 4 or less cores	2016-09-28 09:13:33 -07:00
samcake	a0862820e6	MOre refinements?	2016-09-27 18:38:15 -07:00
Brad Hefta-Gaub	b5de603921	runtime disabling of sparse textures on less than 4 core systems	2016-09-27 10:32:56 -07:00
samcake	9b94a025fc	Refining the voxelization of the sphere in the view frustum grid	2016-09-26 18:41:53 -07:00
Brad Hefta-Gaub	9363c4dda6	Merge pull request #8666 from sethalves/fix-ac-delete-entity ... fix an AC script's ability to delete entities	2016-09-26 17:35:24 -07:00
Seth Alves	90adb5f67e	fix an AC script's ability to delete entities	2016-09-26 17:14:45 -07:00
Clément Brisset	9ab1830c98	Merge pull request #8662 from Atlante45/home-content-update ... Ask if user want to update home content when available -- RC update PR	2016-09-26 13:27:11 -07:00
Stephen Birarda	43a3a9a7bd	Merge pull request #8656 from Atlante45/home-content-update ... Ask if user want to update home content when available	2016-09-26 13:26:41 -07:00
Zach Pomerantz	84ba3223bb	Merge pull request #8650 from zzmp/fix/reload-qml-with-js ... reload qml with scripts	2016-09-26 11:00:13 -07:00
Brad Davis	ad3355d36d	Merge pull request #8661 from jherico/RC-21 ... Merge from stable into RC-21	2016-09-26 10:54:41 -07:00
Brad Davis	3c9c5331f1	Stable merge	2016-09-26 10:53:48 -07:00
Brad Davis	197c935d75	Merge pull request #8660 from jherico/stable-merge ... Merge from stable into master.	2016-09-26 10:51:02 -07:00
Brad Davis	1a1c8af58a	Merge from stable	2016-09-26 10:50:26 -07:00
Atlante45	f001cf7570	Make constant for home content URL	2016-09-26 10:44:59 -07:00
Atlante45	cb4d526dcf	Ask if user want to update home content when available	2016-09-23 20:18:41 -07:00
Howard Stearns	3f31da68fe	Merge pull request #8638 from howard-stearns/uniform-story-handling ... Uniform story handling	2016-09-23 16:11:41 -07:00
Brad Hefta-Gaub	ee6719f94a	Merge pull request #8652 from zzmp/fix/audio-injector ... fix injector restart fail on lack of local interface	2016-09-23 16:07:16 -07:00
Chris Collins	43690be2d8	Merge pull request #8651 from zzmp/fix/audio-stream-logging ... fix audio stream logging	2016-09-23 15:42:06 -07:00
Zach Pomerantz	912db1c0e1	silence audiostream logging	2016-09-23 15:32:23 -07:00
Chris Collins	5f325f7923	Merge pull request #8629 from sethalves/ice-troubles-1 ... domain-server tells metaverse if it has no ice-server	2016-09-23 15:26:50 -07:00
Chris Collins	5f45e62333	Merge pull request #8649 from ZappoMan/detectTouch ... only activate a touch device if one is connected	2016-09-23 15:12: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	faba165408	fix injector fail on lack of local if ... - consolidate codepaths for new/restarted injections - allow network injection without local injection	2016-09-23 15:03:38 -07:00
Chris Collins	fdb4addf53	Merge pull request #8635 from zzmp/fix/local-audio-injection ... fix missing local audition for audio injectors	2016-09-23 15:01:14 -07:00
Brad Hefta-Gaub	8f96715521	only activate a touch device if one is connected	2016-09-23 14:30:34 -07:00
Zach Pomerantz	aeaae4ccc8	reload qml with scripts	2016-09-23 14:27:47 -07:00