26161 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	b166e24ff5	Fix initial fade-in	2015-06-01 11:06:33 -07:00
samcake	b676036895	Merge pull request #5007 from SamGondelman/master ... Fixed avatar billboards not displaying	2015-06-01 10:54:19 -07:00
Philip Rosedale	6290f8c992	Merge pull request #5013 from ericrius1/grab ... removed sounds from grab script	2015-06-01 09:39:04 -07:00
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
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
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
Sam Gateau	4c817547b7	Merging with Brad's branch and trying to get the rendering working	2015-05-31 14:02:20 -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	8dda86f80d	added brownianFun script to apply random forces to balls in a pen	2015-05-29 17:02:51 -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
Ryan Huffman	3f5b115c67	Move _overlays after scene in Application so it destructs first	2015-05-29 14:55:32 -07:00
Sam Gateau	1bdd6139bd	Merge branch 'punk' of https://github.com/samcake/hifi into daft	2015-05-29 14:03:04 -07:00
Sam Gateau	81396ae5aa	TRying again a better compare function signature for ubunutu	2015-05-29 13:48:19 -07:00
Ryan Huffman	667dccbb87	Add Item::INVALID_ITEM_ID and use in overlays	2015-05-29 13:43:49 -07:00
Sam Gateau	98160c8d60	Reorganize the sorting classes for maybe compiling on linux gcc 4.8 ?	2015-05-29 13:31:17 -07:00
Stephen Birarda	e7ce8706a3	Merge pull request #5004 from birarda/domain-dtls ... fix debug for failed ping to DS	2015-05-29 16:21:41 -04:00
Stephen Birarda	33fde7c66d	remove extra debug	2015-05-29 13:21:24 -07:00
Sam Gateau	eef8077417	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-29 13:20:43 -07:00
Brad Hefta-Gaub	7d1cd70e89	Merge pull request #4969 from jherico/plugins_pt3 ... Working towards display plugins	2015-05-29 13:19:18 -07:00
Brad Davis	77b45e2b4a	Adding missing files	2015-05-29 12:59:55 -07:00
Brad Davis	f98305dd55	CR comments	2015-05-29 12:45:03 -07:00
Brad Hefta-Gaub	fe9c2858e0	Merge pull request #5002 from Atlante45/entities ... TEAM TEACHING - PolyVox entities render in entities Batch	2015-05-29 12:29:01 -07:00
Brad Hefta-Gaub	b2b5d0eaf7	Merge pull request #5003 from Atlante45/team-teaching ... Update team teaching	2015-05-29 12:28:09 -07:00
Stephen Birarda	2207bfaf40	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls	2015-05-29 12:06:12 -07:00
Stephen Birarda	e253687dcd	fix fail case for DS pings	2015-05-29 12:06:07 -07:00