357 commits

Author	SHA1	Message	Date
Seth Alves	b425cc6491	merge from upstream	2015-06-05 11:56:33 -07:00
Andrew Meadows	53fa6cf0b2	Merge pull request #5040 from jherico/web-entities-fix ... Fixing web entity glow and 'back' behavior	2015-06-05 10:46:58 -07:00
Seth Alves	4e10c28b41	merge from upstream	2015-06-05 10:31:13 -07:00
Seth Alves	edb3622c85	Merge pull request #5037 from AndrewMeadows/inertia ... collision groups for physical objects	2015-06-05 10:26:28 -07:00
Andrew Meadows	08b64666fe	Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume ... Smooth initial crash volume	2015-06-05 08:40:09 -07:00
Seth Alves	9a67f35b59	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-04 19:02:46 -07:00
Eric Levin	5e15c14539	added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"	2015-06-04 16:45:32 -07:00
Howard Stearns	407d3b6a6e	Pitch is dependent on (largest dimension of) minimum bounding, not max. ... Adjust sound range of full volume.	2015-06-04 14:23:51 -07:00
Seth Alves	5f60ad3b51	put back unused variables as commented out -- there is a comment lower down that talks about them	2015-06-04 12:39:48 -07:00
Brad Davis	7f0a7b4f7e	Fixing web entity glow and 'back' behavior	2015-06-03 17:15:50 -07:00
Andrew Meadows	b0ca2df3aa	move API from PhysicsEngine to ObjectMotionState	2015-06-03 14:56:04 -07:00
Seth Alves	57c3a14b6a	quiet compiler	2015-06-03 11:18:38 -07:00
Howard Stearns	407746b842	Fix (consistent) typo in non-magic-number constant's name.	2015-06-03 10:38:20 -07:00
Howard Stearns	c036b5fd4b	Actually commit the changes this time!	2015-06-03 10:19:28 -07:00
Andrew Meadows	2702e07863	Merge pull request #5015 from sethalves/polyvox ... PolyVox improvements -- depends on #5008	2015-06-02 14:34:49 -07:00
Brad Hefta-Gaub	2a8e758559	Merge pull request #5010 from ericrius1/lineEntity ... Modified the line entity to take two new properties: lineWidth and linePoints	2015-06-02 14:25:44 -07:00
Eric Levin	7527efc2d6	removed unsuded variable	2015-06-02 13:58:09 -07:00
Eric Levin	a98baef736	another code cleanup	2015-06-02 13:56:18 -07:00
Eric Levin	55ffb7f1c0	code style changes	2015-06-02 12:51:45 -07:00
Seth Alves	20d3814c1b	code review	2015-06-02 10:00:07 -07:00
Howard Stearns	0837c016c5	Update constant to use AudioConstants.h	2015-06-02 09:18:45 -07:00
Howard Stearns	622a1e3068	Pitch-shift collision sounds, and make entities-renderer depend on soxr.	2015-06-01 21:19:42 -07:00
Seth Alves	ea3f002a65	ifdef out debug pritns	2015-06-01 14:38:07 -07:00
Seth Alves	d1bb6473d9	more work on edge handling and resizing	2015-06-01 13:57:28 -07:00
Seth Alves	43a1519e29	better handling of changes to the size of voxel space. limit each dimension to 32	2015-06-01 12:01:45 -07:00
Eric Levin	5cce4edec8	fix merge conflicts attemp 1	2015-06-01 11:18:33 -07:00
Seth Alves	175926736d	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-06-01 09:59:01 -07:00
Eric Levin	7b08537574	code standards fixes	2015-06-01 09:51:24 -07:00
Eric Levin	8a191a661d	adding flag for points changed	2015-06-01 09:35:32 -07:00
Seth Alves	00af0a4376	trying to make thing behave when voxel-space is resized	2015-06-01 07:15:37 -07:00
Eric Levin	9641b11086	array of points takes absolute positions now, so script writer has an easier time	2015-05-31 14:59:09 -07:00
Eric Levin	115bf3dd25	cleaned up logging and testing code.	2015-05-31 14:52:44 -07:00
Seth Alves	cfeab893e7	fix voxelToLocalMatrix	2015-05-31 09:28:33 -07:00
Seth Alves	b9202ebfb6	added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look	2015-05-31 09:14:59 -07:00
Seth Alves	a3589788df	allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items.	2015-05-30 18:33:35 -07:00
Seth Alves	c5a0dd72ec	keep track of number of non-zero voxels, use this information when deciding on shape-type	2015-05-30 18:13:57 -07:00
Seth Alves	fe59f8846f	recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape	2015-05-30 16:43:11 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Eric Levin	7d5dd278a1	adding unpacking	2015-05-29 16:54:40 -07:00
Howard Stearns	9c56f6270e	Remove debug print.	2015-05-29 16:21:57 -07:00
Howard Stearns	6e2378e676	Sound parameter tweaks.	2015-05-29 16:19:41 -07:00
Philip Rosedale	6b9f6ff7bb	Merge pull request #4994 from AndrewMeadows/isentropic ... compute correct deltaTime for extrapolation of moving entity and other fixes	2015-05-29 16:07:10 -07:00
Eric Levin	f573645291	line entity width translating	2015-05-29 09:24:00 -07:00
Andrew Meadows	ac0609ea92	also render bbox when debugging simulator owner	2015-05-28 16:29:43 -07:00
Eric Levin	3627f03c0d	drawing lines relative to position	2015-05-28 16:00:24 -07:00
Eric Levin	533148f26d	line being sent as array	2015-05-28 15:48:31 -07:00
Eric Levin	4d4a90e9ce	removed render debugging	2015-05-28 14:30:34 -07:00
Seth Alves	94edb72b47	oops	2015-05-28 14:30:06 -07:00
Seth Alves	131827a82b	libraries/entities doesn't need polyvox, only libraries/entities-renderer	2015-05-28 14:27:49 -07:00
Eric Levin	2d66696675	line working from array of points	2015-05-28 14:18:57 -07:00