26251 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eric Levin	45331e5a0e	removed sounds from grab script	2015-06-01 09:37:54 -07:00
Philip Rosedale	63ae711015	Merge pull request #5005 from howard-stearns/sound-parameter-tweaks ... Sound parameter tweaks	2015-06-01 09:37:36 -07:00
Eric Levin	8a191a661d	adding flag for points changed	2015-06-01 09:35:32 -07:00
ZappoMan	1b8572640b	more hacking sams tweaks	2015-06-01 09:07:32 -07:00
Howard Stearns	6a57d52b22	Merge branch 'master' of https://github.com/highfidelity/hifi into sound-parameter-tweaks	2015-06-01 09:07:20 -07:00
David Rowe	9a8bb67f37	Tidy address bar dialog code	2015-06-01 09:01:11 -07:00
David Rowe	e41b4c1b7b	Add new address bar dialog error message ... Implemented as a new simple InformationDialog so that can try it out without reworking MessageDialog immediately for all QML UI.	2015-06-01 09:01:11 -07:00
David Rowe	05e251eba4	Add icon to address bar dialog	2015-06-01 09:01:10 -07:00
David Rowe	881941b64d	Restyle address bar dialog ... Made the dialog a stand-alone QML file that doesn't inherit from other dialog QML files so that don't need to rework all dialogs right now.	2015-06-01 09:01:09 -07:00
David Rowe	a43593c3b2	Dialog opacity transition tidying	2015-06-01 09:01:08 -07:00
David Rowe	2a931119bd	Replace expand/collapse dialog animation with fade in/out	2015-06-01 09:01:08 -07:00
Seth Alves	d04b61d6a8	oops	2015-06-01 07:16:16 -07:00
Seth Alves	00af0a4376	trying to make thing behave when voxel-space is resized	2015-06-01 07:15:37 -07:00
Sam Gateau	c10384f91b	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-31 23:20:49 -07:00
Brad Hefta-Gaub	c002a0f990	Merge pull request #5011 from samcake/daft ... TEAM TEACHING: Adding the update mechanism for the Item's payload of the scene	2015-05-31 20:46:56 -07:00
Sam Gateau	83c4a52454	Cleaning for PR	2015-05-31 19:34:03 -07:00
Sam Gateau	33d397a440	A fist update solution for the item	2015-05-31 19:10:37 -07:00
Eric Levin	9ca5310c21	cleaned up another qDebugging line	2015-05-31 15:33:51 -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
Eric Levin	27b59b5f72	fixed bug in qvec unpacking code	2015-05-31 14:46:20 -07:00
Eric Levin	5e22af8643	points and line width persistent accross clients	2015-05-31 14:21:28 -07:00
Sam Gateau	4c817547b7	Merging with Brad's branch and trying to get the rendering working	2015-05-31 14:02:20 -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	f955cb45b2	keep track of number of non-zero voxels, use this information when deciding on shape-type	2015-05-30 18:14:54 -07:00
Seth Alves	ad71d7b7a2	allow changing of voxel-volume-size with edit.js	2015-05-30 18:14:36 -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
Philip Rosedale	396a20c72d	Merge pull request #5006 from ericrius1/brownianFun ... added brownianFun script to apply random forces to balls in a pen	2015-05-30 15:25:38 -07:00
Sam Gateau	ddec8fd26f	Trying to find a good solution for update message & data	2015-05-30 13:57:05 -07:00
ZappoMan	34fd1bd470	added debugging	2015-05-30 08:45:02 -07:00
ZappoMan	a0683b2847	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-29 21:57:47 -07:00
ZappoMan	0124f98340	more hacking on rendering model parts	2015-05-29 21:56:24 -07:00
Eric Levin	cb72b620cf	printing bytes out correctly	2015-05-29 19:42:07 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Eric Levin	8dda86f80d	added brownianFun script to apply random forces to balls in a pen	2015-05-29 17:02:51 -07:00
Eric Levin	7d5dd278a1	adding unpacking	2015-05-29 16:54:40 -07:00
Sam Gondelman	c19115a485	actually fixed billboard	2015-05-29 16:53:01 -07:00
Sam Gondelman	4c83c6918d	fixed avatar billboards not displaying	2015-05-29 16:44:16 -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	11844463d1	Merge pull request #4915 from AndrewMeadows/isothermal ... DO NOT MERGE grabHockey.js script can safely manipulate misc objects again	2015-05-29 16:07:32 -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
Sam Gateau	7bde81e95f	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft	2015-05-29 15:50:31 -07:00
Sam Gateau	f04f3bda72	Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme	2015-05-29 15:44:14 -07:00
samcake	f8a90684ce	Merge pull request #5000 from huffman/scene-overlay ... Team Teaching - Move overlay rendering to Scene pipeline	2015-05-29 15:31:46 -07:00
Brad Hefta-Gaub	c71519bfb1	Merge pull request #4996 from samcake/punk ... TEAM TEACHING: Culling, LOD and Depth sort added to DrawSceneTask	2015-05-29 15:06:17 -07:00
Ryan Huffman	b37a023041	Remove all overlays from Scene on desctruction	2015-05-29 14:55:53 -07:00