881 commits

Author	SHA1	Message	Date
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13:00
David Rowe	591db37a21	Fix up navigation footer fonts	2016-11-15 15:09:33 +13:00
David Rowe	e4b8d34080	Add navigation bar to marketplace pages	2016-11-15 14:38:03 +13:00
David Rowe	1eeec2a3a1	Fix up script injection methods	2016-11-15 10:24:38 +13:00
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13:00
Stephen Birarda	212d518109	use for loop for kick and mute overlay cleanup	2016-11-13 12:17:12 -08:00
Chris Collins	6581a51bc9	Merge pull request #9052 from davidkelly/dk/2226 ... Add ability to mute user	2016-11-11 16:02:08 -08:00
David Kelly	3d7e075897	Added mute to mod.js script	2016-11-11 11:18:24 -08:00
Brad Hefta-Gaub	a90a0fe8ba	Merge pull request #8976 from druiz17/FixMenuOutOfView ... Fixed menu out of view with HMD and Xbox controller	2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub	f55b660820	Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser ... Fix users.js maximize button unclickable with hand controllers	2016-11-10 17:53:17 -08:00
howard-stearns	8299e23cc3	diable some viewpoint menu options when in hmd.	2016-11-10 15:15:11 -08:00
David Rowe	1caca601f2	Update user instructions	2016-11-10 20:39:29 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
humbletim	35f857ef9d	inhibit user interactions when window is disabled	2016-11-09 13:21:24 -05:00
Ryan Huffman	5dab2ac2a7	Add margin to left and right side of users.js	2016-11-08 09:47:09 -08:00
Ryan Huffman	284b458148	Increase margin at bottom of users.js	2016-11-08 09:46:47 -08:00
Seth Alves	42d13f7e77	Merge pull request #9024 from huffman/fix/userdata-showing-old-data ... Fix userData in edit.js sometimes showing wrong value when locked	2016-11-07 13:37:03 -08:00
Ryan Huffman	c4f35bf7bf	Fix userData in edit.js sometimes showing wrong value when locked	2016-11-07 11:39:36 -08:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
Dante Ruiz	e22c36b4b7	fixed menu pop up delay	2016-11-07 17:16:24 +00:00
David Rowe	852218815b	Display "content loading" while there are pending GPU texture transfers	2016-11-07 13:40:49 +13:00
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
howard-stearns	8eb6699420	help script	2016-11-02 16:50:37 -07:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
David Rowe	de5e02310b	Provide keyboard in marketplaces window	2016-11-03 09:00:40 +13:00
Dante Ruiz	1a83cc2c3e	fixed deleted comment	2016-11-02 00:12:23 +01:00
Dante Ruiz	d29b1c34b1	fixed coding standard conflicts	2016-11-02 00:07:58 +01:00
Dante Ruiz	e9d10b609d	removed bad commit	2016-11-02 00:05:38 +01:00
Dante Ruiz	86abd9120e	Fixed menu out of view with HMD and Xbox controller	2016-11-01 14:30:48 -07:00
David Rowe	0c6ed67e3b	Tidying	2016-11-02 00:05:30 +13:00
David Rowe	35448b6c09	Update Clara.io instructions	2016-11-02 00:05:10 +13:00
Brad Hefta-Gaub	dc836cbefc	Merge pull request #8949 from ctrlaltdavid/21090 ... Fix comment typo	2016-10-28 13:29:47 -07:00
David Rowe	9a79345493	Fix comment typo	2016-10-29 09:04:50 +13:00
Ryan Huffman	b8cf4e9c0e	Merge pull request #8943 from ctrlaltdavid/21090 ... QA READY: Revise loading progress bar	2016-10-28 08:24:40 -07:00
David Rowe	b548e6441c	Animate progress bar without regard for amount of content left to load	2016-10-28 18:57:54 +13:00
David Rowe	610159fcbe	Improve bar for 4K displays	2016-10-28 18:20:33 +13:00
David Rowe	73b2bc433d	Improve bar positions	2016-10-28 18:03:13 +13:00
Stephen Birarda	c41af25776	Merge pull request #8939 from huffman/fix/tutorial-fixes ... Tutorial fixes	2016-10-27 21:43:55 -07:00
Ryan Huffman	d933155c71	Fix trigger highlight configuration	2016-10-27 20:16:34 -07:00
David Rowe	edc9b1fa07	Update bar graph for desktop and HMD displays	2016-10-28 15:50:50 +13:00
David Rowe	c9e4fddeab	Remove background image	2016-10-28 14:17:18 +13:00
David Rowe	0824142987	Add "loading" text	2016-10-28 14:12:24 +13:00
David Rowe	4befab1151	JSLint progress bar code	2016-10-28 11:34:00 +13:00
Ryan Huffman	69e7dababc	Collapse multiline dict to one line in controllerDisplay	2016-10-27 15:16:38 -07:00
Ryan Huffman	c0e372c380	Remove annotation API from controller display	2016-10-27 14:58:20 -07:00
Ryan Huffman	1f25ba8f1f	Update controller tips and trigger highlight in tutorial	2016-10-27 14:58:20 -07:00
Ryan Huffman	e9099b77a5	Add more debug to tutorial, new firecrackers, and adjust fuse	2016-10-27 14:58:20 -07:00
Ryan Huffman	1782f97dbd	Fix away.js not unsubscribing on shutdown	2016-10-27 11:12:46 -07:00
Ryan Huffman	a801832a55	Fix away.js allowing any user to disable away.js	2016-10-27 11:12:31 -07:00
Ryan Huffman	727fabeab2	Fix away.js logging all Messages	2016-10-25 15:28:11 -07:00