24323 commits

Author	SHA1	Message	Date
Nissim Hadar	55fafeacb1	Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!	2017-09-27 17:43:09 -07:00
Nissim Hadar	eaab056d66	Adding HazeStage	2017-09-27 09:12:57 -07:00
Nissim Hadar	4d501d6510	Adding HazeStage	2017-09-27 08:01:19 -07:00
Nissim Hadar	2394d0931c	Adding HazeStage	2017-09-26 19:05:11 -07:00
Nissim Hadar	f92707a00c	WIP	2017-09-26 18:08:41 -07:00
Nissim Hadar	27af4685e7	Added range and altitude to UI.	2017-09-25 09:32:52 -07:00
Nissim Hadar	1a9625d272	Merge branch 'master' into hazeZone	2017-09-24 18:27:36 -07:00
Nissim Hadar	543bc5a71b	HazeMode calls Haze::setIsHazeActive.	2017-09-24 18:25:20 -07:00
Nissim Hadar	6cbf087708	First version with combo for Haze Mode.	2017-09-24 15:08:22 -07:00
Nissim Hadar	678b4e35b1	Before replacing "Haze Active" checkbox with "Haze Mode" combo.	2017-09-24 14:06:00 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub	bafb59e691	Merge pull request #11436 from SamGondelman/missingModels ... Fix missing models	2017-09-23 13:56:50 -07:00
Nissim Hadar	c4419fede8	Bumped up the version number.	2017-09-22 19:07:05 -07:00
Nissim Hadar	c2eea7d40b	Minor cleanup.	2017-09-22 18:37:21 -07:00
Nissim Hadar	736a6aa311	Haze checkbox in UI doesn't disable the UI.	2017-09-22 18:20:35 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
SamGondelman	86198606e0	add _modelJustLoaded and updateTransforForSkinnedMesh on creation	2017-09-22 17:12:44 -07:00
SamGondelman	bc477608ee	fix alpha on glowLines	2017-09-22 13:22:08 -07:00
Zach Fox	430d1b22bb	Update angular size and i behavior	2017-09-22 11:41:28 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
Anthony Thibault	20cb02dabb	Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering ... Fix for TextEntity rendering, the translation was incorrect	2017-09-22 11:19:24 -07:00
SamGondelman	be27376c52	add comment about bottleneck	2017-09-22 10:21:32 -07:00
Nissim Hadar	5e1d470553	WIP	2017-09-22 09:48:22 -07:00
Anthony J. Thibault	d3c60f3057	Fix for TextEntity rendering, the translation was incorrect ... This was caused by the removal of _dimensions from the SpatiallyNestable scale component.	2017-09-22 09:44:51 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
SamGondelman	9f12d3a365	fix missing models	2017-09-21 17:57:25 -07:00
Cain Kilgore	0d33976035	Real time changes	2017-09-22 00:38:30 +01:00
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Ryan Huffman	abbe263142	Fix FBXBaker not properly handling textures with the same name	2017-09-21 13:40:39 -07:00
Ken Cooke	84786ac8e3	Merge pull request #11424 from ctrlaltdavid/21548 ... Fix recording just made not playing back if reload it	2017-09-21 12:19:23 -07:00
David Rowe	a2d8152a3a	Coding standard	2017-09-22 07:13:32 +12:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Andrew Meadows	b803344f0c	Merge pull request #11421 from jherico/fix/transform_log_spam ... Don't add items to the scene graph until they have a valid parent chain	2017-09-21 08:42:56 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
David Rowe	4ce5e4ac46	Fix recording just made not playing back if reload it	2017-09-21 12:19:32 +12:00
Brad Davis	27350bd7de	Don't add items to the scene graph until they have a valid parent chain	2017-09-20 16:52:23 -07:00
Cain Kilgore	45f79b4341	Small fix	2017-09-21 00:00:24 +01:00
Cain Kilgore	322b7fc060	Cleanup from Merge	2017-09-20 23:37:33 +01:00
Cain Kilgore	f06c04e1b0	Fixed things	2017-09-20 23:24:56 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
Cain Kilgore	4d904bd5ce	Changed naming of avatarGrav	2017-09-20 18:43:16 +01:00
Cain Kilgore	506226ead0	Merge branch 'master' into 21542	2017-09-20 18:22:34 +01:00
Ryan Huffman	20759b0c97	Merge pull request #11404 from birarda/feat/auto-bake ... add abort on shutdown to Baker/FBXBaker/TextureBaker	2017-09-19 14:20:56 -07:00
Stephen Birarda	a8ac015bc4	address code review comments	2017-09-19 13:56:42 -07:00
Clément Brisset	a6376fcc12	Merge pull request #11402 from huffman/fix/remove-fbxcpp ... Remove FBX.cpp and other cleanup	2017-09-19 13:54:50 -07:00
Stephen Birarda	e1d79ee8f4	add abort to Baker and subclasses	2017-09-19 13:18:23 -07:00
Stephen Birarda	0d166cc250	Merge pull request #11400 from Atlante45/feat/auto-bake ... Remove unused Algorithms.h	2017-09-19 12:44:15 -07:00
Ryan Huffman	5950006111	Remove extraneous logging	2017-09-19 11:18:25 -07:00
Ryan Huffman	641addf397	Remove FBX.cpp	2017-09-19 11:13:39 -07:00