32045 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	135b34d82a	Merge branch 'master' into toybox	2015-09-22 13:32:08 -07:00
ericrius1	a28cf5ce8b	updated grab script	2015-09-22 13:29:16 -07:00
ericrius1	a0bf7b6529	doll animation fixes	2015-09-22 13:20:17 -07:00
ericrius1	6298dcb2fc	attempt fix for doll animation	2015-09-22 13:03:44 -07:00
Eric Levin	00e0523872	Merge pull request #5851 from imgntn/flashlight_updates_1 ... Flashlight updates	2015-09-22 13:01:26 -07:00
ericrius1	d273852bf9	New wand script	2015-09-22 12:56:01 -07:00
ericrius1	a266e8d65a	updated reset script to use new wand script	2015-09-22 12:49:45 -07:00
James Pollack	e5c42c76a2	Remove update loop refs	2015-09-22 12:41:00 -07:00
ericrius1	2557b32e1a	Updated switch model to be fbx	2015-09-22 12:40:09 -07:00
James Pollack	0ad238a508	Enlarge flashlight	2015-09-22 12:39:48 -07:00
Andrew Meadows	7060befd1c	Merge pull request #5862 from howard-stearns/user-specified-animation-graph ... user-specified animation graph	2015-09-22 10:48:28 -07:00
Eric Levin	37efb80945	Update BUILD_WIN.md	2015-09-22 10:19:01 -07:00
Philip Rosedale	c09ac51d75	Merge pull request #5871 from ctrlaltdavid/20688 ... DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view	2015-09-22 10:17:28 -07:00
ericrius1	b704ebd934	modified dice starting position	2015-09-22 09:55:24 -07:00
ericrius1	98faf3d712	Added light switch sound	2015-09-22 09:53:22 -07:00
ericrius1	703545bac3	Modified lightSwitch entity to use new incoming grab API	2015-09-22 09:34:54 -07:00
Brad Hefta-Gaub	0072b6d7d0	Merge pull request #5681 from samcake/orange ... NetworkGeometry and FBXReader refactoring for splliting Material from Mesh	2015-09-22 09:27:11 -07:00
ericrius1	e984afa1dd	Merge branch 'master' into toybox	2015-09-22 08:56:39 -07:00
ericrius1	68bee8228b	abstracted toggle logic to work with mouse click as well	2015-09-22 08:53:46 -07:00
samcake	80e5581639	fixing review comments	2015-09-21 22:51:14 -07:00
samcake	4513b64b00	fixing review comments	2015-09-21 22:42:24 -07:00
David Rowe	30dc07b621	Code tidying	2015-09-21 21:22:36 -07:00
David Rowe	0f85c28098	Fix HMD 3rd person view	2015-09-21 21:08:13 -07:00
samcake	91b9940fe9	Merging and a fix for the diffuse map floating around	2015-09-21 18:09:25 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
James B. Pollack	bf22d5a942	dont delete wand at cleanup from createWand.js	2015-09-21 17:43:05 -07:00
Brad Davis	7b5cbbf758	Merge pull request #5868 from ctrlaltdavid/20687 ... Fix HMD fullscreen mirror view	2015-09-21 17:07:31 -07:00
samcake	21f53f1bbd	debugging the lighting issue on the craps table	2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub	ea141aae92	Merge pull request #5865 from jherico/bart ... Instancing work, second pass	2015-09-21 16:51:08 -07:00
Brad Davis	483884196c	Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles ... merge model part quads and triangles together to reduce the number of draw calls	2015-09-21 16:48:29 -07:00
Brad Davis	8f3c2af55e	Merge pull request #5863 from ZappoMan/fixParticleEffect ... fix a couple of properties	2015-09-21 16:43:12 -07:00
ericrius1	a4e5f707cc	Toggling lights	2015-09-21 16:35:30 -07:00
Bradley Austin Davis	0401672c82	Fixing lighting again	2015-09-21 16:24:55 -07:00
James B. Pollack	d79c1bec95	remove query string	2015-09-21 16:13:24 -07:00
samcake	dfe17e5708	Fix issues from review	2015-09-21 16:12:17 -07:00
James B. Pollack	fd67a2b86f	Add on/off by pressure; add point bulb to end of flashlight	2015-09-21 16:10:08 -07:00
ericrius1	e4d630b1fc	more light toggling additions	2015-09-21 15:57:03 -07:00
ericrius1	8678e07c21	Adding in light triggering logic	2015-09-21 15:45:54 -07:00
Bradley Austin Davis	b3aeaba5f4	CR feedback	2015-09-21 15:44:47 -07:00
samcake	a485d3d6de	Fixing the rendering of ProceduralSkybox	2015-09-21 15:21:48 -07:00
Howard Stearns	4dd95be8c4	Forgot to actually persist.	2015-09-21 15:06:11 -07:00
ericrius1	13d7834902	Merge remote-tracking branch 'upstream/master' into toybox	2015-09-21 14:51:33 -07:00
Bradley Austin Davis	84cea1ffd4	More CR comments	2015-09-21 14:33:32 -07:00
Philip Rosedale	26e5f1ca48	Merge pull request #5842 from SeijiEmery/platform-js ... Platform.js	2015-09-21 14:28:34 -07:00
samcake	fa9b0930d2	Bring back the procedural skybox	2015-09-21 14:25:32 -07:00
David Rowe	46524632fe	Fix eyeball directions in fullscreen HMD view	2015-09-21 14:18:33 -07:00
Bradley Austin Davis	0c0af812c2	CR comments	2015-09-21 14:16:56 -07:00
Philip Rosedale	cd84848fd4	Merge pull request #5867 from sethalves/fix-grab ... keep object from rotating during local grab	2015-09-21 14:11:59 -07:00
David Rowe	7ffde27224	Fix HMD fullscreen mirror view	2015-09-21 14:04:32 -07:00
Howard Stearns	7fe1779109	Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph	2015-09-21 13:52:11 -07:00