2963 commits

Author	SHA1	Message	Date
Seth Alves	2e880e9aab	change how pick-ray direction is calculated	2015-09-02 16:29:15 -07:00
Seth Alves	f54d924f4a	make sure intersected entity is in the list of possible polyvoxes to adjust	2015-09-02 09:29:51 -07:00
Seth Alves	3963035599	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 21:08:23 -07:00
Seth Alves	8608e4f2b0	small bug-fixes	2015-09-01 16:51:55 -07:00
Seth Alves	4ab8ac29b9	make terrain a doubly linked list	2015-09-01 15:23:47 -07:00
Ryan Downe Karpf	f0d69b1cdd	Merge pull request #5665 from ctrlaltdavid/20664 ... Add search radius field to entities list	2015-09-01 14:39:53 -07:00
Seth Alves	ca1602e443	if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing	2015-09-01 11:09:46 -07:00
Seth Alves	0dfe6e8054	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 09:13:43 -07:00
Seth Alves	4cbfe96b70	allow a sphere set/clear to affect more than one polyvox at a time	2015-08-31 18:16:32 -07:00
Seth Alves	6096c20db0	allow adding and deleting spheres	2015-08-31 18:00:31 -07:00
David Rowe	e2ee074b7a	Entity search uses radius, not diameter	2015-08-31 13:51:03 -07:00
Andrew Meadows	5a67865d74	Merge pull request #5679 from jherico/apu ... Magnetic sticks and balls, rough draft	2015-08-31 13:17:29 -07:00
Andrew Meadows	de6afb4d74	Merge pull request #5660 from sethalves/polyvox ... Polyvox improvements	2015-08-31 13:14:01 -07:00
Seth Alves	3424071a33	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-08-31 11:17:46 -07:00
Brad Davis	dc7d20ff86	Working on ui	2015-08-30 23:50:02 -07:00
Brad Davis	9d07bf1585	Magballs: Removing entity scripts, using onUpdate	2015-08-30 19:20:47 -07:00
Seth Alves	41a2ff2fff	working on stitching marching-cube polyvoxs together	2015-08-30 18:42:15 -07:00
Brad Davis	a574251173	Cleaning up and moving entity script	2015-08-29 23:06:23 -07:00
Brad Davis	cffb0be384	Removing edge finding calculations	2015-08-29 22:49:14 -07:00
Brad Davis	ebb530aaac	More magball work	2015-08-29 22:30:21 -07:00
Brad Davis	38b62108af	Magnetic sticks and balls	2015-08-28 23:35:43 -07:00
James B. Pollack	08986dcb17	Merge pull request #5669 from ZappoMan/breakdanceToy ... first cut at breakdance toy	2015-08-28 16:36:00 -07:00
Seth Alves	752c787f0b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-28 12:50:31 -07:00
Brad Hefta-Gaub	542b124146	first cut at breakdance toy	2015-08-27 16:12:33 -07:00
David Rowe	c9d799f5e0	Auto refresh entities list upon display of Entities tab	2015-08-27 13:32:00 -07:00
Seth Alves	e97e7de19c	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-27 13:19:15 -07:00
David Rowe	0399c5ca35	Merge branch 'master' into 20664	2015-08-27 12:13:15 -07:00
David Rowe	005851a74a	Increase default entity search radius to 100m	2015-08-27 12:13:04 -07:00
David Rowe	a553022adf	Update entities list as search radius value is changed	2015-08-27 11:11:05 -07:00
David Rowe	d628a88f52	Fix some invalid HTML	2015-08-27 11:10:20 -07:00
David Rowe	1880b263d4	Add entity search radius field to entities list	2015-08-27 11:09:55 -07:00
Brad Hefta-Gaub	7b2f944f48	Merge pull request #5561 from ericrius1/particleExtensions ... Extended Particle entity to allow for more varied effects	2015-08-27 10:45:03 -07:00
Seth Alves	b09de4ff65	fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.	2015-08-26 21:51:28 -07:00
Seth Alves	6f46832069	clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct	2015-08-25 21:30:38 -07:00
Seth Alves	405c9828b8	cargo-cult a voxel-editor tool-bar from edit.js	2015-08-25 16:41:38 -07:00
Seth Alves	d2cfca0424	fix comment typo	2015-08-25 16:41:10 -07:00
Seth Alves	91254245e4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-24 20:21:24 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
ericrius1	13892db866	removed logging	2015-08-24 11:41:03 -07:00
Howard Stearns	bb91b17314	Merge pull request #5634 from hyperlogic/tony/animation-resource-fix ... Fix for animation resources	2015-08-24 08:13:33 -07:00
Thijs Wenker	67e945b884	fix unit test	2015-08-22 03:32:53 +02:00
Anthony J. Thibault	b7009b4631	Fix for animation resources ... The problem was that the invokeMethod between the AnimationReader thread and the main thread was failing, because FBXGeometry* wasn't a registered meta type. So, I ended up normalizing the AnimationReader class to be more like GeometryReader, in that it uses singles and slots to communicate success and failure, rather then invokeMethod.	2015-08-21 16:09:06 -07:00
Thijs Wenker	d89ecc1e42	Move WebSocketServer to be accessable from Assignment-Client:Agent only.	2015-08-21 22:43:49 +02:00
Seth Alves	105470bf26	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-21 11:02:16 -07:00
Seth Alves	2c840ae0cc	change default polyvox surface to edged-cubic and turn some voxels on when a polyvox is first rezzed	2015-08-21 11:02:11 -07:00
Thijs Wenker	fd82f05307	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-21 19:29:38 +02:00
Thijs Wenker	55fd847636	removed unused code, renamed UnitTest.ready() to UnitTest.done()	2015-08-21 19:07:33 +02:00
Brad Davis	1e5f9b0442	Merge pull request #5624 from PhilipRosedale/master ... First pass, grenade and basketball toys.	2015-08-20 23:56:44 -07:00
Philip Rosedale	cee570d2b2	First pass at basketball, just appears in front of you with some reasonable values	2015-08-20 23:06:05 -07:00
Philip Rosedale	7284e3aa3c	added a little bit of spin, too.	2015-08-20 22:20:51 -07:00