76 commits

Author	SHA1	Message	Date
Stephen Birarda	69f0c50a3c	fix cleanup order to ensure environment is re-rendered	2015-04-01 17:50:12 -07:00
Stephen Birarda	40f7e683da	don't attach iron man helmet while in lobby	2015-04-01 17:38:32 -07:00
Stephen Birarda	560f53b842	use new API to toggle environment from lobby	2015-04-01 17:08:15 -07:00
Leonardo Murillo	d1d183e190	More .com changes	2015-03-25 13:05:10 -06:00
Stephen Birarda	5715642e04	fix for restart API in lobby script	2015-02-12 11:13:30 -08:00
Stephen Birarda	ea52cea5dd	more cleanup for AudioInjector mem management	2015-02-12 10:56:40 -08:00
Stephen Birarda	05b7cd819e	use isPlaying property instead of getter	2015-02-11 16:21:45 -08:00
Stephen Birarda	6a5c0fd9f2	repairs for new injector API in lobby script	2015-02-11 16:16:01 -08:00
Stephen Birarda	fe79d8902e	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
Stephen Birarda	cdaecbd846	Update lobby.js	2015-01-15 16:40:13 -08:00
Stephen Birarda	336f28e014	repair to places array length	2015-01-15 15:00:42 -08:00
Stephen Birarda	00f4e92e06	fix places array grab	2015-01-15 14:58:49 -08:00
Stephen Birarda	e538669343	resolve conflicts on merge with upstream	2015-01-15 13:12:05 -08:00
Chris Collins	d6a3b94c73	Changed references of global.js to a var ... Changed references of global.js to a var	2015-01-15 10:48:31 -08:00
Stephen Birarda	79d214619d	update lobby for new places API	2015-01-14 18:18:26 -08:00
Stephen Birarda	661221a189	repairs to AudioScriptingInterface playSound	2015-01-12 16:04:00 -08:00
Stephen Birarda	208af5cbca	Revert "don't play muzak from lobby to avoid error" ... This reverts commit 69f5c769b8.	2015-01-12 15:14:49 -08:00
Stephen Birarda	69f5c769b8	don't play muzak from lobby to avoid error	2015-01-12 10:07:20 -08:00
Brad Hefta-Gaub	31cbd6e88c	Merge pull request #3954 from ctrlaltdavid/20226 ... CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize	2014-12-11 14:33:24 -08:00
Stephen Birarda	230b8740bf	add higher resolution images to lobby	2014-12-11 11:23:27 -08:00
Ryan Huffman	0c746168ef	Update lobby to use new URLs + black panels in place of H	2014-12-10 19:48:05 -08:00
Ryan Huffman	9c9bfeed33	Add missing 'var' to local variable	2014-12-10 14:27:37 -08:00
Ryan Huffman	961f629074	Fix indentation, 4 -> 2	2014-12-10 14:26:42 -08:00
Ryan Huffman	7515c26d71	Merge remote-tracking branch 'upstream/master' into lobby-reorder	2014-12-10 14:17:47 -08:00
Ryan Huffman	a24acb4858	Fix style	2014-12-10 14:15:43 -08:00
Ryan Huffman	6fa1d7a7bd	Update lobby to start on the second row	2014-12-10 14:08:59 -08:00
David Rowe	ff6db7a9fa	Merge branch 'master' into 20226	2014-12-09 19:20:30 -08:00
David Rowe	3ea3a497c6	Update scripts to use new textSize() method	2014-12-09 18:33:29 -08:00
Brad Hefta-Gaub	69f7a89003	Merge pull request #3937 from Atlante45/mouse_pick_in_oculus ... Mouse pick improvments	2014-12-09 18:33:25 -08:00
Philip Rosedale	756e1b4d63	Merge pull request #3935 from PhilipRosedale/master ... option to suppress lobby text for now, defaults to true	2014-12-09 17:40:03 -08:00
Philip Rosedale	96c3a0edbd	option to suppress lobby text for now, defaults to true	2014-12-09 17:39:05 -08:00
Atlante45	0a4f74cf9c	Single reticle in the lobby	2014-12-09 16:29:45 -08:00
Ryan	7fffcd3b53	Swap out the lobby model for the one with the correct light value	2014-12-08 12:47:37 -08:00
David Rowe	ca62e61579	Update scripts with text overlays to use new backgroundAlpha property	2014-12-06 11:11:52 -08:00
ZappoMan	f23d8f6c20	text sizing tweaks	2014-11-23 11:21:05 -08:00
ZappoMan	437af06245	switch to 3d text for description	2014-11-23 11:16:33 -08:00
ZappoMan	53bd8fd6d2	handle no description and blank panels better	2014-11-22 21:30:58 -08:00
ZappoMan	efe202b7e8	make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby	2014-11-22 21:25:43 -08:00
ZappoMan	310e31377d	handle line wrapping in description	2014-11-22 14:49:56 -08:00
ZappoMan	f014025b81	first cut at lobby tweaks	2014-11-22 14:28:06 -08:00
Stephen Birarda	64d9dc4efa	fix for scaling of lobby and missing reticle	2014-11-20 17:05:37 -08:00
Stephen Birarda	7f795ec67c	repairs for new lobby shell	2014-11-20 16:20:32 -08:00
Stephen Birarda	4f879a06a6	fix flipped URLs for models in lobby	2014-11-20 16:11:08 -08:00
Stephen Birarda	c15354d935	update lobby for new orb and panel wall	2014-11-20 15:44:05 -08:00
Stephen Birarda	81b46d6c2c	fix oculus mode check for lobby	2014-11-20 10:55:40 -08:00
Stephen Birarda	f3b5102969	remove texture replace fix to avoid a crash	2014-11-20 09:38:41 -08:00
Stephen Birarda	afe4a4e432	don't show reticle if not wearing HMD, reset panel textures	2014-11-19 15:26:18 -08:00
Stephen Birarda	987b75d8f7	switch to next musak when finished	2014-11-19 14:52:57 -08:00
Stephen Birarda	45450c4fe3	handle offset passed in AudioInjectorOptions for mixer injections	2014-11-19 13:42:24 -08:00
Stephen Birarda	81c5f9ba5a	inject lobby music at a random starting point	2014-11-19 13:36:27 -08:00