2159 commits

Author	SHA1	Message	Date
amantley	4eb2a5cf5e	added a property check in renderableModelEntity for the animation url this fixes the bug stopping you from changing animations on an entity	2018-01-17 19:25:20 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Sam Gateau	d4571bd86a	Merge pull request #12181 from humbletim/rename-model-graphics ... Rename libraries/model -> libraries/graphics	2018-01-16 18:12:25 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Nissim Hadar	daa6409936	Improved comments.	2018-01-15 17:33:48 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Sam Gateau	4663f8eb2a	Merge pull request #12136 from SamGondelman/texture ... Keep requesting render update until textures load	2018-01-11 14:09:21 -08:00
SamGondelman	e9d751fd23	try to avoid reusing uniform buffer locations	2018-01-10 17:01:01 -08:00
Dante Ruiz	980807c657	make changes	2018-01-10 16:50:41 -08:00
SamGondelman	df574c6bc9	keep requesting render update until textures load	2018-01-10 13:19:53 -08:00
Dante Ruiz	d0bff29471	fixing merge conflict	2018-01-10 10:11:53 -08:00
Nissim Hadar	9f25b01b10	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-10 09:30:05 -08:00
Sam Gateau	539ee82937	Merge pull request #12033 from Zvork/compactvb ... More compact representation of meshes on GPU	2018-01-10 09:11:33 -08:00
Sam Gateau	8c80247925	Merge pull request #12123 from SamGondelman/meta ... Model meta render item is only withTypeShape if visual geometry request fails	2018-01-10 09:09:19 -08:00
Sam Gateau	6d6aad4aa8	Merge pull request #12060 from SamGondelman/burp5 ... Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity	2018-01-10 09:08:54 -08:00
Dante Ruiz	c4253f3b3b	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
SamGondelman	7c56a9ffb2	model meta is only withTypeShape if visual geometry request fails	2018-01-09 12:43:43 -08:00
Olivier Prat	db9e5fdae8	Merged from master but rendering seems broken	2018-01-09 11:05:34 +01:00
SamGondelman	4f5727e6b0	add _needsRenderUpdate flag	2018-01-08 17:10:44 -08:00
Nissim Hadar	b2b1807490	Changes per code review.	2018-01-08 15:37:06 -08:00
Nissim Hadar	46b494c802	Removed the Stage functionality - it is now implemented as a script.	2018-01-08 14:34:46 -08:00
SamGondelman	7c17603f3e	Merge remote-tracking branch 'upstream/master' into burp5	2018-01-08 14:27:31 -08:00
Nissim Hadar	452c16e706	Removed backgroundPropertiesChanged	2018-01-08 12:11:36 -08:00
Nissim Hadar	8206ae6ffb	Removed BackgroundMode packet type.	2018-01-07 13:50:42 -08:00
Olivier Prat	b296b96e5e	Merged with master	2018-01-06 10:01:00 +01:00
Nissim Hadar	9e5eba4d3a	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-05 23:11:40 -08:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Sam Gondelman	5cf25a20c9	use correct model ptr	2018-01-04 21:21:58 -08:00
Nissim Hadar	adbc4d0c39	Removed background mode from code (still in the protocol).	2018-01-04 18:23:25 -08:00
SamGondelman	6a19b0e0b6	update render items on texture load	2018-01-04 13:10:46 -08:00
Nissim Hadar	8bd2985f1f	Simplified code.	2018-01-04 13:06:28 -08:00
Dante Ruiz	527d00871a	making relaying translation work	2018-01-04 11:57:51 -08:00
Nissim Hadar	5b7ef9a3d3	Minor cleanup.	2018-01-04 09:13:58 -08:00
Dante Ruiz	e1a7f9bfb8	working on imporving soft-entities	2018-01-03 08:47:11 -08:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
Nissim Hadar	dad3a0d340	Fixed skybox inheritance.	2018-01-02 09:08:05 -08:00
Dante Ruiz	be9bf31843	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-02 08:04:26 -08:00
Nissim Hadar	0764e80996	Corrected behaviour of skybox modes.	2017-12-30 18:19:42 -08:00
nissim.hadar	b56c7535d2	Added legacy functionality (for zones that used Background "skybox")	2017-12-30 12:25:58 -08:00
druiz17	0ebbb76b49	fixed property over written issue and start relaying joints	2017-12-29 16:12:40 -08:00
Nissim Hadar	7260b4ff7b	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/entities/src/EntityPropertyFlags.h	2017-12-29 15:16:14 -08:00
Nissim Hadar	87e896ab20	Zone inheritance ready for testing.	2017-12-29 15:13:46 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 ... avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
Nissim Hadar	85a81d6b5b	WIP - skybox inheritance	2017-12-28 18:23:49 -08:00
Nissim Hadar	64644fc980	WIP - skybox inheritance	2017-12-28 14:31:59 -08:00
Nissim Hadar	03cf7710d0	Ambient light inheritance	2017-12-28 09:34:55 -08:00