18074 commits

Author	SHA1	Message	Date
Bradley Austin Davis	6ad1008a56	Allow explicit overlay alpha from scripts	2016-06-15 17:24:32 -07:00
Bradley Austin Davis	60035486d3	Build fix	2016-06-15 10:48:48 -07:00
Bradley Austin Davis	0b0977f362	Support keyboard suppresion, control suppresion while in keyboard mode	2016-06-15 10:48:48 -07:00
Bradley Austin Davis	71bf9384ce	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-15 10:45:51 -07:00
Stephen Birarda	59912012c6	clear domain connection refusals on hard reset, not soft	2016-06-15 09:48:53 -07:00
Chris Collins	55330f2205	Merge pull request #8057 from jherico/settings ... Fixing issues with unclosed groups in settings persistence	2016-06-14 14:34:14 -07:00
Chris Collins	0236af8bcd	Merge pull request #8067 from birarda/api-recheck-on-fail ... only signal once on a protocol mismatch with DS	2016-06-14 12:53:21 -07:00
Bradley Austin Davis	b1c472e82b	Fixing settings, even in release builds	2016-06-14 12:16:40 -07:00
Brad Hefta-Gaub	b1de94f39d	Merge pull request #8061 from imgntn/entityaddtypeserrors ... More verbose messaging about incorrect case in entity types	2016-06-14 10:56:58 -07:00
Stephen Birarda	2163f9b5f3	signal once for domain protocol mismatch, case 918	2016-06-14 10:43:45 -07:00
Bradley Austin Davis	d52a1fe6f9	Fix persistence for global scope settings handles, clean up invalid variants in settings	2016-06-14 09:49:38 -07:00
Bradley Austin Davis	34c8d257d2	Fixing issues with unclosed groups in settings persistence	2016-06-14 09:49:38 -07:00
Bradley Austin Davis	f3c47acbb2	Fix offset when UI transform is not identity	2016-06-14 09:49:25 -07:00
Bradley Austin Davis	175dbb8924	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-14 09:48:56 -07:00
Brad Davis	196ab401e5	Merge pull request #8046 from SamGondelman/proceduralRaymarch ... Exposed orientation and eye position to procedural entity shaders	2016-06-14 09:48:07 -07:00
Howard Stearns	d05987de6d	Merge pull request #8042 from jherico/lasers ... First pass prototype of laser rendering in OpenVR plugin	2016-06-13 18:06:15 -07:00
James B. Pollack	1306417c8e	more verbose messaging about incorrect entity types	2016-06-13 17:48:58 -07:00
Bradley Austin Davis	6707f889b8	Fixing laser offset, support laser in Oculus	2016-06-13 17:33:18 -07:00
Bradley Austin Davis	aab42ff841	Merge branch 'settings' into lasers	2016-06-13 15:43:03 -07:00
Bradley Austin Davis	b9bf797753	Fixing issues with unclosed groups in settings persistence	2016-06-13 15:26:48 -07:00
Seth Alves	f8f62a4ff1	remove unused function	2016-06-13 15:10:52 -07:00
Bradley Austin Davis	62051ad297	Working on touch	2016-06-13 14:40:15 -07:00
Howard Stearns	213479c530	Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements ... HMD UI re-centering while driving improvements.	2016-06-13 14:28:50 -07:00
Seth Alves	eba518cb65	try to make code that converts bullet-calculated values to parent-frame values more effecient	2016-06-13 14:26:41 -07:00
Seth Alves	998a5594c0	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-13 13:41:32 -07:00
Chris Collins	b14f9cd312	Merge pull request #8041 from sethalves/fix-avatar-entity-locking ... Fix avatar entity locking	2016-06-13 13:10:32 -07:00
Brad Davis	130c0dda31	PR feedback	2016-06-13 13:04:11 -07:00
Brad Davis	9640727f51	Hand laser rendering support in HMD plugins.	2016-06-13 13:04:11 -07:00
Brad Davis	0ddee876c3	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-13 13:03:46 -07:00
Seth Alves	52245f25f2	rework code that transforms global _server* values into parent-frame values	2016-06-13 11:48:45 -07:00
Seth Alves	99bfc76dd3	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-13 11:14:26 -07:00
Anthony J. Thibault	ccf85c1f7c	Merge branch 'vive-ui' into bug-fix/hmd-ui-center-improvements	2016-06-13 09:48:58 -07:00
Brad Hefta-Gaub	da28b0f3e7	Merge pull request #8048 from ctrlaltdavid/20961 ... fix import of invalid JSON file failing silently	2016-06-12 19:42:53 -07:00
Seth Alves	924c949af5	permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things	2016-06-11 15:16:45 -07:00
Seth Alves	4c45d081cd	merge from upstream	2016-06-10 19:57:46 -07:00
SamGondelman	8a682450a9	still trying to fix cmake errors	2016-06-10 17:01:22 -07:00
Chris Collins	006eb8fe64	Merge pull request #8031 from birarda/api-recheck-on-fail ... re-instate domain API connection info refresh during failure, fix localhost connection after downgrade	2016-06-10 15:26:42 -07:00
SamGondelman	7b21d71180	try to fix cmake error	2016-06-10 14:09:04 -07:00
SamGondelman	53435fc730	removed extra argument	2016-06-10 14:04:33 -07:00
SamGondelman	f32e29ac2d	small changes	2016-06-10 13:46:02 -07:00
SamGondelman	da98ee0916	reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition	2016-06-10 13:42:19 -07:00
Seth Alves	41c399897a	remove some debug prints	2016-06-10 12:08:13 -07:00
Seth Alves	4a49ade21b	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-10 11:50:06 -07:00
Seth Alves	e1ae2a193f	EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server	2016-06-10 11:49:15 -07:00
Brad Davis	472a3540d7	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: scripts/system/controllers/handControllerGrab.js	2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub	fda91677f8	Merge pull request #8049 from kencooke/master ... Use shared CPUDetect.h for CPU detection	2016-06-10 08:25:27 -07:00
Brad Hefta-Gaub	426d67f5bf	Merge pull request #8038 from jherico/pure_virtual ... Attempt to get better logging from pure virtual call crashes	2016-06-10 08:25:10 -07:00
David Rowe	2953ca08cb	Fix import of invalid JSON file failing silently	2016-06-10 12:04:41 +12:00
Ken Cooke	dd0d594524	cleanup	2016-06-09 16:31:09 -07:00
SamGondelman	8cccd5416a	try to fix mac errors	2016-06-09 16:10:27 -07:00