44335 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Howard Stearns	6196c657f8	Minimize triggering distance to HUD.	2016-06-18 14:17:47 -07:00
SamGondelman	c30c2b64b2	first pass at preventing repeated compileShader error prints	2016-06-17 17:49:27 -07:00
Seth Alves	d8a67850f2	treat usernames in permissions-grid on domain-server settings page as case-insensitive	2016-06-17 15:17:51 -07:00
Brad Hefta-Gaub	c297fa7c0e	Merge pull request #8060 from imgntn/usersUpdates ... Hide users.js options when logged out	2016-06-17 14:17:42 -07:00
SamGondelman	caf4a9fa34	got rid of comparison warning	2016-06-17 14:17:32 -07:00
Brad Hefta-Gaub	abd368b69d	Merge pull request #8071 from ctrlaltdavid/20969 ... let user choose an existing file in the file save dialog	2016-06-17 14:14:37 -07:00
Brad Hefta-Gaub	852eda3101	Merge pull request #8066 from imgntn/faceCameraText ... Add face camera option to edit.js text entity properties	2016-06-17 14:14:06 -07:00
Howard Stearns	4aa5e87a26	Merge pull request #8093 from jherico/vive-toolbars ... Support toolbar API	2016-06-17 13:43:16 -07:00
Howard Stearns	aeebe8b3fb	Merge pull request #8094 from howard-stearns/fix-depth-request ... fix depth request	2016-06-17 13:26:07 -07:00
Howard Stearns	e104429fa1	Merge pull request #8096 from hyperlogic/bug-fix/reticle-focus ... Change rendering of reticle when in HMD mode	2016-06-17 13:25:26 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Anthony J. Thibault	e04d86a75a	Change rendering of reticle when in HMD mode ... Properly take the overlay model matrix into account. Reticle depth is now relative to the eye, not relative to the overlay sphere.	2016-06-17 12:10:26 -07:00
SamGondelman	7d602986cd	removed multiple interface instances hack which you should never do anyways because it breaks everything	2016-06-17 12:01:02 -07:00
SamGondelman	5f7e49b087	possible fix, needs testing	2016-06-17 11:50:56 -07:00
howard-stearns	74a3db4e1c	When setting Reticle.depth, don't assume that we're in the center of the ... HUD.	2016-06-17 11:14:56 -07:00
Bradley Austin Davis	5bc8b53d1b	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub	d8d4eb65ec	Merge pull request #8059 from Atlante45/feat/steamworks ... Initial Steamworks integration	2016-06-16 18:49:51 -07:00
Brad Hefta-Gaub	3b132e7376	Merge pull request #8076 from ZappoMan/reduceLogSpam ... don't log spam on empty URL	2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub	99a0804429	Merge pull request #8086 from imgntn/activeElement ... Fix some edit.js errors and log messages	2016-06-16 18:25:20 -07:00
Brad Hefta-Gaub	7d0cd38c8e	Merge pull request #8075 from ctrlaltdavid/20970 ... fix reporting of JSON export failure	2016-06-16 18:24:48 -07:00
Brad Hefta-Gaub	fd163ecc20	Merge pull request #8089 from ctrlaltdavid/20973 ... make audio device selection available without advanced menus enabled	2016-06-16 18:24:36 -07:00
Zach Pomerantz	aca3d4d90b	add example script for metadata from metaverse	2016-06-16 15:22:34 -07:00
David Rowe	77976281ab	Make audio device selection available without advanced menus enabled	2016-06-17 09:58:44 +12:00
Ryan Huffman	c2ebcd1f77	Make activity logging from scripts only available for certain events	2016-06-16 13:49:25 -07:00
Zach Pomerantz	0f9c637c5a	Wireframe a metadata overlay tutorial	2016-06-16 13:27:36 -07:00
Ryan Huffman	bce05df56b	Update enabled_edit to only get sent when you have permission	2016-06-16 13:25:14 -07:00
Ryan Huffman	56c84bbc27	Add opened_marketplace and enabled_edit to edit.js	2016-06-16 13:18:08 -07:00
Ryan Huffman	3650377745	Clean up NULL => nullptr	2016-06-16 13:17:31 -07:00
Ryan Huffman	c7955900ab	Add new user activity events	2016-06-16 13:17:18 -07:00
Brad Hefta-Gaub	d7cd82a24e	Merge pull request #8085 from ZappoMan/fixShaders ... fix v1 procedural shaders	2016-06-16 13:06:15 -07:00
Zach Pomerantz	1ce9e96cba	Send domain metadata for authed domains	2016-06-16 13:00:28 -07:00
James B. Pollack	96d6cb12ac	supress some messages and errors	2016-06-16 12:27:03 -07:00
Howard Stearns	4f6d65a961	Merge pull request #8082 from jherico/explicit_overlay_alpha ... Hand Controller UI Tweaks	2016-06-16 10:35:51 -07:00
Ryan Huffman	8b3b62aad7	Add UserActivityLogger scripting interface	2016-06-16 10:25:38 -07:00
Ryan Huffman	ed88232fb0	Move session id storage to AccountManager	2016-06-16 09:19:42 -07:00
Brad Hefta-Gaub	5dae20975a	fix v1 procedural shaders	2016-06-16 09:18:44 -07:00
SamGondelman	f02ffa92fd	undo debugging	2016-06-15 18:00:08 -07:00
Bradley Austin Davis	067539ff6d	Fix overlay stuck to face	2016-06-15 17:44:58 -07:00
Bradley Austin Davis	33e9caa636	Simplify overlay conductor, menu interation	2016-06-15 17:24:39 -07:00
Bradley Austin Davis	6ad1008a56	Allow explicit overlay alpha from scripts	2016-06-15 17:24:32 -07:00
SamGondelman	59b785a33b	trying to debug	2016-06-15 16:55:34 -07:00
Howard Stearns	faa2624ca7	Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays ... Continue grabbing through overlays	2016-06-15 16:07:01 -07:00
Howard Stearns	0915d1287f	Merge pull request #8079 from howard-stearns/no-laser-without-trigger ... No laser without trigger	2016-06-15 16:06:56 -07:00
Howard Stearns	357b9353dc	Merge pull request #8074 from jherico/lasers ... Vive hand controller updates	2016-06-15 16:06:49 -07:00
Howard Stearns	980eafb972	Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries ... grab script preliminaries	2016-06-15 16:06:06 -07:00
howard-stearns	6f671b7cde	see comment.	2016-06-15 15:17:34 -07:00
Bradley Austin Davis	87dc6649ce	Better track keyboard open state, fix text replacement	2016-06-15 15:16:29 -07:00
howard-stearns	1e3b20b66d	Explicit check enumerated states instead of relying on order, per ... feedback.	2016-06-15 15:06:36 -07:00
David Rowe	775656eb1d	Delete comment	2016-06-16 08:48:30 +12:00
howard-stearns	2c7642a367	Do not make ReticleClick when we enter an overlay with the trigger ... pressed.	2016-06-15 12:28:42 -07:00