53445 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chris Collins	3b839d3f9b	Merge pull request #10290 from samcake/hotfix ... Build 37.2 Hotfix to fix a crash with texture loading and Qt build 5.6.2	2017-04-26 14:28:24 -07:00
samcake	2d4ac0fc43	Bringing a fix to the ImageReader::read crash to stable	2017-04-26 11:04:48 -07:00
Chris Collins	71bc8804ec	Merge pull request #10274 from highfidelity/RC-37-HOTFIX ... Build 37.1 Hotfix to fix a crash bug for graphics and tablet	2017-04-25 10:54:06 -07:00
Dante Ruiz	ef03ca2a2c	tablet cpp ownership	2017-04-24 17:21:18 -07:00
Dante Ruiz	0705f23009	remove debug statments	2017-04-24 17:21:09 -07:00
Dante Ruiz	d03f44ff24	crash fix	2017-04-24 17:20:47 -07:00
Dante Ruiz	adc0c8086e	check for null when we dont	2017-04-24 17:20:32 -07:00
Chris Collins	a20cd34a93	Merge pull request #10247 from jherico/gl45_var_texture_crash_hotfix ... HOTFIX - Fix crash in variable allocation management	2017-04-20 16:37:44 -07:00
Brad Davis	4f5624a237	Fix crash in variable allocation management	2017-04-19 11:31:56 -07:00
Chris Collins	a8e43c99ca	Merge pull request #10197 from highfidelity/RC-37 ... Beta Release 37	2017-04-18 07:58:04 -07:00
Zach Fox	d1a11740f0	Whoops	2017-04-17 13:00:23 -07:00
Seth Alves	66137e78a2	grab script checks for touch devices continually, rather than just when the script starts	2017-04-14 15:28:56 -07:00
Andrew Meadows	6a8ddee878	send keep-alive packets but don't resend identity	2017-04-14 15:16:14 -07:00
Andrew Meadows	06b9fd6a7e	don't keep stale avatars alive	2017-04-14 15:16:02 -07:00
Andrew Meadows	d72f6cf45e	avatar-mixer to send identity packets as 'reliable'	2017-04-14 15:15:54 -07:00
Andrew Meadows	eaefa3d3f2	avatar-mixer resends to avoid stale avatar	2017-04-14 15:15:45 -07:00
Andrew Meadows	e751080f64	update model transform even when out of view	2017-04-12 12:50:54 -07:00
Andrew Meadows	6cb88c31f3	AvatarMixer sends min updates for out-of-view avatars	2017-04-12 12:50:44 -07:00
Zach Fox	2d1d207c9b	lol	2017-04-12 12:50:12 -07:00
Thijs Wenker	b2f463180d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 12:44:30 -07:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Chris Collins	c86acfafef	Merge pull request #10120 from huffman/feat/stick-default-avatar ... Change default avatar to ball and stick avatar	2017-04-11 12:56:25 -07:00
Seth Alves	f555ae253f	Merge pull request #10192 from druiz17/tablet-webview-fix ... webview go back to previous page fix	2017-04-11 12:11:43 -07:00
Chris Collins	3a603e7ced	Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject ... change handling of life-time of TabletProxy QObjects	2017-04-11 11:53:47 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix ... Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -07:00
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01:00
druiz17	b7daf8c80b	Merge pull request #10191 from sethalves/fix-collision-hull-munging ... fix -- munge collision-hull at last minute rather than store munged url as a property	2017-04-11 09:09:54 -07:00
Chris Collins	836b4993cc	Merge pull request #10188 from druiz17/homebutton-fix-crash ... fix crashes when clicking in the homebutton	2017-04-11 09:00:35 -07:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	d5f5192954	Merge pull request #10174 from vladest/fix-snapshot-login-cancel ... Check if dialog was opened from StackView and then pop or just go to …	2017-04-11 07:07:29 -07:00
Seth Alves	bf16309917	Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 ... avoid invisible avatars redux	2017-04-11 07:07:03 -07:00
Seth Alves	938fab6f59	Merge pull request #10061 from humbletim/fix-cached-ResourceCache ... Fix cached ResourceCache::prefetch() state updates	2017-04-11 07:04:06 -07:00
Seth Alves	b99959c73d	munge collision-hull at last minute rather than store munged url as a property	2017-04-11 07:00:22 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	b8620f6919	make getAvatar in AvatarManager Q_INVOKABLE	2017-04-10 22:15:45 -07:00
Stephen Birarda	e7299a5435	add missing include for ScriptAvatar in AvatarManager	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Zach Fox	54ca8bd89e	grab audio loudness from correct avatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Zach Fox	0aa1e633fe	Fix overrides and warnings (finally?)	2017-04-10 22:15:45 -07:00
Zach Fox	2561d38d93	Fix GCC warning	2017-04-10 22:15:45 -07:00
Zach Fox	04792bf3bc	Typo fix.	2017-04-10 22:15:45 -07:00
Zach Fox	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	1984d5bc0c	Cleanup	2017-04-10 22:15:44 -07:00
Zach Fox	3832abffee	Almost theregit add -A	2017-04-10 22:15:44 -07:00
Zach Fox	4489c34e84	I'm on fire	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00