32492 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	d24df99445	Updated block logic to sync with desired behavior (each color block maps to a different size)	2015-09-21 11:51:00 -07:00
Brad Hefta-Gaub	b88c8e507b	fix a couple of properties	2015-09-21 11:35:26 -07:00
ericrius1	4e517b78e1	dice spawning higher so they fall onto craps table	2015-09-21 11:26:56 -07:00
Howard Stearns	237628e4cd	Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph	2015-09-21 11:24:25 -07:00
ericrius1	30198aa6f2	Only play animation once for screaming doll when picked up	2015-09-21 11:22:35 -07:00
ericrius1	a71f1495e9	Lowered sound volume on doll, now choose between two screams	2015-09-21 11:15:40 -07:00
James B. Pollack	f3eef9322c	Remove toybox reference in spawner script	2015-09-21 11:10:42 -07:00
James B. Pollack	c2a2abe615	Remove nested bubble entities and related code	2015-09-21 11:05:51 -07:00
Ryan Huffman	8f061bcf2e	Merge pull request #5861 from birarda/master ... fix for asset upload on Windows	2015-09-21 11:02:22 -07:00
Howard Stearns	8b701b8a5b	Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec. ... Takes effect when you save (if you have enabled the anim graph under developer->avatar). An empty string gives you the default behavior.	2015-09-21 10:26:04 -07:00
Stephen Birarda	5ebc8d6036	fix for file upload to ATP on Windows	2015-09-21 10:24:11 -07:00
David Rowe	52f6fe1d04	Clear entity list when you change domains	2015-09-21 09:59:00 -07:00
samcake	2875cb99bb	Fixing the compilation issue	2015-09-21 09:47:00 -07:00
ericrius1	5cd69c4f03	Added dice to master reset script	2015-09-21 09:17:23 -07:00
samcake	6a714f405c	Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map	2015-09-21 00:53:48 -07:00
samcake	3614812681	MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce	2015-09-20 23:31:59 -07:00
samcake	6914caac9d	Renaming TextureStorage.x to TextureMap.x	2015-09-20 18:14:03 -07:00
samcake	d6d95ff86b	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-20 14:33:23 -07:00
samcake	a41c20a1b7	Fixing buggy hash map look up and cleaning of name	2015-09-20 14:17:55 -07:00
Brad Hefta-Gaub	ba5109c458	Merge pull request #5858 from howard-stearns/see-other-default-avatars ... Let other users see your default avatar.	2015-09-20 13:57:29 -07:00
Howard Stearns	4fadf986e4	Merge pull request #5857 from hyperlogic/tony/look-whos-talking ... Talking idle animation support	2015-09-20 13:46:40 -07:00
Howard Stearns	4d2048c6f6	Let other users see your default avatar. ... Fixes https://app.asana.com/0/26225263936266/51001490412567	2015-09-20 13:12:13 -07:00
samcake	c9cb768945	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-19 09:00:19 -07:00
samcake	9a8dc6ca5d	Fix compilation issues on mac	2015-09-19 08:59:47 -07:00
samcake	8941741508	Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap	2015-09-18 18:47:18 -07:00
Anthony J. Thibault	eadf212418	Updated avatar.json with talking idle animation.	2015-09-18 18:31:53 -07:00
Brad Hefta-Gaub	ec87502f49	Merge pull request #5840 from jherico/bart ... Instanced rendering for Box entities	2015-09-18 18:06:25 -07:00
Anthony J. Thibault	44eb448cbe	Hooked up isTalking flag to Rig and AnimGraph.	2015-09-18 18:05:51 -07:00
Brad Hefta-Gaub	213cc25c75	Merge pull request #5856 from sethalves/hand-controller-adjustment ... fix releaseGrab in test script	2015-09-18 17:52:12 -07:00
ericrius1	fb98960194	Adding wand to master script	2015-09-18 17:45:28 -07:00
Seth Alves	fd1c8f6389	fix releaseGrab in test script	2015-09-18 17:39:50 -07:00
ericrius1	b62807011c	Doll screams and writhes when picked up, returns to default position when let go	2015-09-18 17:22:45 -07:00
Philip Rosedale	aebadb1ab9	Merge pull request #5854 from sethalves/hand-controller-adjustment ... tone down distance throwing	2015-09-18 17:20:22 -07:00
ericrius1	de14fc64f6	screaming on grab. Need to get release working	2015-09-18 17:17:55 -07:00
Seth Alves	cfde86a7ea	tone down distance throwing	2015-09-18 17:07:10 -07:00
David Rowe	60ba6e174f	Typo	2015-09-18 16:44:20 -07:00
David Rowe	812ab9b7c6	Merge branch 'master' into 20681 ... Conflicts: libraries/entities/src/EntityItemProperties.cpp	2015-09-18 16:44:04 -07:00
Philip Rosedale	5e64420ea1	Merge pull request #5850 from jherico/dargo ... Remove overcalling of glVertexAttrib4f	2015-09-18 16:38:22 -07:00
Philip Rosedale	bbc1c551eb	Merge pull request #5853 from sethalves/hand-controller-adjustment ... fix when releaseGrab is called	2015-09-18 16:30:01 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
Seth Alves	236831d385	fix when releaseGrab is called	2015-09-18 16:28:15 -07:00
Philip Rosedale	928a74a306	Merge pull request #5852 from sethalves/hand-controller-adjustment ... Hand controller adjustment	2015-09-18 16:21:12 -07:00
Seth Alves	5db3af3f4c	formatting	2015-09-18 15:58:47 -07:00
Seth Alves	5367de35c1	fix distance-grab throwing	2015-09-18 15:45:36 -07:00
James B. Pollack	ccf125c047	Cleanup comments	2015-09-18 15:40:39 -07:00
James B. Pollack	c364189bc8	Update file header	2015-09-18 15:26:34 -07:00
James B. Pollack	dc17985e29	Add some logic for turning off the flashlight when squeeze trigger pressure is low, and turning it back on when squeeze pressure goes over certain amount	2015-09-18 15:24:44 -07:00
Eric Levin	35e38a443c	Merge pull request #5849 from sethalves/hand-controller-adjustment ... Hand controller adjustment	2015-09-18 15:22:29 -07:00
Andrew Meadows	269e3d7f23	Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance ... Entities.getEntityProperty() performance improvements	2015-09-18 15:19:06 -07:00
Bradley Austin Davis	f851c6204f	Remove overcalling of glVertexAttrib4f	2015-09-18 15:14:04 -07:00