61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
samcake	47b7fcc532	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-22 11:03:05 -07:00
samcake	4ce774ab8e	Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue	2017-09-22 11:02:57 -07:00
samcake	061ec69b09	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-22 10:52:30 -07:00
samcake	b424505f65	FIxing the case of the Circle3D	2017-09-22 10:48:56 -07:00
samcake	219d63784b	REmoving the extra variables in Linear3D and just use the _renderTRansform	2017-09-22 10:39:51 -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
Howard Stearns	6c47b71356	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-22 09:23:46 -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
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
samcake	16fb64afaa	Merging with blue-bis	2017-09-21 18:01:04 -07:00
SamGondelman	9f12d3a365	fix missing models	2017-09-21 17:57:25 -07:00
samcake	4a67e0421f	minimise the changes compared to upstream	2017-09-21 17:33:50 -07:00
samcake	eed099502a	minimise the changes compared to upstream	2017-09-21 17:20:32 -07:00
David Rowe	959d497079	Change group tool's "Cancel" button to "Clear"	2017-09-22 12:00:12 +12:00
samcake	510ecbb137	Merging with upstream	2017-09-21 16:59:15 -07: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
samcake	2d369a4586	fixing the image3D updating its renderTransform from it s update() call	2017-09-21 16:20:13 -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
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -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
samcake	454e167d93	notifying a render transform / bound change when the dimension property change	2017-09-21 12:58:56 -07:00
Howard Stearns	81585afb7c	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-21 12:46:34 -07:00
samcake	7103864b37	Also rendering the line3D overlay with start and end captured in game loop	2017-09-21 12:23:53 -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
Seth Alves	fc3e259f6f	remove debug prints	2017-09-21 11:42:30 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
Daniela	d054c6dc36	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-21 18:29:45 +01:00
Daniela	adde847798	Fix code standard.	2017-09-21 17:57:02 +01:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
Zach Fox	81be62b6f7	Check if ContextOverlayInterface is enabled before highlighting	2017-09-21 09:34:15 -07:00