27829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	bfad3ee02a	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -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
Clément Brisset	573b3e3997	Merge pull request #5321 from howard-stearns/fst-packager-free-joints ... Fix https://app.asana.com/0/32622044445063/39927009585710	2015-07-14 13:46:48 -07:00
Howard Stearns	3cd1e318b2	Fix https://app.asana.com/0/32622044445063/39927009585710	2015-07-14 13:15:24 -07:00
Atlante45	a32f54da2f	Cleanup	2015-07-14 12:36:18 -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
Seth Alves	9b37b83eb6	Merge pull request #5320 from AndrewMeadows/barium ... fix grab.js when using the spring action	2015-07-14 11:02:42 -07:00
Seth Alves	3394c50499	Merge pull request #5319 from howard-stearns/sword-update-2 ... Update sword script for current controller/physics behavior.	2015-07-14 10:59:41 -07:00
Brad Hefta-Gaub	f88163b99c	Merge pull request #5314 from jherico/homer ... Qt 5.5 fixes	2015-07-14 10:35:12 -07:00
Brad Hefta-Gaub	049419cec7	Merge pull request #5307 from howard-stearns/remove-octreeFades ... Remove old octreeFade code that wasn't working anyway	2015-07-14 10:24:01 -07:00
Brad Davis	1c8ec3b1c9	preventing unused warnings	2015-07-14 10:16:06 -07:00
Howard Stearns	5196648b22	Remove obsolete enum member.	2015-07-14 09:57:19 -07:00
ericrius1	c4194cd030	adding textures	2015-07-14 09:38:55 -07:00
Howard Stearns	c49851cf03	Update sword script for current controller/physics behavior.	2015-07-14 09:33:08 -07:00
Andrew Meadows	69db9aa01a	fix grab transitions between vert and horiz planes	2015-07-14 09:24:37 -07:00
Andrew Meadows	7610fe48c2	filter action updates during simulation ownership ... This fixes a bug where actions can be thrashed (created/deleted) by late entity update echos from the entity-server.	2015-07-14 09:24:37 -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
Niraj Venkat	1f1a5f8e75	Coding standard and fixing pointers	2015-07-13 22:57:11 -07:00
Philip Rosedale	c81053fc83	Merge pull request #5318 from samcake/punk ... Fixing the ImageOverlay Bug	2015-07-13 22:25:46 -07:00
samcake	99ae0326ad	FIxing th ecompilation issue on mac, ready to ship	2015-07-13 19:17:09 -07:00
Clément Brisset	a432752c39	Merge pull request #5316 from ctrlaltdavid/20604 ... QA for #20604 - Add an "is looking at me" indicator above avatars' heads	2015-07-13 16:40:11 -07:00
David Rowe	2bab7d1c03	Add parentheses	2015-07-13 16:38:51 -07:00
Sam Gateau	f08c608195	Remove dead code	2015-07-13 16:33:04 -07:00
Clément Brisset	de4a0447f9	Merge pull request #5315 from sethalves/fix-pointer.js ... update pointer.js to use relative-to-entity line-point ends	2015-07-13 16:26:38 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	c99382ee74	Merge pull request #5287 from ctrlaltdavid/20607 ... CR for Job #20607 - Interface upgrade message has bad formatting	2015-07-13 16:07:17 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler ... quiet compiler	2015-07-13 15:55:35 -07:00
Clément Brisset	fb0dab3bca	Merge pull request #5317 from ZappoMan/fixLingeringModels ... fix the lingering model parts sometimes left behind when switching domains	2015-07-13 15:53:24 -07:00
ZappoMan	5676246d75	fix the lingering model parts sometimes left behind when switching domains	2015-07-13 15:26:52 -07:00
Niraj Venkat	10e0a93ac0	Fix for avatar rendering not working on domain exit/entry	2015-07-13 15:22:00 -07:00
ericrius1	f54d1cf0f6	smoother line drawing over network	2015-07-13 14:24:26 -07:00
David Rowe	59f456a2f2	Add an "is looking at me" indicator above avatars' heads ... Menu item: Developer > Avatar > Show Who's Looking at Me	2015-07-13 14:16:39 -07:00
Howard Stearns	8ddbe139a7	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades	2015-07-13 13:19:39 -07:00
Seth Alves	d44bb1a0d8	update javascript to use relative-to-entity line-point ends	2015-07-13 11:42:29 -07:00
Andrew Meadows	a24fd13665	Merge pull request #5312 from sethalves/fix-hold-action-deserialize ... fix hold-action deserialization.	2015-07-13 11:33:16 -07:00
ericrius1	dab31e5e42	setNormals refactor	2015-07-13 11:32:12 -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
Seth Alves	7a6cf40b54	quiet compiler	2015-07-13 07:39:11 -07:00
Seth Alves	5aca0c28ef	quiet compiler	2015-07-13 07:37:59 -07:00
Howard Stearns	d1952583ab	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades	2015-07-13 07:24:08 -07:00
Brad Hefta-Gaub	db8d8a34bf	Merge pull request #5310 from sethalves/improve-voxel.js ... allow voxels.js to work on an empty voxel-space	2015-07-13 07:17:12 -07:00
Seth Alves	f011d5c7f7	remove commented code	2015-07-12 20:42:17 -07:00
Brad Davis	d3cdfb5084	Merge remote-tracking branch 'upstream/master' into homer	2015-07-12 18:52:27 -07:00
Brad Davis	29333d0cad	Qt5.5 fixes	2015-07-12 18:52:15 -07:00
Brad Davis	d8dde71c8f	Make scribe generated shaders more readable	2015-07-12 18:46:08 -07:00