59371 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	669af73a96	Bringing as much as possible out from render to game	2017-09-26 10:47:24 -07:00
Sam Gateau	953614fe65	More stuff out of render to the gameloop	2017-09-25 23:43:32 -07:00
samcake	157b4f2e13	Moving some of the updates on the camera and the avatar out from render to game loop	2017-09-25 18:28:33 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
samcake	abab7ff724	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-25 11:34:24 -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
Sam Gateau	f90dc64241	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-24 19:32:57 -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
samcake	59006411c6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-22 18:00:58 -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
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
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
samcake	8b3de41e51	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue	2017-09-22 11:39:25 -07:00
samcake	452a8f7175	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-22 11:31:33 -07:00
Sam Gateau	f7f14cb4e3	Merge pull request #11432 from samcake/blue-bis ... Fix overlay rendering to use cached Render Transform information	2017-09-22 11:30:31 -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
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
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
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
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
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
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
samcake	454e167d93	notifying a render transform / bound change when the dimension property change	2017-09-21 12:58:56 -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