23305 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	817a6130ef	return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list	2015-03-19 13:01:57 -07:00
ZappoMan	24132968fe	oops	2015-03-19 12:41:44 -07:00
ZappoMan	26670f9e41	remove unneeded debug	2015-03-19 12:15:12 -07:00
ZappoMan	c5314aceac	more DRYing up of code	2015-03-19 11:57:57 -07:00
ZappoMan	5814a14152	removed dead code	2015-03-19 11:42:00 -07:00
ZappoMan	e6cefa946c	more DRYing of code	2015-03-19 11:41:03 -07:00
ZappoMan	3c41ecd091	cleanup accepted files implementation	2015-03-19 11:29:41 -07:00
Sam Gateau	20764e9917	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-19 09:57:34 -07:00
Brad Davis	72957670ba	Some commentary	2015-03-19 09:55:03 -07:00
Brad Davis	2552afffe7	Merge branch 'master' into avatar	2015-03-19 09:47:36 -07:00
Atlante45	cbef6e546f	Fix emun placement	2015-03-19 17:25:53 +01:00
Seth Alves	8eedab72b3	remove some unneeded asserts	2015-03-19 09:15:57 -07:00
Seth Alves	480eae7317	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-19 09:14:26 -07:00
ZappoMan	8e0141b8e9	first cut at fst drag/drop support	2015-03-19 08:48:13 -07:00
Atlante45	d3ae7cf5cf	Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property	2015-03-19 16:25:26 +01:00
Seth Alves	ed63e339bc	Merge pull request #4475 from jherico/deadlock ... Removing unmatched QReadWriteLock::unlock() call	2015-03-19 06:54:41 -07:00
Brad Davis	7d73a0317d	Merge pull request #4473 from sethalves/maximum-capacity ... Maximum capacity	2015-03-18 22:43:17 -07:00
Brad Davis	91906d619f	Removing unmatched QReadWriteLock::unlock() call	2015-03-18 22:32:06 -07:00
Sam Gateau	f874a3ae82	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-18 17:26:31 -07:00
Sam Gateau	b33ba64e05	trying to tweek the transform equation to find the intel bug	2015-03-18 17:20:27 -07:00
Seth Alves	f800b29682	Merge pull request #4474 from AndrewMeadows/thermonuclear ... proper shape management for ConvexHull shapes	2015-03-18 17:01:58 -07:00
samcake	c0a66a05f4	Merge pull request #4463 from ZappoMan/LODTweaks ... MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased	2015-03-18 16:55:39 -07:00
Andrew Meadows	c032b29633	proper shape management for ConvexHull shapes	2015-03-18 16:29:57 -07:00
samcake	0f22d64802	compilation on MacOSX	2015-03-18 16:28:42 -07:00
Sam Gateau	414315b6e0	Since glProgramUniform is not supported on MAc we need a workaround...	2015-03-18 16:15:06 -07:00
Sam Gateau	b5eb4a7f5b	Since glProgramUniform is not supported on MAc we need a workaround...	2015-03-18 16:12:47 -07:00
Sam Gateau	dc27bfb6ef	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-18 15:59:50 -07:00
Sam Gateau	0bd78be7f4	Transition model shaders to gpu:Shader	2015-03-18 15:57:01 -07:00
Seth Alves	4412ba916e	don't lock out someone from localhost, even if the maximum number of users are connected	2015-03-18 15:17:25 -07:00
Seth Alves	e2a104c38a	unjack AvatarData locks	2015-03-18 14:11:02 -07:00
Seth Alves	610607e8e6	optionally limit number of avatars that can connect	2015-03-18 14:08:53 -07:00
Seth Alves	feeabc7bc8	Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity	2015-03-18 13:44:12 -07:00
Andrew Meadows	a07be6ba9f	Merge pull request #4472 from sethalves/quiet-physics-log ... quiet physics log spam	2015-03-18 13:41:23 -07:00
Seth Alves	405eceeda6	Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity	2015-03-18 13:26:46 -07:00
Seth Alves	dd97b54e52	quiet physics log spam	2015-03-18 13:22:29 -07:00
Seth Alves	1cab14064d	remove unneeded code, quiet some debug spew	2015-03-18 13:10:53 -07:00
Seth Alves	36e0a5afc5	cleanups	2015-03-18 13:04:27 -07:00
Seth Alves	b7a54e672d	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-18 13:01:07 -07:00
Seth Alves	9161cc8b83	attempt to handle collision models in the same way as render models	2015-03-18 13:00:09 -07:00
Brad Davis	160f666d89	Merge branch 'master' into avatar	2015-03-18 12:55:56 -07:00
Andrew Meadows	517b2648ca	Merge pull request #4465 from sethalves/avatars-can-collide ... One convex hull shape for models that provide decomposition data.	2015-03-18 12:52:52 -07:00
Brad Davis	0c465ce2b5	Merge pull request #4460 from ZappoMan/runJSFiles ... MVP task - Allow a script to be added to a users "running script" from the marketplace	2015-03-18 12:52:44 -07:00
Brad Hefta-Gaub	6d0fbcfcd6	Merge pull request #4470 from jherico/logspam ... Removing reported logspam from release builds	2015-03-18 12:49:52 -07:00
David Rowe	c114442325	Merge branch 'master' into 20399	2015-03-18 12:44:29 -07:00
David Rowe	648a2e3b1d	Set clip distance on rendering frustum rather than camera ... This fixes wrong clipping distance used for rendering in FPV if also have rear view mirror.	2015-03-18 12:43:49 -07:00
ZappoMan	8239a295cb	Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks	2015-03-18 11:54:05 -07:00
ZappoMan	a2e012f7a9	Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles	2015-03-18 11:53:19 -07:00
Atlante45	8b5ade10b8	Initial add of the Attribution property	2015-03-18 18:57:05 +01:00
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
samcake	948ced81ce	Merge pull request #4461 from Atlante45/fix_recordings ... Fix recordings	2015-03-18 09:52:29 -07:00