600 commits

Author	SHA1	Message	Date
ericrius1	75220a32e7	tail dynamic	2015-07-22 14:49:48 -07:00
ericrius1	b452566d75	transparent textures and setting up 9-patch system for texture scaling	2015-07-22 10:57:03 -07:00
ericrius1	99856df112	tail strip	2015-07-21 11:43:10 -07:00
ericrius1	e1f8871ec9	drawing trails at end of stroke	2015-07-21 10:48:25 -07:00
ericrius1	b9affba93f	textures working	2015-07-21 09:56:09 -07:00
ericrius1	9fc54a6040	getting closer to texturing properly	2015-07-20 15:33:21 -07:00
ericrius1	1e34de1c51	adding in screen space effect for getting hit	2015-07-20 10:44:38 -07:00
ericrius1	bad6aa8f0a	adding textures to poly line"	2015-07-17 15:39:44 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
ericrius1	5e3e1e4567	adding texture	2015-07-17 15:00:10 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
Atlante45	8fb69ecc96	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 13:50:58 -07:00
Clément Brisset	17c6f41db6	Merge pull request #5306 from ctrlaltdavid/20606 ... CR for 20606 - If an external texture isn't found, still display the model	2015-07-14 13:49:00 -07:00
Atlante45	7bf45308b6	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 12:31:37 -07:00
ericrius1	c4194cd030	adding textures	2015-07-14 09:38:55 -07:00
Brad Davis	684d466b44	Merge pull request #5308 from venkatn93/avatar ... Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-14 09:06:49 -07:00
Niraj Venkat	ef3c6b25e0	More coding standard changes	2015-07-14 00:45:38 -07:00
ZappoMan	5676246d75	fix the lingering model parts sometimes left behind when switching domains	2015-07-13 15:26:52 -07:00
ericrius1	f54d1cf0f6	smoother line drawing over network	2015-07-13 14:24:26 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
ericrius1	b3b12bd2dc	adding custom shader for flipped normals	2015-07-13 08:54:53 -07:00
David Rowe	d44743563b	Merge branch 'master' into 20606 ... Conflicts: libraries/render-utils/src/Model.cpp	2015-07-13 07:53:04 -07:00
David Rowe	8ecefdfe39	If an external texture isn't found, still display the model ... If the texture is present the next Interface is run then it will be used.	2015-07-10 16:03:27 -07:00
Atlante45	a3848f08d2	Conditionnal fixes.	2015-07-10 15:36:17 -07:00
Atlante45	49993695a5	Made geometry refresh safe	2015-07-10 15:20:19 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Niraj Venkat	706f85e4ce	Fixes to comply with coding standard	2015-07-09 17:31:38 -07:00
Niraj Venkat	bd91daf712	Removing debug code	2015-07-09 16:27:23 -07:00
Niraj Venkat	1dce5f80cc	Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 16:17:58 -07:00
Sam Gateau	4c44eb63da	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-08 14:25:41 -07:00
Sam Gateau	f992e875b4	Adding intrsumentation for nsight and hiding the nsight specific code in cpp	2015-07-08 14:25:13 -07:00
Atlante45	687f9dda4a	Restore old offset behaviors	2015-07-06 18:21:17 -07:00
Atlante45	541d9ae431	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
Sam Gateau	4d48b98364	For a fistfull of magic numbers	2015-07-06 14:22:09 -07:00
Sam Gateau	95f5b14d45	CLenaing the interface of Item::Status to be more explicit and removing magic numbers	2015-07-06 12:47:35 -07:00
Atlante45	c61bf34200	Use depth bias to avoid z-fighting on text entities	2015-07-04 18:35:00 -07:00
Atlante45	0eb89efb34	Fix text entity billboarding	2015-07-04 16:06:38 -07:00
Sam Gateau	76ca093e05	something working ?	2015-07-02 18:12:03 -07:00
samcake	0c55130548	maybe i have solved the passing of the status	2015-07-02 17:31:29 -07:00
Sam Gateau	79be37f78f	improvment ?	2015-07-02 16:00:56 -07:00
Sam Gateau	bf052162bb	improvment ?	2015-07-02 15:53:02 -07:00
Sam Gateau	8d8a902328	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-02 15:06:32 -07:00
Sam Gateau	be8fe25338	Trying to finalize the look and behavior of th estatus indicators	2015-07-02 15:06:07 -07:00
ericrius1	ad97b28734	fixed merge conflicts	2015-07-02 11:01:40 -07:00
samcake	faea97d3c7	Merge pull request #5221 from Atlante45/web ... Fix Web entities	2015-07-02 10:45:20 -07:00
ericrius1	feeba2a029	testing for serialization	2015-07-01 23:03:03 -07:00
ericrius1	ff99f68f89	fix quad logic	2015-07-01 22:29:33 -07:00
ericrius1	43b1751db3	fixed network bug for polylines	2015-07-01 18:33:42 -07:00
ericrius1	ad54b4c0b0	changed quad entity to PolyLine	2015-07-01 17:18:36 -07:00