59699 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	0f5adb488c	Merge branch 'vr-edit-footer' into vr-edit-a ... # Conflicts: # scripts/vr-edit/modules/toolsMenu.js	2017-09-27 10:04:31 +13:00
David Rowe	8bd0e464aa	Merge branch 'vr-edit-group-box' into vr-edit-a	2017-09-27 08:48:44 +13:00
David Rowe	9b7197cf3f	Don't highlight entity you're inside unless you laser it	2017-09-26 15:36:40 +13:00
David Rowe	d64e3aca55	Polyvoxels don't have a color property	2017-09-26 11:10:05 +13:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
Sam Gateau	191066a111	Merge pull request #11452 from SamGondelman/pos3D ... Fix pointer event properties	2017-09-25 11:49:54 -07:00
SamGondelman	a73fdf4397	fix pointer event properties	2017-09-25 10:19:42 -07:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -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
David Rowe	bbc6e5d1b5	Fix bounding box isn't cleared when exit tool with header or grip click	2017-09-24 17:06:42 +13:00
David Rowe	4e0efdaa1a	Automatically add entities in bounding box to currently selected groups	2017-09-24 16:55:15 +13:00
David Rowe	2afc84cf0b	Display bounding box of currently selected groups	2017-09-24 12:06:04 +13:00
Brad Hefta-Gaub	bafb59e691	Merge pull request #11436 from SamGondelman/missingModels ... Fix missing models	2017-09-23 13:56:50 -07:00
David Rowe	8976befaeb	Use emissive FBX model for highlighted Tools menu header	2017-09-23 14:20:53 +12:00
David Rowe	64acc0d0a3	Press undo/redo and menu buttons when click them	2017-09-23 13:01:38 +12: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
Sam Gateau	d68577be7e	Merge pull request #11441 from SamGondelman/glowAlpha ... Fix alpha on Line3DOverlays with glow	2017-09-22 17:17:23 -07:00
SamGondelman	86198606e0	add _modelJustLoaded and updateTransforForSkinnedMesh on creation	2017-09-22 17:12:44 -07:00
David Rowe	bc5cd7415b	Use emissive FBX models for header bars	2017-09-23 11:56:42 +12:00
David Rowe	f53f8c14fc	Update wrist tool icon	2017-09-23 11:34:57 +12:00
Zach Fox	702a4e9ade	More tweaking to overlay position	2017-09-22 15:32:38 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
SamGondelman	bc477608ee	fix alpha on glowLines	2017-09-22 13:22:08 -07:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
Zach Fox	e3f2e70bca	No magic numbers	2017-09-22 11:43:56 -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
Seth Alves	e7f9898517	Merge pull request #11437 from jherico/fix/web_render_size ... Fix dimensions of rendered web entities	2017-09-22 11:14:14 -07:00
SamGondelman	be27376c52	add comment about bottleneck	2017-09-22 10:21:32 -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
David Rowe	edd6310a07	Move undo/redo buttons to footer area and make persistent	2017-09-22 21:46:33 +12:00
David Rowe	ca000acf2a	Add space for a footer to put undo/redo buttons in	2017-09-22 17:40:34 +12:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
David Rowe	e0658c7a2f	Merge branch 'master' into vr-edit-a	2017-09-22 15:18:14 +12:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
Clément Brisset	ecca1fea93	Merge pull request #11434 from Atlante45/fix/running-scripts-tablet ... Fix RunningScripts in tablet mode	2017-09-21 18:55:20 -07:00
Clément Brisset	c64f709380	Merge pull request #11435 from Atlante45/fix/use-after-free ... Fix use after free in deleteMappings	2017-09-21 18:45:29 -07:00
SamGondelman	9f12d3a365	fix missing models	2017-09-21 17:57:25 -07:00
David Rowe	959d497079	Change group tool's "Cancel" button to "Clear"	2017-09-22 12:00:12 +12:00
Cain Kilgore	0d33976035	Real time changes	2017-09-22 00:38:30 +01:00
Atlante45	a4b9945226	Fix use after free in deleteMappings	2017-09-21 16:22:51 -07:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
David Rowe	e4a126461b	Add extra Create palette items	2017-09-22 10:53:06 +12:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Ryan Huffman	abbe263142	Fix FBXBaker not properly handling textures with the same name	2017-09-21 13:40:39 -07:00
David Rowe	a757012c10	Change default color to 100% white	2017-09-22 08:17:35 +12: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