overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 21:20:41 +02:00

Author	SHA1	Message	Date
Brad Hefta-Gaub	79023763ef	Merge pull request #4869 from ctrlaltdavid/20543 CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled	2015-05-20 14:47:31 -07:00
Howard Stearns	c5b8dd51d8	Fix https://app.asana.com/0/32622044445063/34195351184789 Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked. Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.	2015-05-20 11:07:03 -07:00
Brad Davis	827d7f6221	Merge branch 'master' into dk1	2015-05-20 09:41:20 -07:00
Andrew Meadows	f86c419988	stubbery for collidable avatars	2015-05-19 14:15:26 -07:00
Atlante45	a9a0c9f387	Render 3D overlays before entities This gets rid of some issues due to entities moving to render pipeline	2015-05-18 17:13:32 +02:00
Brad Davis	7f2552c690	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp	2015-05-16 22:38:15 -07:00
Sam Cake	e9ff06df24	FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed	2015-05-15 17:22:29 -07:00
Brad Davis	6797174b97	Fix picking in the HMD	2015-05-14 19:15:47 -07:00
Andrew Meadows	81d06e0dc3	Merge upstream/master into andrew/nova Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItemProperties.cpp	2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub	d1f52231be	Merge pull request #4863 from samcake/orange Using the skymap for ambient lighting	2015-05-14 09:12:46 -07:00
David Rowe	ff7b2016b4	Add option to auto mute microphone after lose face tracking	2015-05-14 08:50:43 -07:00
Brad Davis	c94b8b6e30	Merge branch 'master' into dk1 Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub	77019eafa7	Merge pull request #4831 from jherico/plugins_pt2 Display plugins part 2	2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub	3b7acae8a2	Merge pull request #4850 from jherico/web-entity Web entity	2015-05-13 17:02:55 -07:00
Sam Cake	d13106f4c9	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 16:00:42 -07:00
Brad Davis	3b7e8a69b5	Attempting to fix threading issues with web entities	2015-05-13 14:00:41 -07:00
Bradley Austin Davis	a0097bcff8	Fixing offscreen rendering on retina display, even without a proxy window	2015-05-13 12:26:46 -07:00
Seth Alves	80749195e6	don't ddeTracker->init if HAVE_DDE isn't set	2015-05-13 11:44:42 -07:00
Sam Cake	8324268ec8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 11:32:39 -07:00
Philip Rosedale	a5c49b7a13	Merge pull request #4813 from ctrlaltdavid/20532 CR for 20532 - Default face tracking to Use Camera for first time users	2015-05-13 11:06:46 -07:00
Brad Davis	9b6c20d93c	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00
Andrew Meadows	fb34a5ba84	renaming and cleanup	2015-05-13 08:44:10 -07:00
Philip Rosedale	b658c26799	Merge pull request #4840 from jherico/menu Only display new menu in VR mode	2015-05-13 08:15:04 -07:00
Brad Davis	a8d343bbf1	Working on web entities	2015-05-13 00:27:57 -07:00
Sam Cake	04d3f690dc	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-12 23:12:37 -07:00
Sam Cake	536fff4502	Trying to create the SH from the skybox cubemap	2015-05-12 23:11:52 -07:00
David Rowe	8a3c8e0d9a	Merge branch 'master' into 20532 Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-05-12 17:41:12 -07:00
Philip Rosedale	65277e0573	Merge pull request #4836 from ctrlaltdavid/20535 CR for #20535 - Improve DDE eyelid control	2015-05-12 17:00:02 -07:00
Brad Davis	8c4f802dbf	Merge remote-tracking branch 'upstream/master' into web-entity Conflicts: libraries/entities/src/EntityItemProperties.h libraries/entities/src/EntityTypes.h	2015-05-12 15:56:02 -07:00
Brad Davis	f42e0c696a	Merge branch 'master' into menu	2015-05-12 14:58:42 -07:00
Brad Davis	41d587bd2e	Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" This reverts commit `6e8c067bcb`. Conflicts: interface/src/Camera.h	2015-05-12 14:47:44 -07:00
samcake	6e8c067bcb	Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"	2015-05-12 14:34:43 -07:00
samcake	7c255738af	Merge pull request #4837 from jherico/dk1 Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff	2015-05-12 12:30:32 -07:00
Brad Davis	f844dcd25f	Only display new menu in VR mode	2015-05-12 09:05:24 -07:00
Clément Brisset	9bf4cf1262	Merge pull request #4830 from ZappoMan/moreZoneProperties New Zone Features	2015-05-12 14:28:01 +02:00
Brad Davis	666caf0d59	Working on fixing DK1 and santizing the transform stuff	2015-05-12 00:44:30 -07:00
Brad Hefta-Gaub	f56b5fcdcd	Merge pull request #4833 from samcake/blue Clean the cube map loading behavior	2015-05-11 18:40:42 -07:00
Seth Alves	866a6fba9b	Merge pull request #4823 from birarda/master repairs to AC stop and clean shutdown	2015-05-11 18:11:52 -07:00
David Rowe	667ad9b0cb	Add menu option to enable/disable binary webcam eyelid control	2015-05-11 17:11:51 -07:00
ZappoMan	a2a1bf4e8c	make stars fade in as sun drops below horizon	2015-05-11 16:32:27 -07:00
Stephen Birarda	68af209417	call Setting::init from Interface setupEssentials	2015-05-11 16:20:03 -07:00
Sam Gateau	f2c4e04a5a	clean up for pr	2015-05-11 14:06:10 -07:00
Brad Davis	abab54aed8	Working on display plugins	2015-05-11 13:08:53 -07:00
Brad Davis	6a5c7b8b42	Merge remote-tracking branch 'upstream/master' into plugins_pt2 Conflicts: libraries/script-engine/src/MenuItemProperties.cpp	2015-05-11 12:40:17 -07:00
Brad Davis	1624ca4120	Merge branch 'master' into plugins_pt2	2015-05-11 12:32:49 -07:00
Seth Alves	9bd101ee2a	oops	2015-05-11 12:01:59 -07:00
Seth Alves	de9e74a725	put max-octree-pps in Application rather than in the Octree	2015-05-11 12:01:13 -07:00
Seth Alves	83748096ef	max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree	2015-05-11 11:37:53 -07:00
Stephen Birarda	8c6715e4fc	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
Sam Gateau	72c3270ec6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-11 10:48:29 -07:00
Clément Brisset	421ebeb3d7	Merge pull request #4795 from birarda/sequence-numbers add sequence number support to NL, don't double send data from AvatarMixer	2015-05-11 19:23:33 +02:00
Sam Gateau	d51904b7b3	fixing file	2015-05-09 11:43:21 -07:00
Sam Gateau	5a11143a5d	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
David Rowe	5092e385b1	Disable "calibrate" menu item if webcam isn't enabled	2015-05-08 18:39:22 -07:00
Bradley Austin Davis	230d1701b4	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-08 17:14:39 -07:00
Brad Hefta-Gaub	a517e773f4	Merge pull request #4786 from ctrlaltdavid/20530 CR for #20530 - Add DDE calibration	2015-05-08 16:25:02 -07:00
Stephen Birarda	ddb52348bc	don't force use of Settings to all QCoreApplication	2015-05-08 16:24:39 -07:00
Bradley Austin Davis	9f8a384c72	Merge branch 'plugins_pt2' into plugins	2015-05-08 16:05:51 -07:00
Brad Hefta-Gaub	bfb2b278ee	Merge pull request #4791 from jherico/scale Fixing scale resolution issues	2015-05-08 15:54:24 -07:00
Bradley Austin Davis	03bd17ed49	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
Bradley Austin Davis	0751443a01	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
Bradley Austin Davis	9974eb0357	Merge branch 'master' into plugins	2015-05-08 10:49:28 -07:00
Clément Brisset	55bcb992d9	Merge pull request #4796 from sethalves/fix-octree-max-pps Fix octree max pps	2015-05-08 16:28:42 +02:00
Clément Brisset	cc4ec8edda	Merge pull request #4799 from ctrlaltdavid/destroy-trackers Delete Leap and RealSense devices on shutdown	2015-05-08 16:17:00 +02:00
Bradley Austin Davis	5e821b4447	Updating plugins	2015-05-07 22:32:28 -07:00
David Rowe	e20df0e2bf	Delete Leap and RealSense devices on shutdown Leaving them running prevents a clean shutdown on Windows when running Interface.exe from a command line: the interface.exe process stays alive preventing Interface from being run again from the command line without manually terminating the running process.	2015-05-07 18:28:49 -07:00
Seth Alves	c1e3500f3c	voxelDetailsForCode returns a ratio, cubeinfrustrum takes meters	2015-05-07 16:01:08 -07:00
Stephen Birarda	305835ea79	Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers	2015-05-07 15:38:35 -07:00
David Rowe	cac6ae1148	Merge branch 'master' into 20530	2015-05-07 13:34:42 -07:00
Bradley Austin Davis	efa88ba122	Merge branch 'scale' into plugins	2015-05-07 12:52:13 -07:00
Bradley Austin Davis	c31d36be59	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
Seth Alves	d52a45b57e	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
Atlante45	cafaeed822	Restore polygon mode after entities rendering Default setting are causing issues so we just reset the polygon mode since this won't matter once everything has moved to the new rendering pipeline.	2015-05-07 13:34:22 +02:00
Bradley Austin Davis	b73ce81a2d	Working on plugin architecture	2015-05-06 22:28:34 -07:00
Bradley Austin Davis	28c873ba59	Merge branch 'master' into plugins	2015-05-06 16:37:59 -07:00
David Rowe	afce981d83	Merge branch 'master' into 20530 Conflicts: interface/src/Application.cpp interface/src/devices/DdeFaceTracker.cpp interface/src/devices/DdeFaceTracker.h	2015-05-06 16:27:33 -07:00
Seth Alves	e73503a53d	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-06 16:05:13 -07:00
Andrew Meadows	584b643791	lock entitySimulation during physics simulation	2015-05-06 16:01:00 -07:00
Seth Alves	a057d7dfa3	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 14:41:54 -07:00
Brad Hefta-Gaub	5551997cdc	Merge pull request #4780 from samcake/blue Add support for Skybox and rendering path of background according to Zones	2015-05-06 14:41:06 -07:00
Seth Alves	fe06ce2931	pull from upstream	2015-05-06 14:31:22 -07:00
Bradley Austin Davis	77a9f7fa2a	Merge branch 'plugins_pt1' into plugins	2015-05-06 14:22:13 -07:00
Sam Gateau	1b5185abeb	fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome	2015-05-06 12:19:19 -07:00
Seth Alves	a72ac3ead2	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 12:19:04 -07:00
Bradley Austin Davis	ea6f840fdb	Merge remote-tracking branch 'upstream/master' into plugins_pt1	2015-05-06 12:18:04 -07:00
Brad Hefta-Gaub	4de6d645e5	Merge pull request #4701 from jherico/infoview Infoviews & Browser in QML	2015-05-06 12:12:21 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
Bradley Austin Davis	4c22e637d7	Merge remote-tracking branch 'upstream/master' into off_axis	2015-05-06 11:28:03 -07:00
Bradley Austin Davis	c832fd969a	Removing off-axis projection from menu	2015-05-06 11:26:46 -07:00
Seth Alves	238a41f2b9	pull from upstream	2015-05-06 11:22:18 -07:00
Stephen Birarda	5b1514a390	Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers	2015-05-06 10:12:17 -07:00
Philip Rosedale	e2541c4243	Merge pull request #4740 from ctrlaltdavid/20518 CR for #20518 - Mute camera button next to mute audio button	2015-05-06 09:54:42 -07:00
Sam Gateau	c86a8b3944	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-06 09:54:08 -07:00
Sam Gateau	dc81a3ecc2	Cube texture are working with the GL backend, useing it in SKybox successfullly	2015-05-06 09:53:36 -07:00
Seth Alves	ff104bb915	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 08:55:06 -07:00
David Rowe	91a06ea3c4	Add "Calibrate Camera" menu item for DDE face tracking	2015-05-05 21:15:32 -07:00
David Rowe	b519884609	Fix lobby not displaying in HMD mode This usage of Glower is similar to that in renderAvatarBillboard(). Both may indicate that something needs changing in the graphics pipeline.	2015-05-05 20:54:12 -07:00
David Rowe	1c21874f00	Make face tracker mute action start / stop face tracker	2015-05-05 16:51:31 -07:00
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -07:00
Seth Alves	8aafce6382	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-05 12:53:28 -07:00
Stephen Birarda	6b3cf1ba4a	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
Sam Gateau	13482575d2	merge	2015-05-05 12:03:45 -07:00
Sam Gateau	6d02d4d25e	adding skybox step by step	2015-05-05 11:40:00 -07:00
samcake	61f6139f4f	Merge pull request #4764 from ZappoMan/atmosphereInZones First cut at adding "Atmosphere" support to zone	2015-05-05 11:00:58 -07:00
Bradley Austin Davis	d2a8681139	Merge branch 'master' into infoview	2015-05-05 10:31:19 -07:00
Andrew Meadows	aa5a59c3dc	merge upstream/master into andrew/nova Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp	2015-05-05 10:24:17 -07:00
Philip Rosedale	d52d3513a4	Merge pull request #4768 from jherico/track-camera Remove camera wobble caused by having a face tracker enabled	2015-05-04 18:01:47 -07:00
ZappoMan	77232e35f8	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones	2015-05-04 17:16:33 -07:00
Bradley Austin Davis	dc1b5a262f	Remove camera wobble cause by the face tracker and by idle animations	2015-05-04 17:03:33 -07:00
ZappoMan	32ef0c2010	removed some dead code	2015-05-04 15:49:21 -07:00
ZappoMan	741323e6c1	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
ZappoMan	4561c59203	wire up zone to environment atmosphere rendering	2015-05-04 13:49:43 -07:00
Bradley Austin Davis	098a9bd70e	Fixing sixense and restoring lookat	2015-05-04 13:10:16 -07:00
Bradley Austin Davis	8119e3d629	Merging back from part 1	2015-05-04 11:35:28 -07:00
Sam Gateau	936eefd4f0	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-04 10:41:32 -07:00
Sam Gateau	c7153bcc14	fixing commetns from review	2015-05-04 10:40:11 -07:00
Bradley Austin Davis	fb3e309a64	Merge branch 'master' into plugins_pt1	2015-05-04 10:00:13 -07:00
Sam Gateau	b7bacccce7	Fine tunning on windows	2015-05-04 00:54:54 -07:00
samcake	8e65ce34d1	FINe tune the scales for the Mac Book	2015-05-03 23:47:43 -07:00
samcake	d2e61dba05	Make the nw mapper work for th einputs	2015-05-03 17:34:39 -07:00
Sam Gateau	c9b296693c	bringing the UserInputMapper to the application	2015-05-03 15:45:19 -07:00
Seth Alves	0341caad95	quiet compiler	2015-05-03 11:10:52 -07:00
Andrew Meadows	fef84730bf	remake foundation for CollisionEvents	2015-05-03 09:27:15 -07:00
Brad Davis	e72756ab99	Merge remote-tracking branch 'upstream/master' into plugins_pt1 Conflicts: libraries/render-utils/src/TextureCache.cpp	2015-05-02 00:51:50 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Philip Rosedale	d7cc76e48b	Merge pull request #4735 from jherico/menu_fix Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-05-02 00:35:49 -07:00
Andrew Meadows	0a102575ee	fix simulation ownership infection	2015-05-01 16:56:00 -07:00
Brad Davis	e6c241b75b	Merge branch 'master' into plugins	2015-05-01 15:16:06 -07:00
Brad Davis	d8415ce79b	Working on display plugins	2015-05-01 15:14:50 -07:00
Andrew Meadows	3031d55c8e	merge upstream/master into andrew/nova	2015-05-01 11:03:51 -07:00
Andrew Meadows	b023fe582a	make things compile	2015-05-01 10:44:50 -07:00
Brad Davis	a482fa0a6d	Working on plugin rendering model:	2015-05-01 10:35:15 -07:00
Andrew Meadows	4cb469dd79	cleanup how MotionStates are deleted from physics also fixed some compile errors removed cruft	2015-05-01 08:28:32 -07:00
David Rowe	528f73897c	Make double click face tracking toggle button reset tracking	2015-04-30 23:14:23 -07:00
David Rowe	bc05159504	Add face tracking toggle button beside microphone toggle button	2015-04-30 23:14:22 -07:00
David Rowe	d053379831	Add "Mute Face Tracking" menu item	2015-04-30 23:14:21 -07:00
Brad Davis	ba4ae3762d	Working on merging in master	2015-04-30 22:01:03 -07:00
Brad Davis	57b7be3abe	Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-04-30 17:43:16 -07:00
Brad Davis	031b294ae5	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/Camera.cpp interface/src/Camera.h interface/src/ui/ApplicationOverlay.cpp interface/src/ui/ApplicationOverlay.h libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/GlowEffect.h libraries/render-utils/src/TextureCache.cpp	2015-04-30 12:14:07 -07:00
Brad Davis	2fa92af4ab	Merge branch 'plugins2' into plugins Conflicts: interface/src/Application.cpp interface/src/plugins/Plugin.h interface/src/plugins/render/OculusBaseRenderPlugin.cpp interface/src/plugins/render/OculusBaseRenderPlugin.h interface/src/plugins/render/RenderPlugin.h interface/src/plugins/render/Tv3dRenderPlugin.cpp interface/src/plugins/render/Tv3dRenderPlugin.h interface/src/ui/ApplicationOverlay.cpp interface/src/ui/ApplicationOverlay.h	2015-04-30 11:04:06 -07:00
Brad Hefta-Gaub	40d2e97d44	Merge pull request #4673 from ctrlaltdavid/20496 CR for 20496 - Modify lobby.js to work as avatar selector	2015-04-29 21:51:08 -07:00
Andrew Meadows	31ab16ac62	move stuff into ObjectMotionState	2015-04-29 16:16:44 -07:00
Andrew Meadows	ab38572620	new PhysicsEngine API is mostly in place doesn't compile, of course large code movements are done non-physical kinematics have been lost -- will readd in PhysicalEntitySimuation class	2015-04-29 09:48:02 -07:00
Bradley Austin Davis	c4349e797f	Merge remote-tracking branch 'upstream/master' into infoview	2015-04-29 00:15:32 -07:00
Brad Davis	0fb8884f9c	Merge branch 'browser' into infoview Conflicts: tests/ui/src/main.cpp	2015-04-28 17:54:04 -07:00
Stephen Birarda	404cd67bb7	Merge pull request #4716 from sethalves/assignment-client-exits assignment-client shouldn't try to save contents of its nonexistent address bar	2015-04-28 19:40:44 -04:00
Andrew Meadows	14b6ee608a	more PhysicalEntitySimulation implementation with changes to API's accordingly (does not compile yet)	2015-04-28 15:07:37 -07:00
Seth Alves	28ad80936a	assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.	2015-04-28 13:21:14 -07:00
Andrew Meadows	087d0a027d	merge upstream/master into andrew/nova	2015-04-28 10:07:49 -07:00
Andrew Meadows	34974272af	proposal for PhysicsEngine API in Application	2015-04-28 10:06:05 -07:00
Brad Davis	f467abcf91	Merge branch 'vr_menus' into browser	2015-04-28 01:18:03 -07:00
Brad Davis	9836ffed97	Merge branch 'vr_menus' into infoview Conflicts: tests/ui/src/main.cpp	2015-04-28 01:17:51 -07:00
Brad Davis	b4e9dbedbc	Merge remote-tracking branch 'upstream/master' into vr_menus	2015-04-28 00:28:57 -07:00
Brad Davis	f86b9f62b9	Adding key to trigger a browser window	2015-04-27 23:16:35 -07:00
Brad Davis	b0eccc40c2	Fix crash cause when Menu::instance() is before offscreen ui startup	2015-04-27 22:58:09 -07:00
Brad Davis	7bd8bbf565	Merge branch 'vr_menus' into infoview	2015-04-27 18:33:45 -07:00
Brad Davis	59b8b80148	Merge remote-tracking branch 'upstream/master' into vr_menus Conflicts: interface/src/Menu.cpp	2015-04-27 16:02:13 -07:00
Andrew Meadows	72deb2e49b	merge upstream/master into andrew/thermonuclear Conflicts: libraries/entities/src/EntityItem.h libraries/physics/src/EntityMotionState.cpp	2015-04-27 12:54:21 -07:00
Seth Alves	bdc6bb3c2d	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
Brad Davis	14b660baf7	Merge branch 'vr_menus' into infoview Conflicts: tests/ui/src/main.cpp	2015-04-27 11:43:49 -07:00
Brad Davis	d55d467d3f	Tweaking VR menu for PR	2015-04-27 11:35:57 -07:00
Seth Alves	b23427a3c8	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 10:32:47 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Brad Davis	b216689b45	Removing old infoview, testing new dialogs	2015-04-27 00:02:11 -07:00
Brad Davis	198224c4ec	Merge branch 'ui-refactor' into menu2	2015-04-25 16:48:05 -07:00
Brad Davis	7c16fd05c1	Merge branch 'master' into ui-refactor	2015-04-25 16:35:43 -07:00
Brad Davis	a96f69a673	Switching to a wrapper mechanism for VR menus	2015-04-25 16:20:15 -07:00
Brad Davis	ee30588fd4	More menu work	2015-04-25 10:41:06 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Brad Davis	fbdb9b143e	Merge branch 'ui-refactor' into m_and_m Conflicts: interface/resources/qml/HifiMenu.qml interface/resources/qml/MessageDialog.qml interface/resources/qml/Root.qml interface/resources/qml/TestRoot.qml interface/resources/qml/controls/Dialog.qml interface/src/Application.cpp interface/src/ui/LoginDialog.cpp libraries/ui/src/MessageDialog.cpp libraries/ui/src/MessageDialog.h libraries/ui/src/OffscreenQmlDialog.h libraries/ui/src/OffscreenUi.cpp libraries/ui/src/OffscreenUi.h tests/ui/src/main.cpp	2015-04-24 18:02:12 -07:00
Brad Davis	dab8761c71	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-24 16:46:48 -07:00
Brad Davis	08d60c6a01	Fixing message dialog	2015-04-24 16:19:39 -07:00
Brad Hefta-Gaub	dbb1e3c820	Merge pull request #4682 from jherico/offscreen Attempting to fix backspace issue in new UI	2015-04-24 16:10:42 -07:00
Andrew Meadows	7cd9023e23	build Avatar shape on SkeletonModel load	2015-04-24 13:26:26 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
Atlante45	fb5a0c8b01	Only send touchUpdateEvent if it is one ie. not for touchBeginEvent	2015-04-24 18:50:45 +02:00
Brad Davis	f17387fab4	Working on menus	2015-04-23 21:23:21 -07:00
Brad Davis	8cb298a55b	Working on menus	2015-04-23 14:23:15 -07:00
Brad Davis	8269b9925b	Adding first pass at message box	2015-04-23 14:23:12 -07:00
Brad Davis	a9d65f168b	Working on marketplace dialog	2015-04-23 14:23:11 -07:00
Brad Davis	ae804357d8	Attempting to fix backspace issue in new UI	2015-04-23 14:10:54 -07:00
Brad Hefta-Gaub	82d3302d1b	Merge pull request #4644 from jherico/offscreen Working on new-UI implementations of address bar and login	2015-04-23 07:17:45 -07:00
Brad Davis	8d8c4babba	Coding standard fixes	2015-04-22 19:06:22 -07:00
David Rowe	35e2b87a70	Rename DDE menu items	2015-04-22 13:15:57 -07:00
David Rowe	649d4736cd	Merge branch 'master' into dde-miscellaneous	2015-04-22 13:00:40 -07:00
David Rowe	63d0efcdec	Open and close avatar selector with Ctrl-A	2015-04-22 09:48:09 -07:00
Brad Davis	7a33474245	Merge remote-tracking branch 'upstream/master' into offscreen Conflicts: interface/src/Menu.cpp	2015-04-21 13:02:38 -07:00
Seth Alves	284215d46a	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-21 09:53:15 -07:00
Seth Alves	64c23b8e8b	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 16:56:24 -07:00
David Rowe	1af17fa9e7	Use voice to control DDE mouth Add voice blend coefficient values to DDE values.	2015-04-20 16:14:36 -07:00
Clément Brisset	b64d7fc17c	Merge pull request #4662 from birarda/remove-visage remove visage support	2015-04-20 20:06:21 +02:00
David Rowe	8268dc95ac	Include DDE reset in sensors reset	2015-04-20 10:28:17 -07:00
Seth Alves	f452e47577	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 08:49:33 -07:00
Brad Davis	16efa2a46f	Improving toggle visibility and loading behavior	2015-04-17 16:59:04 -07:00
Stephen Birarda	3055359d4c	remove visage references from Application	2015-04-17 13:40:18 -07:00
Sam Gateau	11879f6142	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 13:04:00 -07:00
Philip Rosedale	3814fbc0c2	Merge pull request #4658 from ctrlaltdavid/dde-filtering DO NOT MERGE - DDE filtering	2015-04-17 15:41:03 -04:00
Seth Alves	292ba20cf3	pull andrew's measure-acceleration branch	2015-04-17 11:35:12 -07:00
Sam Gateau	f1e0d5855e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 11:33:39 -07:00
David Rowe	6b085ca668	Move method out of Menu class	2015-04-17 10:53:04 -07:00
Clément Brisset	516acee1c7	Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart Fix stop/reload all scripts affecting already-stopped scripts	2015-04-17 16:29:23 +02:00
Bradley Austin Davis	759acfa175	Working on getting the offscreen UI working on retina	2015-04-16 19:30:31 -07:00
Sam Gateau	b5b146b81b	Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution Expose these to javascript	2015-04-16 17:35:37 -07:00
Brad Davis	ce6b7e7aec	Merge branch 'master' into offscreen Conflicts: interface/src/Menu.cpp	2015-04-16 14:02:40 -07:00
Andrew Meadows	1acb90e23a	merge upstream/master into andrew/isothermal	2015-04-16 13:48:47 -07:00
Bradley Austin Davis	f700607a65	Working on OSX functionality	2015-04-15 23:08:55 -07:00
Sam Gateau	cd1bbb2855	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-15 10:16:28 -07:00
Clément Brisset	d6ee1c708d	Merge pull request #4642 from ZappoMan/avatarUI New Avatar UI	2015-04-15 19:13:23 +02:00
Brad Davis	1563b05278	Merge branch 'master' into offscreen	2015-04-15 10:01:15 -07:00
Ryan Huffman	f8e4ff8072	Update Application:stopAllScripts to skip finished scripts	2015-04-15 09:54:30 -07:00
Sam Gateau	5ebbdaca05	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-15 09:00:50 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Sam Gateau	fec52f6b10	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
ZappoMan	ae16bab7c2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI Conflicts: interface/src/Application.cpp interface/src/Application.h	2015-04-14 13:13:15 -07:00
Brad Davis	bdfb6449f7	Working on decoupling rendering	2015-04-14 12:08:39 -07:00
Andrew Meadows	abb40ca080	cleanup: split stats dump out of stepSimulation	2015-04-14 09:00:36 -07:00
Sam Gateau	c34c5f6075	adding the Fremabuffer to be used for shadows and main rendering	2015-04-14 08:47:52 -07:00
Brad Davis	9f0d410387	Working on decoupling rendering	2015-04-13 23:15:51 -07:00
David Rowe	3b6a35c38f	Merge branch 'master' into 20447	2015-04-13 17:22:34 -07:00
Thijs Wenker	cf403a7ad8	Merge branch 'master' of https://github.com/worklist/hifi into 20367	2015-04-09 23:47:20 +02:00
Thijs Wenker	0cb5ee5bd1	- Scripts JS object renamed to ScriptDiscoveryService. - Renamed Example script file for the ScriptDiscoveryService. - Moved ScriptDiscoveryService functions to the RunningScriptWidget	2015-04-09 23:46:49 +02:00
Brad Davis	9b34003e2d	Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close Quit VRMode before aboutToQuit runs	2015-04-07 17:06:29 -07:00
Brad Davis	c1a1157df9	Merge branch 'master' into menu	2015-04-07 14:41:17 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	fc5b442e12	interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging	2015-04-07 09:15:11 -07:00
Thijs Wenker	a783f03025	New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional.	2015-04-07 16:48:11 +02:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Thijs Wenker	484b014fa7	Merge branch 'master' of https://github.com/worklist/hifi into 20367	2015-04-07 01:07:04 +02:00
Thijs Wenker	2b23108e61	ScriptsScripting Interface	2015-04-07 01:06:39 +02:00
David Rowe	ce104e8c40	Merge branch 'master' into 20447	2015-04-06 15:18:19 -07:00
Sam Gateau	ecdffadcb7	trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct	2015-04-06 10:17:31 -07:00
Sam Gateau	d6f74aa0ad	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-06 09:56:16 -07:00
Atlante45	a3f8076641	Quit VRMode before aboutToQuit runs	2015-04-06 17:55:48 +02:00
Sam Gateau	10269bd556	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-05 18:37:28 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
David Rowe	765d66eee5	Fix running without DDE available	2015-04-04 19:20:44 -07:00
David Rowe	1eb5716ab7	Shut down DDE when Interface shuts down	2015-04-04 19:04:47 -07:00
Seth Alves	e06dada756	Merge pull request #4592 from AndrewMeadows/thermonuclear profiling for physics simulation	2015-04-04 15:00:44 -07:00
David Rowe	f6bf1d4141	Disable DDE code if not Windows or OSX	2015-04-03 17:41:19 -07:00
ZappoMan	0bc1b02895	improvements to tracking model names	2015-04-03 17:24:53 -07:00
ZappoMan	50479d5d5e	set name to Default when using default url	2015-04-03 17:06:54 -07:00
ZappoMan	1a463a0256	more work on improved avatar UI adding model names and backward compatible support	2015-04-03 17:03:22 -07:00
ZappoMan	aaf191b6dc	first cut at new avatar preferences UI	2015-04-03 14:31:43 -07:00
Sam Gateau	423434af10	FInd one of the issue with shadows for avatars	2015-04-03 12:34:30 -07:00
Sam Gateau	7718680091	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-03 10:33:24 -07:00
Bradley Austin Davis	44c9d4a742	Working on removing some of the warnings in the xcode build	2015-04-02 16:12:44 -07:00
Andrew Meadows	2089a8c2dd	temporary debug setup: dump physics stats on F key	2015-04-02 15:33:06 -07:00
Andrew Meadows	eaef08abd5	add break to Key_Comma switch case	2015-04-02 15:25:55 -07:00
Sam Gateau	f96079f4f9	fixed the getViewFUrstum warning in DEBUG mode	2015-04-02 14:43:15 -07:00
Brad Davis	605cf19f6f	Merge pull request #4565 from ctrlaltdavid/20422 CR for #20422 - Add the ability to manage friends via Interface	2015-04-02 14:10:40 -07:00
Andrew Meadows	a824403132	Merge pull request #4582 from sethalves/island Comma toggles rendering of collision hulls; more changes to vhacd stuff	2015-04-02 10:37:17 -07:00
Bradley Austin Davis	8a757a4b6e	Further work on menu handling on OSX in fullscreen / VR mode	2015-04-02 10:27:11 -07:00
Seth Alves	41ec2fdbe3	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-02 09:19:54 -07:00
Andrew Meadows	fc4e6e9355	merge upstream/master into andrew/bispinor	2015-04-02 09:04:15 -07:00
Clément Brisset	01dc1b058c	Merge pull request #4580 from birarda/master use non-persistent settings to avoid lobby crash confusion	2015-04-02 17:37:24 +02:00
David Rowe	49de54de48	Use improved WebWindowClass for friends window	2015-04-01 18:58:59 -07:00
Seth Alves	abf83bcf9e	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-01 18:26:26 -07:00
Seth Alves	79b1a6aeb0	comma key toggles rendering of collision hulls	2015-04-01 17:45:47 -07:00
Stephen Birarda	b27a86fb25	always render yourself, handle change of render values elsewhere	2015-04-01 17:36:43 -07:00
Andrew Meadows	b537625e59	Merge pull request #4574 from ZappoMan/crashOnExit fix crash on shutdown related to entity scripts connecting to signals	2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub	ad27d7353b	Merge pull request #4386 from jherico/oculus_old_renderer DO NOT MERGE - Update Oculus SDK integration	2015-04-01 17:17:32 -07:00
Stephen Birarda	ee088e12f3	leverage scene scripting values to toggle rendering	2015-04-01 17:06:06 -07:00
Sam Gateau	4a6046b07c	tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much	2015-04-01 15:50:04 -07:00
Andrew Meadows	b37384d759	exit hover now not quite automatic when over floor remove MyAvatar::jump() method for more general API	2015-04-01 15:13:27 -07:00
David Rowe	96e888864a	Merge branch 'master' into 20422	2015-04-01 14:56:48 -07:00
Bradley Austin Davis	3b77118baa	Merge branch 'master' into oculus_old_renderer	2015-04-01 14:09:29 -07:00
Andrew Meadows	245729cba8	fix for avatar unable to jump into hover on mac	2015-04-01 13:47:40 -07:00
ZappoMan	aac824fb99	fix crash on shutdown	2015-04-01 13:47:25 -07:00
Sam Gateau	3b92910a91	Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters	2015-04-01 12:22:35 -07:00
David Rowe	e519928320	Move friends window to own class	2015-04-01 11:38:32 -07:00
ZappoMan	827e37b920	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-01 09:09:50 -07:00
Sam Gateau	ad11503466	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-31 23:12:17 -07:00
David Rowe	e06f28b7c5	Merge branch 'master' into 20422 Conflicts: examples/users.js interface/src/Application.cpp	2015-03-31 21:01:54 -07:00
Bradley Austin Davis	db9ab3e699	Merge branch 'master' into oculus_old_renderer	2015-03-31 18:25:34 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00
Stephen Birarda	61806935bb	add a networking constants class with metaverse URL	2015-03-31 16:40:21 -07:00
ZappoMan	d68143675a	first simple pass at using marketplace windows in preferences	2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub	b6f670a8d8	Merge pull request #4554 from samcake/yellow Better support for Nvidia Optimus Laptop	2015-03-31 15:56:01 -07:00
Bradley Austin Davis	a7eebfd002	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-31 15:42:01 -07:00
Sam Gateau	b4d11e2eb5	Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used	2015-03-31 15:18:59 -07:00
David Rowe	154dacf791	Fix typo	2015-03-31 14:21:56 -07:00
Bradley Austin Davis	56b5ad2e6b	Merge branch 'master' into oculus_old_renderer	2015-03-31 11:10:23 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Philip Rosedale	ce05d3104a	Merge pull request #4535 from ZappoMan/scriptCaching Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts	2015-03-30 18:02:52 -07:00
ZappoMan	3475bfb396	fix typos	2015-03-30 17:04:47 -07:00
Bradley Austin Davis	5e5bdec88d	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
Andrew Meadows	9b13f186e3	remove character from PhysicsEngine on shutdown	2015-03-30 15:51:58 -07:00
ZappoMan	36657c9473	first cut at script caching	2015-03-30 14:36:48 -07:00
Seth Alves	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Philip Rosedale	099a2b5319	Merge pull request #4521 from ctrlaltdavid/20416 CR for Job #20416 - Update notification.js to include a notification about being blocked from a server	2015-03-30 08:49:29 -07:00
ZappoMan	3bda65f4fe	if installing a body, and you have no head, make your head the default head	2015-03-28 19:19:11 -07:00
ZappoMan	80df8caefb	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-03-28 18:43:03 -07:00
David Rowe	be69c0b58f	Add add/remove friends menu item This must display the dialog whether or not users.js is running. Both C++ and JavaScript need to open or restore the same dialog, hence a new dialog rather than using WebWindow with its JavaScript baggage.	2015-03-28 13:05:23 -07:00
ZappoMan	002fba8018	first cut at predicting FST type for set avatar	2015-03-27 16:56:03 -07:00
Seth Alves	fd69a54f10	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-27 15:55:20 -07:00
Andrew Meadows	be5fdbf217	enable avatar collisions by default also remove old gravity features	2015-03-27 13:36:20 -07:00
David Rowe	90c1da2094	Merge branch 'master' into 20416 Conflicts: examples/notifications.js	2015-03-27 12:13:29 -07:00
Seth Alves	7da87d6e15	set up a way to request ResourceCache downloads from a non-networking thread.	2015-03-26 18:37:55 -07:00
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
Brad Hefta-Gaub	918154e407	Merge pull request #4491 from huffman/export-json Update export entities to export as JSON	2015-03-25 16:49:23 -07:00
Andrew Meadows	b87360f0f5	merge upstream/master into andrew/inertia	2015-03-24 17:41:07 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Philip Rosedale	fe61387121	Merge pull request #4498 from ZappoMan/LODUITweaks Some LOD UI Tweaks	2015-03-24 17:34:27 -07:00
ZappoMan	619428c325	move LOD FPS settings to Preferences	2015-03-24 13:32:22 -07:00
Stephen Birarda	1a6865b41b	send immediate location update when domain changes	2015-03-24 13:15:30 -07:00
Ryan Huffman	2fc0ef80d0	Add SVO_JSON_EXTENSION to accepted extensions	2015-03-24 10:40:46 -07:00
ZappoMan	fa122a227b	tweaks to the LOD Tools UI	2015-03-23 16:44:07 -07:00
Ryan Huffman	61dc31ffe7	Update export entities to export as JSON	2015-03-23 14:09:45 -07:00
David Rowe	cb6abfb2e6	Display notification if domain connection refused	2015-03-23 12:05:56 -07:00
Bradley Austin Davis	1d56266044	Merge branch 'master' into oculus_old_renderer	2015-03-20 09:56:54 -07:00
ZappoMan	5f825211df	Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars	2015-03-19 15:12:06 -07:00
ZappoMan	24132968fe	oops	2015-03-19 12:41:44 -07:00
ZappoMan	26670f9e41	remove unneeded debug	2015-03-19 12:15:12 -07:00
ZappoMan	c5314aceac	more DRYing up of code	2015-03-19 11:57:57 -07:00
ZappoMan	5814a14152	removed dead code	2015-03-19 11:42:00 -07:00
ZappoMan	3c41ecd091	cleanup accepted files implementation	2015-03-19 11:29:41 -07:00
Brad Davis	31c7c93aa3	Merge branch 'master' into oculus_old_renderer	2015-03-19 10:05:22 -07:00
ZappoMan	8e0141b8e9	first cut at fst drag/drop support	2015-03-19 08:48:13 -07:00
samcake	c0a66a05f4	Merge pull request #4463 from ZappoMan/LODTweaks MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased	2015-03-18 16:55:39 -07:00
Brad Davis	872012856f	Merge branch 'master' into oculus_old_renderer	2015-03-18 15:35:49 -07:00
Brad Davis	0c465ce2b5	Merge pull request #4460 from ZappoMan/runJSFiles MVP task - Allow a script to be added to a users "running script" from the marketplace	2015-03-18 12:52:44 -07:00
ZappoMan	8239a295cb	Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks	2015-03-18 11:54:05 -07:00
ZappoMan	a2e012f7a9	Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles	2015-03-18 11:53:19 -07:00
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Brad Davis	d066271e4e	Merging from master	2015-03-17 18:28:58 -07:00
Brad Hefta-Gaub	55d9560c9e	Merge pull request #4469 from jherico/frustumFetchCheck Fix broken aspect ratio in mirror	2015-03-17 17:06:21 -07:00
Brad Davis	1662230289	Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only	2015-03-17 16:44:29 -07:00
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28:44 -07:00
Brad Davis	c88f6f8f07	Adding some documentation on the change	2015-03-17 13:49:06 -07:00
ZappoMan	1e03335012	implement scripting interface for LODManager	2015-03-17 13:18:29 -07:00
Brad Davis	71e59cfa88	Fix: Mini-mirror doesn't render avatar head when in first person mode	2015-03-17 13:15:15 -07:00
ZappoMan	749bc1ee9b	support for loading of JS files by drag, web page urls, and openfile events	2015-03-17 08:38:39 -07:00
Atlante45	1f8a874ce6	Hide cursor in 3D TV mode too	2015-03-17 12:34:13 +01:00
Brad Davis	5aa4277d9b	Removing a superfluous clear from Application.cpp. It's only required in client distortion mode	2015-03-16 12:22:35 -07:00
Atlante45	c5010c4d55	Hide cursor at MainWindow level when in VRMode	2015-03-16 14:19:24 +01:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
Stephen Birarda	641581a825	Merge pull request #4446 from huffman/marketplace-window Marketplace window	2015-03-13 17:51:44 -07:00
Ryan Huffman	aca509d5cc	Add Application::improtSVOFromURL	2015-03-13 17:35:06 -07:00
Philip Rosedale	009551c4dd	Merge pull request #4441 from AndrewMeadows/isentropic more correct shape for avatar collision capsule	2015-03-13 17:33:16 -07:00
Stephen Birarda	2b08c20900	Merge pull request #4440 from birarda/master remove the close activity from Interface	2015-03-13 13:46:59 -07:00
Ryan Huffman	2a84d9a6ab	Fix issue with .svo's not loading when the url has parameters	2015-03-13 10:06:49 -07:00
Andrew Meadows	924ebe1e54	propagate skeleton's bounding box into AvatarData	2015-03-13 09:39:47 -07:00
Andrew Meadows	be252147e2	merge upstream/master into andrew/isentropic	2015-03-12 16:38:59 -07:00
Andrew Meadows	6bd857c4ea	update Avatar in PhysicsEngine on load new body	2015-03-12 16:35:12 -07:00
Stephen Birarda	0fe843db01	Revert "remove the launch activity from UserActivityLogger" This reverts commit `bc6ac9081f`.	2015-03-12 15:53:05 -07:00
Stephen Birarda	bc6ac9081f	remove the launch activity from UserActivityLogger	2015-03-12 15:08:05 -07:00
Stephen Birarda	0b55a0f123	remove the close event from UserActivityLogger	2015-03-12 15:06:44 -07:00
Stephen Birarda	471e55c8ce	fix some lingering warnings	2015-03-12 12:36:39 -07:00
Stephen Birarda	09e2c0987e	use Dependency customDeleter for Application NL	2015-03-12 12:27:48 -07:00
Stephen Birarda	7bfc747748	Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" This reverts commit `9269b2a0b2`.	2015-03-12 12:13:32 -07:00
Seth Alves	b945ce5e7a	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 11:38:01 -07:00
Stephen Birarda	9269b2a0b2	Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"	2015-03-12 11:28:07 -07:00
Stephen Birarda	4da9186045	Merge pull request #4429 from birarda/master NOT MERGEABLE: graceful cleanup on Application dtor for NodeList	2015-03-12 11:26:56 -07:00
Stephen Birarda	3279e19b3d	Merge pull request #4430 from Atlante45/update_login_on_launch Update Login menu item on creation	2015-03-12 10:55:07 -07:00
Seth Alves	898b9f4af3	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 10:24:05 -07:00
Atlante45	d858956ad8	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub	f91a19a918	Merge pull request #4424 from huffman/open-svo Handle drag-n-dropped .svos and using interface to open .svo files	2015-03-12 08:15:25 -07:00
Atlante45	decd240f60	Update Login menu item on startup after creation	2015-03-12 14:53:11 +01:00
Atlante45	bcfd4b50be	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 14:18:37 +01:00
Seth Alves	2a06816f71	added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting	2015-03-11 23:09:15 -07:00
Stephen Birarda	d7e99594ae	make the application the parent of the node thread	2015-03-11 18:04:32 -07:00
Stephen Birarda	5d9a3811ca	more graceful cleanup for Application NodeList and DatagramProcessor	2015-03-11 17:14:20 -07:00
Stephen Birarda	9f754e40d0	move all silent node timers into LimitedNodeList	2015-03-11 16:59:06 -07:00
ZappoMan	cab6cc8c75	fix crash on exit related to AvatarManager using TextureCach resources	2015-03-11 16:30:21 -07:00
Ryan Huffman	0048b91311	Add handling for opening an .svo using interface	2015-03-11 15:42:16 -07:00
Ryan Huffman	c3c2a75f48	Handle .svo drop events and emit svoImportRequested	2015-03-11 15:38:15 -07:00
Ryan Huffman	2f885bb7f2	Move WindowScriptingInterface to DependencyManager	2015-03-11 15:34:29 -07:00
Atlante45	9b80c01357	Remove ModelUploader from the menu	2015-03-11 16:21:36 +01:00
Brad Hefta-Gaub	5cced9fc66	Merge pull request #4400 from samcake/temp0 Introduce gpu::Shader, Pipeline and State	2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub	04837d5302	Merge pull request #4390 from ctrlaltdavid/20287 CR for 20287 - Don't show the application menu bar when in full screen	2015-03-10 16:36:11 -07:00
Seth Alves	cf20596d6d	Merge pull request #4406 from ZappoMan/svoFromURL Support for importing from a network URL	2015-03-10 15:41:41 -07:00
Stephen Birarda	6afdb26042	let QMainWindow delete GLCanvas, just stop the QTimer instead	2015-03-10 13:19:32 -07:00
ZappoMan	feddea821a	cleanup import from file vs url	2015-03-10 12:35:12 -07:00
ZappoMan	5facb39aa7	support for import entities from network URL	2015-03-10 12:21:37 -07:00
Stephen Birarda	a8046b8316	fix a typo in comment, NULL glWidget pointer	2015-03-10 11:47:35 -07:00
Stephen Birarda	292354e180	manually call delete on GLCanvas in Application dtor	2015-03-10 11:33:49 -07:00
Sam Gateau	c1a0d767c9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-10 09:37:40 -07:00
Sam Gateau	853cf75f60	adding the atmosphere in the directional lighting pass, debug	2015-03-10 09:37:13 -07:00
David Rowe	2df3eed31e	Merge branch 'master' into 20287 Conflicts: interface/src/Application.h	2015-03-10 09:31:15 -07:00
Andrew Meadows	a758ccd75a	Merge pull request #4402 from birarda/master add underlying controls for user discoverability	2015-03-10 08:30:46 -07:00
Stephen Birarda	6d900d5a40	handle discoverability change in DiscoverabilityManager	2015-03-09 17:05:57 -07:00
Stephen Birarda	0658b54263	move location update to DiscoverabilityManager	2015-03-09 16:48:39 -07:00
Seth Alves	99300a5bc8	merge from master	2015-03-09 13:39:51 -07:00
Leonardo Murillo	9ccd0a5afa	Fixing updater	2015-03-09 14:12:47 -06:00
Andrew Meadows	51d05cc43e	merge upstream/master into andrew/isentropic Conflicts: libraries/networking/src/PacketHeaders.cpp	2015-03-09 08:51:49 -07:00
Seth Alves	3604fd639a	formatting	2015-03-08 20:03:10 -07:00
Seth Alves	08c3fa6363	merge from upstream	2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub	e2a367607a	Merge pull request #4384 from ctrlaltdavid/20369 CR for Job #20369 - Uploaded avatars without skeletons crash Interface	2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub	21cd7e36e0	Merge pull request #4381 from Atlante45/disk_cache Disk cache tweaks	2015-03-08 11:40:40 -07:00
Seth Alves	9ec72e4902	quiet warning on linux	2015-03-07 20:25:46 -08:00
Andrew Meadows	ba6e66f169	merge upstream/master into andrew/isentropic	2015-03-07 18:03:49 -08:00
Seth Alves	6e79fc8b68	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-06 18:46:13 -08:00
Brad Hefta-Gaub	c9dd96c98d	Merge pull request #4389 from birarda/master render application overlay only if enabled	2015-03-06 17:06:05 -08:00
Andrew Meadows	373be95297	entity cubes are in meters	2015-03-06 15:32:03 -08:00
Stephen Birarda	a4963f1895	render application overlay only if enabled	2015-03-06 15:22:25 -08:00
David Rowe	032896f75c	Fix starting up fullscreen	2015-03-06 14:57:27 -08:00
David Rowe	22d9ff2788	Show/hide menu bar in non-VR fullscreen	2015-03-06 14:36:08 -08:00
Ryan Huffman	6848025504	Add exporting by entity ID to Application	2015-03-05 13:36:16 -08:00
Ryan Huffman	71768ef275	Return entity IDs on paste	2015-03-05 12:36:45 -08:00
Atlante45	f4d8ee39dc	Menu item for cache editor	2015-03-05 21:10:02 +01:00
Atlante45	9d7144dab0	Bumped disk cache size to 10GB	2015-03-05 18:52:48 +01:00
Andrew Meadows	49eee89c19	merge upstream/master into andrew/isentropic Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h	2015-03-05 08:22:02 -08:00
Andrew Meadows	ca1c9b4105	EntityItem::findEntities() uses meters	2015-03-04 16:05:29 -08:00
David Rowe	aad3f1dfd9	Automatically switch to default model if avatar model is skeletonless	2015-03-03 22:34:07 -08:00
Seth Alves	a254f017cc	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-03 18:37:40 -08:00
Seth Alves	8eec66c066	merge upstream, avatar can now fall onto a cube	2015-03-03 18:37:16 -08:00
samcake	6b1f42df83	Merge pull request #4366 from ZappoMan/removeMetavoxels remove metavoxels	2015-03-03 15:50:53 -08:00
Seth Alves	7e4b597ca3	keep physics specific code in PhysicsEngine	2015-03-03 15:45:10 -08:00
Brad Hefta-Gaub	b118912708	Merge pull request #4361 from samcake/temp0 evolve the Transform stack away from the legacy GL to the brand new shader way	2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub	b88d52a310	Merge pull request #4363 from huffman/block-restricted-users Add permission-checking to edit entities	2015-03-03 11:04:46 -08:00
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Stephen Birarda	5a601f3676	resolve conflicts on merge with upstream/master	2015-03-03 10:01:24 -08:00
ZappoMan	5c3c94a618	remove metavoxels	2015-03-02 17:21:43 -08:00
Ryan Huffman	b370e025c9	Move EntityScriptingInterface instance to DependencyManager	2015-03-02 15:05:31 -08:00
ZappoMan	a338d96b9d	only render the overlay if we're actually rendering the overlay	2015-02-27 18:00:51 -08:00
Sam Gateau	ea88cbd75f	Merge with upstream master	2015-02-27 13:19:50 -08:00
Philip Rosedale	35205fbbf3	Merge pull request #4347 from samcake/temp1 Introducing the SunSkyStage	2015-02-27 10:37:02 -08:00
Stephen Birarda	fc2f6d47bb	remove references to PrioVR in interface code	2015-02-26 17:28:00 -08:00
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
Sam Gateau	fcb293d0b2	CLean up before pr	2015-02-26 10:45:00 -08:00
Atlante45	f560f97c6b	Only update active FaceTracker	2015-02-26 19:18:05 +01:00
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -08:00
Sam Gateau	6b29e314c2	Adding the Stage of the Scene and exposing control of the sun light from javascript	2015-02-25 19:05:27 -08:00
ZappoMan	b03928cec7	some cleanup	2015-02-25 16:31:43 -08:00
ZappoMan	d1e648b392	remove unused references to QGLWidget* parent in Overlay and Overlays	2015-02-25 12:34:38 -08:00
ZappoMan	a89691fc66	switch GLCanvas back to being owned by Application	2015-02-25 12:11:35 -08:00
ZappoMan	e66f12f958	add shutdown short circuiting to datagram processor	2015-02-25 10:56:08 -08:00
ZappoMan	310654831c	clean up comments remove dead code	2015-02-24 17:34:19 -08:00
ZappoMan	eab09eaf28	removed extra debugging	2015-02-24 17:15:58 -08:00
ZappoMan	89f7f2da2e	don't do idle process and painting if we're shutting down the application	2015-02-24 15:57:34 -08:00
ZappoMan	ca432a415f	Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit	2015-02-24 15:33:41 -08:00
ZappoMan	fd93b99f03	more hacking on script shutdown behavior	2015-02-24 14:02:46 -08:00
ZappoMan	6be8f4c0ec	more work on improving shutdown behavior	2015-02-23 17:32:31 -08:00
Sam Gateau	687c76a6f8	trying to ge the shadow to render correctly	2015-02-23 13:12:29 -08:00
Andrew Meadows	0455ccf7be	Merge pull request #4313 from ctrlaltdavid/20355 CR for 20355 - Initial Integration with DDE	2015-02-23 09:47:19 -08:00
ZappoMan	85cec79ff5	removing debug messages	2015-02-23 09:44:22 -08:00
ZappoMan	2e7a43a7fb	more hacking	2015-02-20 18:47:47 -08:00
ZappoMan	8c4474b2d0	more hacking	2015-02-20 17:55:04 -08:00
ZappoMan	0b607fa390	first cut at shutting down scripts ahead of other cleanup	2015-02-20 15:28:25 -08:00
Andrew Meadows	21405135f9	Merge pull request #4310 from talentraspel/20323 CR for Job #20323 - BUG: another crash on exit in interface	2015-02-19 09:52:23 -08:00
David Rowe	889851f6ea	Fix typo	2015-02-18 13:51:50 -08:00
David Rowe	a66af77b23	Update DDE face tracker to work with menu item	2015-02-18 12:40:59 -08:00
David Rowe	c446e72226	Add Face Tracking menu item to select the face tracker to use Includes new DDE Face Regression option.	2015-02-18 12:39:51 -08:00
Kai Ludwig	d659ac573a	now all application timers should get stopped correctly on exit	2015-02-18 19:53:45 +01:00
Andrew Meadows	d896f3a811	Merge pull request #4252 from thoys/20224 CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads	2015-02-17 09:03:17 -08:00
Andrew Meadows	9122364c3b	merge upstream/master into andrew/inertia	2015-02-13 16:20:09 -08:00
Andrew Meadows	cfbf8fdca7	explicit cleanup of loaded model animations in Application dtor	2015-02-13 16:19:10 -08:00
ZappoMan	1fc0225939	change ScriptCache and SoundCache to derive from Dependency	2015-02-13 15:33:41 -08:00
Andrew Meadows	589077bce6	try again: move stuff around in ~Application	2015-02-13 14:01:56 -08:00
Andrew Meadows	37be7251fe	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2015-02-13 11:10:13 -08:00
Andrew Meadows	5113258d72	Merge pull request #4279 from birarda/android fix cleanup of AudioClient, avoid gvr-interface crash on OS X	2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub	1827d9f3cd	Merge pull request #4256 from samcake/temp1 Getting rid of glLIghts and replacing by the model::Light	2015-02-13 10:49:53 -08:00
Andrew Meadows	c3b432c4b5	wrap explicit exit() in #ifndef DEBUG	2015-02-12 17:02:21 -08:00
Andrew Meadows	07a12f8b4c	remove a couple crash modes on shutdown	2015-02-12 16:55:14 -08:00
Thijs Wenker	062c2cbcee	HUD LookAt positions could be NULL now if whenever they're out of range HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D() HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()	2015-02-12 22:55:44 +01:00
Stephen Birarda	6c25205856	fix audio cleanup and close action in Application	2015-02-12 13:35:22 -08:00
Stephen Birarda	7becf62ba9	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-12 10:28:04 -08:00
David Rowe	967afd8d67	Restore to windowed, maximized, or full screen appropriately at start-up	2015-02-11 16:13:04 -08:00
Stephen Birarda	7b485829c4	cleanup AudioInjector memory management	2015-02-11 15:52:00 -08:00
Thijs Wenker	cb09656624	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-11 22:58:27 +01:00
David Rowe	4fa2b3a6e9	Fix maximized Windows window unintentionally changing to windowed This stops a maximized Windows window changing to being windowed when you click on a menu item.	2015-02-09 22:07:12 -08:00
Sam Gateau	ace6dc4faf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-08 23:23:06 -08:00
Sam Gateau	469ee29f0b	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
Sam Gateau	bdf9164c7b	debugging the new global light pass	2015-02-06 16:30:07 -08:00
Thijs Wenker	e3ca1efe6b	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-07 00:34:38 +01:00
Brad Hefta-Gaub	a4541758cf	Merge pull request #4245 from ctrlaltdavid/20301 CR for Job #20301 - Windows: If I'm running Interface go to a place via hifi://, don't start another instance of the app	2015-02-06 14:19:10 -08:00
Brad Hefta-Gaub	390d2be48f	Merge pull request #4189 from birarda/android add the gvr-interface target for GearVR	2015-02-06 14:07:28 -08:00
David Rowe	ec590791df	Merge branch 'master' into 20301	2015-02-06 13:23:59 -08:00
Stephen Birarda	c96085eb91	repairs to warnings shown in Xcode	2015-02-06 10:12:04 -08:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Andrew Meadows	5ea785f4ad	Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean	2015-02-06 08:58:14 -08:00
Sam Gateau	1b22a3ef36	connecting the globalLight info to the DeferredLightingEffect	2015-02-05 17:30:57 -08:00
David Rowe	9e34b36839	Send hifi command line url to other instance	2015-02-05 17:17:31 -08:00
David Rowe	ab758648c7	Show and focus on the other Interface instance	2015-02-05 16:44:26 -08:00
Thijs Wenker	de3afa0637	keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden	2015-02-05 00:19:45 +01:00
Thijs Wenker	9dbcefed2a	Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean	2015-02-04 23:23:27 +01:00
ZappoMan	4061e14c2d	move static members of ResourceManager into DependencyManager	2015-02-04 13:24:37 -08:00
Thijs Wenker	38aab9570b	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-04 19:55:12 +01:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Brad Hefta-Gaub	de58c4a007	Merge pull request #4217 from Atlante45/master Fix for fps bug/field of view	2015-02-03 19:13:52 -08:00
Stephen Birarda	dc84c336ea	handle login failure, have AccountManager generate keypair	2015-02-03 16:09:06 -08:00
Atlante45	375d9eed5b	Fix QTimer warning	2015-02-03 15:22:52 -08:00
David Rowe	d9e353e498	Merge branch 'master' into 20280 Conflicts: libraries/networking/src/LimitedNodeList.h	2015-02-03 14:46:27 -08:00
Atlante45	aacf61609f	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-03 10:53:44 -08:00
Atlante45	09a9f82256	More settings update	2015-02-03 10:52:50 -08:00
Stephen Birarda	e07ce23825	resolve conflicts on merge with upstream master	2015-02-03 10:25:17 -08:00
Atlante45	cc58cb0f03	Update domain-server and Application setting handles	2015-02-02 20:06:13 -08:00
Stephen Birarda	9a0c102fb6	remove some extra spaces in Application	2015-02-02 17:27:53 -08:00
Atlante45	1e64fc84e8	Moved startup Application info settings load out of Application	2015-02-02 17:19:54 -08:00
Stephen Birarda	67c21be5dc	remove old audioIO connections for bandwidth	2015-02-02 17:17:22 -08:00
Stephen Birarda	bd0552618f	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
Seth Alves	4377105410	formatting and cleanups	2015-02-02 12:13:54 -08:00
Seth Alves	779a0086c4	BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second	2015-02-02 11:56:50 -08:00
Seth Alves	c0a219678c	use DependencyManager to keep track of BandwidthRecorder	2015-02-02 08:55:55 -08:00
Thijs Wenker	d695e8b251	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-02 00:18:18 +01:00
Seth Alves	fc07ecf83d	use BandwidthRecorder rather than recompute Mbps and pps in Application	2015-01-31 20:40:18 -08:00
Seth Alves	bee895ba0a	capture network bandwidth stats from NodeList rather than various places	2015-01-31 20:02:04 -08:00
Atlante45	1cfd98b2d7	Name threads	2015-01-31 00:50:12 -08:00
David Rowe	3c7cdc16ce	Merge branch 'master' into 20280 Conflicts: interface/src/Application.h	2015-01-30 18:44:14 -08:00
Brad Hefta-Gaub	918349b227	Merge pull request #4196 from ctrlaltdavid/20277 CR for Job #20277 - Interface user agent string change	2015-01-30 16:52:30 -08:00
David Rowe	5474c0634e	Merge branch 'master' into 20277 Conflicts: libraries/script-engine/src/ScriptEngine.cpp	2015-01-30 13:49:45 -08:00
Seth Alves	5c9d64c482	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-01-30 13:46:43 -08:00
Seth Alves	620efb2bbe	change display style of bandwidth detail dialog, include a totals line	2015-01-30 13:43:28 -08:00
samcake	efbf043f7d	Merge pull request #4202 from Atlante45/master Edge case when removing all scripts	2015-01-30 13:01:53 -08:00
Atlante45	fae59ab939	Edge case when removing all scripts	2015-01-30 12:20:00 -08:00
Atlante45	4562c29be8	Merge branch 'master' of https://github.com/highfidelity/hifi into android Conflicts: interface/src/avatar/Hand.cpp	2015-01-30 12:02:11 -08:00
samcake	1c89e27718	Merge pull request #4201 from Atlante45/master Fix not saving stopped scripts	2015-01-30 11:39:40 -08:00
Atlante45	18c77e1cca	Fix not saving stopped scripts	2015-01-30 11:27:45 -08:00
Seth Alves	2999a77f87	merge from master	2015-01-30 11:15:01 -08:00
Seth Alves	f0edba9a6b	Start on refactoring of bandwidth metrics	2015-01-30 11:11:17 -08:00
Atlante45	2d973e5288	Move updateMyAvatar to AvatarManager	2015-01-29 16:55:32 -08:00
Atlante45	4ef87b9919	Merge branch 'master' of https://github.com/highfidelity/hifi into android Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/ui/PreferencesDialog.cpp interface/src/ui/Stats.cpp libraries/audio-client/src/AudioClient.cpp libraries/audio-client/src/AudioClient.h	2015-01-28 13:13:32 -08:00
ZappoMan	7d9de6d0eb	added some TODO comments and some cleanup	2015-01-28 11:03:05 -08:00
ZappoMan	6821f31f14	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: libraries/gpu/src/gpu/GLBackend.cpp	2015-01-28 10:46:30 -08:00
Thijs Wenker	46618db697	Merge branch 'master' of https://github.com/worklist/hifi into 20224 Conflicts: interface/src/ui/ApplicationOverlay.h	2015-01-28 19:35:17 +01:00
Atlante45	98fc1836d8	Revert "Use QDickCache for every QNAM" This reverts commit `2f39b93823`.	2015-01-27 18:09:22 -08:00
ZappoMan	4a6cc5c6f2	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: interface/src/avatar/Hand.cpp interface/src/ui/overlays/ImageOverlay.cpp	2015-01-27 16:44:11 -08:00
Andrew Meadows	026c39e010	Merge pull request #4131 from Atlante45/pull_out_menu_mess Settings - Part I	2015-01-27 16:23:23 -08:00
Atlante45	505f3f143b	Merge branch 'android' of git://github.com/birarda/hifi into android	2015-01-27 16:13:35 -08:00
Atlante45	a28195a334	Move setApplication/Organisation to setupEssentials	2015-01-27 15:28:06 -08:00
Atlante45	c25ae9d506	Merge branch 'android' of git://github.com/birarda/hifi into android Conflicts: interface/src/Application.cpp libraries/entities/src/EntityCollisionSystem.cpp libraries/entities/src/EntityCollisionSystem.h	2015-01-27 15:04:17 -08:00
Stephen Birarda	d420674edd	apply orientation change to listening position for audio	2015-01-27 14:50:02 -08:00
Stephen Birarda	54660dd1a2	resolve conflicts on merge with upstream master	2015-01-27 14:24:48 -08:00
David Rowe	44083dd343	Add user warning if domain has mismatched packet versions	2015-01-27 13:10:11 -08:00
Atlante45	20358a87d6	Moved some headers around	2015-01-27 01:43:01 -08:00
Atlante45	dbdb87a1a2	Moved Menu dependency out of audio	2015-01-27 01:21:59 -08:00
Atlante45	71b565c33c	Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess Conflicts: interface/src/Application.cpp	2015-01-27 01:21:33 -08:00
David Rowe	812fbc58fb	Use custom User-Agent string	2015-01-23 19:13:29 -08:00
Atlante45	4fce5113dd	Use DM to access AvatarHashMap/Manager	2015-01-23 11:50:27 -08:00
Thijs Wenker	42cf9e846a	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-23 19:10:08 +01:00
Andrew Meadows	1c38b08e8f	remane emitEntityCollision... to entityCollision...	2015-01-21 14:07:23 -08:00
Stephen Birarda	693c52da55	hand off audio bandwidth to BandwidthManager	2015-01-21 12:39:04 -08:00
Stephen Birarda	d2af9a2911	have Application pass audio pos/orientation to AudioClient	2015-01-21 12:03:11 -08:00
Stephen Birarda	0eced09f1d	intial removal of Audio to audio-client	2015-01-21 11:49:06 -08:00
Andrew Meadows	86583f3f3f	physics collisions emit script collision events	2015-01-21 11:27:32 -08:00
Atlante45	2f39b93823	Use QDickCache for every QNAM	2015-01-21 11:12:11 -08:00
Thijs Wenker	719f76d42f	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-21 15:09:11 +01:00
Atlante45	77bab2a8c2	Setup Thread and timer for settings	2015-01-20 17:11:46 -08:00
Atlante45	2b3f12a7c4	More settings hooks	2015-01-20 16:52:42 -08:00
Atlante45	6a00dcbf0a	More switches to new Settings	2015-01-20 00:30:29 -08:00
Atlante45	d15d8e0ad6	ScriptsLocation uses new settings	2015-01-19 16:45:10 -08:00
Atlante45	c1e195d17b	Remove load/saveSettings from Menu/Application Tweaked scanMenuBar too	2015-01-19 16:24:58 -08:00
Atlante45	43597ea29d	Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess Conflicts: interface/src/Application.cpp interface/src/Menu.cpp	2015-01-19 14:18:22 -08:00
ZappoMan	41c039f283	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-19 13:34:28 -08:00
Atlante45	c2b7ff1b54	Totally removed Application's setting memember	2015-01-18 19:10:30 -08:00
Atlante45	9b442cbe7a	Previous script location uses new settings	2015-01-18 18:34:37 -08:00
Atlante45	6bcf49c4e6	Running Script use new Settings	2015-01-18 18:30:43 -08:00
Atlante45	6bda5de5e5	Move (re)storeSizeAndGeometry out of Application Moved to MainWindow	2015-01-18 18:24:44 -08:00
Atlante45	5266ae5397	firstRun uses new Settings	2015-01-18 18:24:28 -08:00
Atlante45	1f31828e08	Moved last methog out of Menu Also did a bit of Header cleanup	2015-01-18 07:14:52 -08:00
Atlante45	e7a2b0296b	Removed Menu::bumpSettings()	2015-01-18 06:57:59 -08:00
Atlante45	8933da7bc7	Moved SpeechRecognizer out of Menu Added it in the DM	2015-01-18 06:50:34 -08:00
Atlante45	3bce8204da	Moved toggleSixense out of Menu Moved into SixenseManager	2015-01-18 06:25:27 -08:00
Atlante45	8a827dbb3e	Remove unneeded sendFakeEnterEvent()	2015-01-18 06:18:41 -08:00
Atlante45	488d8a03d5	Moved getShadowEnabled out of Menu Moved to Application	2015-01-18 05:52:19 -08:00
Atlante45	d313c23871	Fixed unused variable warning	2015-01-18 05:41:05 -08:00
Atlante45	fdce0baee9	Removed vsync slot from menu	2015-01-18 05:39:53 -08:00
Atlante45	8d483c9e6e	Moved some more dialogs out of Menu All moved into DialogsManager	2015-01-18 04:34:33 -08:00
Atlante45	05edbd68bf	Moved OctreeStatsDialog out of Menu Moved it into DialogsManager	2015-01-18 03:48:37 -08:00
Atlante45	8f9507cd4c	Added DialogsManager Moved login dialog out of menu into the dialog manager More to follow!	2015-01-18 03:31:44 -08:00
Atlante45	e8a396b08b	Moved Octree max pps out of Menu Moved it to OctreeQuery	2015-01-17 23:31:38 -08:00
Atlante45	21a3705b48	Added StandAloneJSConsole class Moved _jsConsole out of Menu to a global class of it's own	2015-01-17 23:08:30 -08:00
Atlante45	bfceaf2838	Moved FieldOfView related members out of Menu Moved them to ViewFrustum	2015-01-17 22:37:02 -08:00
Atlante45	ef5cfdc3ab	Move Faceshift related member out of Menu Moved it to Faceshift class	2015-01-17 21:35:25 -08:00
Atlante45	3fbc8c5d44	Moved Menu::shouldRenderMesh() to LODManager	2015-01-17 17:56:33 -08:00
Atlante45	a9047b7b15	LODManager class Moved most LOD related members in menu to new Dependency LODManager Replaced all Menu::getInstance() call that accessed those members by DM gets	2015-01-16 17:55:47 -08:00
Thijs Wenker	6bad7a6002	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-17 01:35:35 +01:00
Andrew Meadows	d5119b3532	merge upstream/master into andrew/bispinor Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/EntityMotionState.h libraries/physics/src/ObjectMotionState.cpp libraries/physics/src/PhysicsEngine.cpp libraries/physics/src/PhysicsEngine.h	2015-01-16 14:36:27 -08:00
Stephen Birarda	9c1196a2a6	put user location without curly braces	2015-01-16 12:08:56 -08:00
Sam Gateau	d1fb071208	Adding ambient sphere in the lighting equation and menu to control te presets	2015-01-16 09:38:53 -08:00
Thijs Wenker	5de4f8f249	Merge branch 'master' of https://github.com/worklist/hifi into 20224 Conflicts: examples/libraries/virtualKeyboard.js	2015-01-15 22:59:05 +01:00
Stephen Birarda	93c3b2fb74	repairs for new DependencyManager format	2015-01-15 13:14:26 -08:00
Stephen Birarda	e538669343	resolve conflicts on merge with upstream	2015-01-15 13:12:05 -08:00
Philip Rosedale	048d190350	Merge pull request #4108 from ctrlaltdavid/20263 CR for Job #20263 - Create a "Bookmarks" capability	2015-01-15 10:30:41 -08:00
Andrew Meadows	ff171a5782	Bullet is now required dependency	2015-01-15 10:27:43 -08:00
Philip Rosedale	67c3f9a3db	Merge pull request #4107 from huffman/fix-update-my-avatar Fix issue with avatar data being sent too often	2015-01-15 10:22:18 -08:00
David Rowe	95efe9857b	Merge branch 'master' into 20263	2015-01-15 09:52:19 -08:00
Ryan Huffman	00487fb175	Fix issue with avatar data being sent too often	2015-01-15 09:45:51 -08:00
David Rowe	426cd71fc6	Persist bookmarks to file	2015-01-14 22:58:13 -08:00
ZappoMan	db94949649	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-01-14 17:55:03 -08:00
Thijs Wenker	80a81043ed	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 Conflicts: interface/src/Menu.cpp	2015-01-15 02:28:31 +01:00
Stephen Birarda	69869a696b	remove name this location call from application	2015-01-14 17:00:21 -08:00
Stephen Birarda	f745dfdb91	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-01-14 16:54:51 -08:00
ZappoMan	2f549c776c	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-14 14:41:51 -08:00
Thijs Wenker	2611e2f364	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-14 15:40:46 +01:00
David Rowe	fa6faa771a	Add bookmarks with Bookmark Location menu item The menu of bookmarks is kept sorted.	2015-01-13 22:39:16 -08:00
Atlante45	48f1cbe644	Fixed QSharedPointer in connect()	2015-01-13 20:54:15 -08:00
ZappoMan	e6388a65b9	rough pass at adding color to geometry cache	2015-01-13 20:53:05 -08:00
Atlante45	f77fab2fe0	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
Atlante45	36db547c0f	Setup DependencyManager before any member of Application	2015-01-13 20:35:45 -08:00
Clément Brisset	3034b8f733	Merge pull request #4091 from ctrlaltdavid/20229 CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript	2015-01-13 17:07:17 -08:00
Stephen Birarda	6d2c87c7a3	put current domain hostname if no place name present	2015-01-13 15:15:39 -08:00
Stephen Birarda	6e1ba17c6e	handle application title change for place name change	2015-01-13 15:07:45 -08:00
Stephen Birarda	92b8cd2d1e	handle storage of user location in new format	2015-01-13 15:02:04 -08:00
Stephen Birarda	16261a5fc1	more updates for new place/location APIs	2015-01-13 14:49:24 -08:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Thijs Wenker	7acb4e4716	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-13 00:43:47 +01:00
Thijs Wenker	3da5677aaf	added HMD interface to toggle magnifier	2015-01-13 00:43:16 +01:00
Philip Rosedale	285e588266	Merge pull request #4072 from Atlante45/network_replies_cleanup Windows crash fix	2015-01-09 07:42:36 -08:00
Atlante45	891d8d5abf	Removed unecessary foreach	2015-01-08 18:22:25 -08:00
David Rowe	8b0d859686	Add method to access downloads information in JavaScript	2015-01-06 15:54:07 -08:00
ZappoMan	873403a333	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: interface/src/Audio.cpp interface/src/Audio.h interface/src/Menu.cpp interface/src/Menu.h	2015-01-06 12:27:16 -08:00
Atlante45	9d5ff5d274	Fix mouse disappearing in the menus on Windows	2015-01-06 10:36:42 -08:00
Andrew Meadows	f3255eeb0e	Merge pull request #4008 from birarda/lasagna-not-spaghetti some Audio cleanup in prep for audio untangle	2015-01-06 09:13:12 -08:00
ZappoMan	0e943ae240	remove render view frustum mode	2015-01-05 17:23:10 -08:00
Sam Gateau	2fdcbb1a97	changing the atmoshpere position	2015-01-05 16:46:42 -08:00
Stephen Birarda	f116d0bf5d	block until audio IO stops on app quit	2015-01-05 15:20:36 -08:00
Atlante45	be050b0469	Added missing deletes	2015-01-05 15:13:07 -08:00
Sam Gateau	56758759e5	making the sun position a direction	2015-01-05 15:02:12 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
Sam Gateau	f03b253260	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2015-01-05 13:23:14 -08:00
Andrew Meadows	162854c5a5	Merge pull request #4025 from ZappoMan/voxelEctomy Voxel ectomy	2015-01-05 13:20:30 -08:00
Sam Gateau	3e4cbfd2dc	clean code	2015-01-05 13:12:28 -08:00
Sam Gateau	7529b3d1b0	clean code	2015-01-05 13:10:32 -08:00
Sam Gateau	0b8b4c6d08	for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality	2015-01-05 13:01:21 -08:00
Sam Gateau	458ea6759e	Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes	2015-01-05 11:27:29 -08:00
Stephen Birarda	dfb02aea0c	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
Sam Gateau	ef7c002237	Improving the shadow effect with lightmaps	2015-01-02 10:31:34 -08:00
ZappoMan	9630279459	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy Conflicts: examples/editVoxels.js examples/fallingSand.js examples/growTrees.js interface/src/Application.cpp interface/src/Application.h libraries/avatars/CMakeLists.txt libraries/entities/src/EntityItem.h	2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub	43e6ba77fa	Merge pull request #4007 from AndrewMeadows/inertia Bullet physics part 1	2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub	d47b0a33ea	Merge pull request #3995 from huffman/camera-display Camera tool - orientation + mode display	2014-12-31 10:32:31 -08:00
ZappoMan	95bb125e48	more voxelEctomy	2014-12-30 20:13:57 -08:00
ZappoMan	27d8ccb51e	more voxelEctomy	2014-12-30 19:58:04 -08:00
ZappoMan	141e231958	more work on voxelEctomy	2014-12-30 18:41:56 -08:00
ZappoMan	4ea9bbc309	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
Philip Rosedale	f4f43d6b38	added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar	2014-12-30 15:11:32 -08:00
Ryan Huffman	0105906dc7	Merge branch 'master' of github.com:highfidelity/hifi into camera-display Conflicts: examples/editEntities.js	2014-12-30 15:02:59 -08:00
Ryan Huffman	2b835e621c	Rename 2D -> HUD, 3D -> World in Overlays	2014-12-30 14:50:17 -08:00
ZappoMan	e1d8022409	working on removing voxels	2014-12-30 14:11:31 -08:00
Stephen Birarda	ba09bbae3b	use arrow notation for address manager in application	2014-12-29 11:02:45 -07:00
Stephen Birarda	c7a5f3c86c	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
Andrew Meadows	9b7e50858a	merge upstream/master into andrew/inertia Conflicts: libraries/avatars/CMakeLists.txt libraries/entities/CMakeLists.txt	2014-12-29 09:15:49 -08:00
Atlante45	da636ca918	ModelUploader only has static methods accessible	2014-12-23 14:00:23 -08:00
Atlante45	879c3e2fd0	Add entity model upload	2014-12-23 12:30:00 -08:00
Atlante45	327daacecd	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp libraries/networking/src/NodeList.cpp	2014-12-22 13:34:18 -08:00
Brad Hefta-Gaub	07102c6a29	Merge pull request #3991 from huffman/fix-defaults-url Fix default scripts url to use s3.amazonaws.com	2014-12-19 16:06:59 -08:00
Clément Brisset	dbfbe35a49	Merge pull request #3986 from birarda/domain-connect fix domain connection with port, show current address in address bar	2014-12-19 12:49:51 -08:00
Ryan Huffman	e4ce7d11dc	Fix default scripts url to use s3.amazonaws.com	2014-12-19 11:32:52 -08:00
Andrew Meadows	a141ce37e4	merge upstream/master into andrew/inertia	2014-12-19 10:25:03 -08:00
Thijs Wenker	e913095af5	Merge branch 'master' of https://github.com/worklist/hifi into 20216 Conflicts: interface/CMakeLists.txt	2014-12-19 13:53:33 +01:00
Stephen Birarda	1ab66c2bfe	split port and hostname for cleaner domain changes	2014-12-18 16:17:03 -08:00
ZappoMan	8091564a73	remove all glut	2014-12-18 16:12:30 -08:00
Atlante45	296c0025de	Switched to auto and changed macro	2014-12-18 15:42:38 -08:00
Andrew Meadows	11f01e1859	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
ZappoMan	6f6cf3b08d	Merge branch 'master' of https://github.com/highfidelity/hifi into librarization	2014-12-18 14:52:00 -08:00
Atlante45	990362b8ff	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-18 14:18:21 -08:00
Andrew Meadows	85fd1fc14f	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp	2014-12-18 13:46:06 -08:00
ZappoMan	11b4400099	move all glut-ness to geometry cache	2014-12-18 11:20:17 -08:00
Stephen Birarda	9f21b41d3f	updates for new DependencyManager API	2014-12-17 18:08:41 -08:00
Stephen Birarda	7beb3a7b62	resolve conflicts on merge with upstream master	2014-12-17 16:57:35 -08:00
Stephen Birarda	9425ea2c17	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 16:47:15 -08:00
Atlante45	0bd9ed469e	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
Andrew Meadows	6ea766b48d	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTypes.cpp	2014-12-17 13:21:00 -08:00
ZappoMan	1a9cf126e4	Merge branch 'master' of https://github.com/highfidelity/hifi into librarization Conflicts: interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.h	2014-12-17 13:16:11 -08:00
ZappoMan	2be3b73e8c	move TextRender to libraries/render-utils	2014-12-17 12:32:52 -08:00
ZappoMan	5d636e21c6	more Application dependency cleanup	2014-12-17 11:10:45 -08:00
Thijs Wenker	227e041a12	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-17 19:42:44 +01:00
Stephen Birarda	737741c13b	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 09:23:42 -08:00
ZappoMan	3dfded89b8	remove menu dependency from EntityTreeRenderer, some Application cleanup	2014-12-16 16:28:09 -08:00
Atlante45	c40e83c9e4	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
Atlante45	b2dac6f53f	DM users update	2014-12-16 15:32:11 -08:00
Stephen Birarda	eb790af193	hookup previous mouse press for mute to AudioToolBox	2014-12-16 15:30:28 -08:00
Atlante45	11a2ecab56	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/entities/EntityTreeRenderer.h interface/src/ui/ApplicationOverlay.cpp libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/Model.cpp	2014-12-16 15:02:37 -08:00
Atlante45	2039895898	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/renderer/GlowEffect.cpp interface/src/renderer/TextureCache.cpp	2014-12-16 14:27:50 -08:00
Atlante45	4d1529f77b	typedefs	2014-12-16 14:02:22 -08:00
Atlante45	e8a22f6f0f	Switched to chared pointers and macros	2014-12-16 13:54:52 -08:00
ZappoMan	efa8a752f2	remove dependency on Menu from Model	2014-12-16 13:14:57 -08:00
ZappoMan	16c1e597f1	remove Application dependency from Model	2014-12-16 12:53:22 -08:00
Stephen Birarda	6fd55e6f42	make Audio class use DependencyManager	2014-12-16 12:31:01 -08:00
ZappoMan	fc1e1ecfc0	move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled	2014-12-16 11:27:44 -08:00
ZappoMan	4d79a08533	remove Application dependencies from AmbientOcclusion and DeferredLightingEffect	2014-12-16 10:32:03 -08:00
ZappoMan	660bf2720e	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
ZappoMan	41c135c4e5	move GlowEffect to libraries	2014-12-15 19:19:21 -08:00
ZappoMan	8f3d23c5b3	remove Menu dependency from GlowEffect	2014-12-15 19:06:54 -08:00
ZappoMan	e53833b306	make GlowEffect support DependencyManager	2014-12-15 17:29:48 -08:00
Atlante45	e5e2eb4e8a	Moved GLCanvas in DM and DM to QSharedPointers	2014-12-15 16:20:52 -08:00
ZappoMan	bfcc78c57d	replaced Application::resourcesPath() with PathUtils::resourcesPath()	2014-12-15 15:20:18 -08:00
Stephen Birarda	1b48cf7f5a	use DependencyManager for AddressManager	2014-12-15 14:54:20 -08:00
Andrew Meadows	67c3a25475	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h	2014-12-15 14:46:46 -08:00
ZappoMan	df7e115556	move ProgramObject to libraries	2014-12-15 14:21:22 -08:00
Thijs Wenker	1dfa313d16	Merge branch 'master' of https://github.com/worklist/hifi into 20216 Conflicts: interface/src/Menu.cpp	2014-12-15 22:22:51 +01:00
Atlante45	68430e1346	Moved GLCanvas to DependencyManager	2014-12-15 11:54:33 -08:00
Atlante45	25df784f43	Headers cleanup	2014-12-15 10:56:42 -08:00
ZappoMan	e0a017e963	make GeometryCache work with DependancyManager	2014-12-15 10:49:34 -08:00
ZappoMan	7d75d2d1bf	make TextureCache work with DependancyManager	2014-12-15 10:34:16 -08:00
ZappoMan	7d1081473e	remove _textureCache	2014-12-15 09:42:35 -08:00
Stephen Birarda	8549e9cb53	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
ZappoMan	4ac673fe63	more render util cleanup	2014-12-15 08:16:42 -08:00
ZappoMan	e9ea6b20ce	use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache()	2014-12-15 08:16:18 -08:00
ZappoMan	e253b8afa4	move TextureCache out of interface and Application	2014-12-15 08:14:53 -08:00
Atlante45	738f23f326	Moved visage and dde over to DependencyManager	2014-12-14 22:30:13 -08:00
Atlante45	65094f2165	Update headers	2014-12-14 21:47:08 -08:00
Atlante45	1db3592d4c	Switched meFaceshifto DependencyManager for Faceshift	2014-12-14 19:56:42 -08:00
Thijs Wenker	821e9ddfed	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-13 23:05:04 +01:00
Thijs Wenker	3f26e1b63a	RealSense Initial	2014-12-13 23:04:19 +01:00
Brad Hefta-Gaub	aae000d50e	Merge pull request #3956 from Atlante45/dont_hide_mouse_on_every_window Don't hide mouse when over a widget	2014-12-11 16:06:05 -08:00
Atlante45	df66a0049b	Don't hide mouse when over a widget	2014-12-11 15:33:46 -08:00
Clément Brisset	14918ff86a	Merge pull request #3952 from ZappoMan/HMDMode More HMD work - keep more dialogs from being moved to HMD	2014-12-11 15:26:36 -08:00
ZappoMan	0813d53bee	CR feedback	2014-12-11 15:17:22 -08:00
ZappoMan	29672aec09	removing VoxelShader and PointShader which were both disabled	2014-12-11 13:55:10 -08:00
Andrew Meadows	c3f8f8ab98	init PhysicsEngine with an EntityEditPacketSender	2014-12-11 13:29:29 -08:00
ZappoMan	c9bc95580d	add support for generic windowWatcher that keeps dialogs from being moved to HMD display	2014-12-11 12:30:17 -08:00
AndrewMeadows	84e82cd03b	Merge pull request #3947 from ZappoMan/HMDMode Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen	2014-12-11 10:48:32 -08:00
ZappoMan	ec54b609df	dry up code and make chat window avoid the hmd screen	2014-12-10 17:23:39 -08:00
ZappoMan	d058b5554e	make sure the running scripts widget doesn't start on the HMD screen	2014-12-10 16:58:36 -08:00
ZappoMan	eda7432868	remove audio reflector	2014-12-10 15:37:48 -08:00
Brad Hefta-Gaub	69f7a89003	Merge pull request #3937 from Atlante45/mouse_pick_in_oculus Mouse pick improvments	2014-12-09 18:33:25 -08:00
Atlante45	dc4c9cd545	Correctly Hide/Show cursor	2014-12-09 18:00:14 -08:00
Sam Gateau	01c13cd6f1	Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars	2014-12-09 17:58:17 -08:00
Atlante45	43dc35d549	Use correct mouse coordinate	2014-12-09 17:53:23 -08:00
Atlante45	8765d9a9b3	Mouse cursor modifications	2014-12-09 16:30:37 -08:00
Andrew Meadows	3fd2f12a73	merge upstream/master into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntitySimulation.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/SimpleEntitySimulation.cpp libraries/entities/src/SimpleEntitySimulation.h libraries/entities/src/SphereEntityItem.cpp	2014-12-09 12:41:53 -08:00
Atlante45	ba81030aa1	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-08 16:53:56 -08:00
ZappoMan	27bc394bed	repair collision info mismatch	2014-12-08 10:52:53 -08:00
Atlante45	299389ccef	Fixed typo	2014-12-08 09:59:33 -08:00
Atlante45	d89d10d263	Hide cusor in VR mode	2014-12-05 17:36:46 -08:00
Atlante45	ee124f580d	removed _mouse{X,Y}	2014-12-05 17:02:49 -08:00
Atlante45	4bc7e1a3e8	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-05 14:46:52 -08:00
ZappoMan	e68e3fe774	Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" This reverts commit `6d385d9a75`.	2014-12-05 10:06:17 -08:00
ZappoMan	9753c82a3b	get rid of redundant _displayViewFrustum and use _viewFrustum	2014-12-05 10:04:23 -08:00
ZappoMan	feab942375	Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" This reverts commit `6d385d9a75`.	2014-12-05 10:01:16 -08:00
Atlante45	9f444581e9	Fixed JS picking in oculus	2014-12-04 18:53:30 -08:00
Atlante45	84da070901	Correct mouse position in occulus	2014-12-04 18:27:03 -08:00
Atlante45	abe9704dbc	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-04 17:26:22 -08:00
Atlante45	7026af7b9a	Centrilized Oculus interference in pickRay	2014-12-04 17:26:14 -08:00
ZappoMan	cd92185c5b	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork Conflicts: examples/newEditEntities.js interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h libraries/entities/src/EntityTree.h	2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub	f10b656877	Merge pull request #3870 from AndrewMeadows/thermonuclear pull entity simulation out of EntityTree	2014-12-03 14:30:44 -08:00
Stephen Birarda	5c3e90f64f	resolve conflicts on merge with upstream master	2014-12-03 13:11:56 -08:00
Stephen Birarda	98f56aaa0c	fix URL/filename discrepancy for local scripts	2014-12-03 09:55:55 -08:00
Andrew Meadows	a21ebe4f6a	merge andrew/thermonuclear into andrew/inertia	2014-12-02 15:31:30 -08:00
Andrew Meadows	c9ea6885c1	PhysicsEngine is now an EntitySimulation	2014-12-02 15:29:41 -08:00
ZappoMan	a47a0377ef	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork	2014-12-02 14:57:30 -08:00
Andrzej Kapolka	4d233c09a3	At least on Linux, fixes an annoying issue where closing the application window causes it to disappear and reappear briefly before exiting.	2014-12-02 13:19:39 -08:00
ZappoMan	cc012aad00	reset view frustum	2014-12-02 12:54:10 -08:00
ZappoMan	6d385d9a75	get rid of redundant _displayViewFrustum and use _viewFrustum	2014-12-02 11:45:33 -08:00
Andrew Meadows	ff7559c2c2	merge upstream/master into andrew/thermonuclear	2014-12-02 11:41:29 -08:00
Brad Hefta-Gaub	22bee75f7f	Merge pull request #3885 from birarda/double-scripts fix for ScriptEngine blocked load	2014-12-02 11:19:28 -08:00
Stephen Birarda	0a92374ca6	fix an incorrect connection to script load error	2014-12-02 10:39:20 -08:00
Stephen Birarda	d7f168999d	don't block main thread for a script load	2014-12-02 10:30:23 -08:00
ZappoMan	526664ac57	delete old dead code	2014-12-01 22:11:34 -08:00
Andrew Meadows	1df6c32a4e	moving Shape* back into shared lib removing dependency of entities lib on physics lib physics lib now depends on entities lib	2014-12-01 16:03:14 -08:00
Stephen Birarda	40db44e4bd	fix for custom hifi URL lookup	2014-12-01 09:59:51 -08:00
Philip Rosedale	c284303031	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-26 20:35:51 -08:00
Philip Rosedale	e822b191d0	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-26 19:57:31 -08:00
Philip Rosedale	39042f61cd	1P mirror can lean fwd/back	2014-11-26 19:57:18 -08:00
ZappoMan	fe9fab68bf	don't exit app in full screen or hdm mode	2014-11-26 17:30:59 -08:00
Andrew Meadows	5acaaa9c3b	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/entities/EntityCollisionSystem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTree.h libraries/entities/src/EntityTreeElement.cpp	2014-11-26 15:36:08 -08:00
ZappoMan	2fc3fdc7e6	improve how cameras are reset when leaving vr mode	2014-11-26 12:26:02 -08:00
Andrew Meadows	d84f57fafa	merge upstream/master into andrew/thermonuclear	2014-11-26 12:18:19 -08:00
Andrew Meadows	cda8ac85c1	EntityCollisionSystem moves to interface and interface connects EntityCollision system to EntityTree	2014-11-26 12:15:24 -08:00
ZappoMan	53ecf97df2	fix broken camera after leaving oculus/hmd mode	2014-11-25 21:58:26 -08:00
ZappoMan	333f323856	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode	2014-11-25 12:46:18 -08:00
ZappoMan	6108f7d9cd	fix bug in resetSensors moving cursor to center of window on multiple screen systems	2014-11-25 12:45:20 -08:00
Ryan Huffman	9020fee31a	Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw	2014-11-25 09:53:18 -08:00
Ryan Huffman	649ae4a448	Update 3D overlays to only use one list	2014-11-25 09:49:10 -08:00
ZappoMan	a28d74570d	bug fixes in setFullscreen() and setEnableVRMode()	2014-11-25 09:25:22 -08:00
Ryan Huffman	8b982872c2	Add calls to Overlays::render3DFront()	2014-11-24 23:19:53 -08:00
Andrew Meadows	37093cbd00	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-11-24 11:24:39 -08:00
ZappoMan	b2c342c5c7	add support for unload method	2014-11-20 15:36:28 -08:00
Atlante45	4d5451fafe	Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f Conflicts: interface/src/avatar/Avatar.cpp interface/src/avatar/SkeletonModel.cpp	2014-11-19 17:28:24 -08:00
Andrew Meadows	47f2cbd73b	merge upstream/master into andrew/inertia	2014-11-19 17:07:55 -08:00
Atlante45	ae3bcc8f06	No more .f	2014-11-19 16:53:39 -08:00
Andrew Meadows	961dc5a231	merge andrew/thermonuclear into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h	2014-11-19 15:41:53 -08:00
dev	fc54ad93b8	refining the avatar display name rendering with different behavior if in HMD mode or not	2014-11-19 11:46:59 -08:00
dev	ce50152863	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-19 01:06:33 -08:00
dev	4028e66c08	trying to fix the lighting issue in stereo and fix the display name size and orientation	2014-11-18 18:59:54 -08:00
Stephen Birarda	2274b35d08	connect to sandbox domain by default	2014-11-18 15:35:11 -08:00
Andrew Meadows	388830c2a2	Merge branch 'bispinor' into inertia Conflicts: interface/src/entities/RenderableModelEntityItem.cpp libraries/entities/src/BoxEntityItem.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTree.h libraries/entities/src/EntityTreeElement.cpp	2014-11-18 10:23:38 -08:00
Andrew Meadows	2d400e6ae0	rename PhysicsWorld to PhysicsEngine	2014-11-18 09:55:25 -08:00
David Rowe	bb15fc138c	Fix Bandwidth Details dialog opening if click meter's pos when UI hidden	2014-11-15 09:28:40 -08:00
Sam Gateau	0973d197cf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 12:25:00 -08:00
Brad Hefta-Gaub	1d14f94cb0	Merge pull request #3797 from huffman/entity-tool-properties Entity Tools - Properties window, Tool window, Various fixes	2014-11-14 11:48:57 -08:00
Sam Gateau	cc78000641	introduce the concept of side thorugh out the rendering traversal	2014-11-14 11:22:11 -08:00
Ryan Huffman	28eebd3fa5	Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties	2014-11-14 10:53:18 -08:00
Ryan Huffman	604b1b620b	Move dock window to ToolWindow	2014-11-14 10:52:08 -08:00
Stephen Birarda	903cd05ff8	put newlines back in interface log	2014-11-14 10:39:45 -08:00
Sam Gateau	f09b58c255	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
Sam Gateau	642f436fba	first draft of factorizing the rendering traversal for both sides in stereo	2014-11-14 09:56:36 -08:00
Andrew Meadows	5eb606c44a	merge upstream/master into andrew/inertia	2014-11-14 09:04:27 -08:00
Andrew Meadows	1a094f2b51	reorder PhysicsWorld and EntityTree in Application	2014-11-14 09:03:41 -08:00
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
Ryan Huffman	6b2a497810	Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes	2014-11-13 17:48:17 -08:00
Ryan Huffman	03f155bcd8	Add tool window	2014-11-13 17:47:02 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
Sam Gateau	7e2c4c0561	SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint	2014-11-13 10:57:32 -08:00
Andrew Meadows	1bed4eeb5b	merge upstream/master into andrew/inertia Conflicts: libraries/entities/src/EntityTree.cpp	2014-11-13 10:53:23 -08:00
Andrew Meadows	7f46ac0935	EntityTree gtts PhysicsWorld*, with less error	2014-11-13 10:12:52 -08:00
Andrew Meadows	ebe24b5c4c	give the EntityTree a pointer to its PhysicsWorld	2014-11-13 10:04:55 -08:00
Andrew Meadows	14f49df44d	Application gets a ThreadSafePhysicsWorld	2014-11-13 10:02:36 -08:00
ZappoMan	13f08e65d1	Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering Conflicts: interface/src/renderer/Model.h	2014-11-12 19:31:27 -08:00
Sam Gateau	c0496fd466	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-12 16:52:34 -08:00
Sam Gateau	d3a7b011bf	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp	2014-11-12 16:52:11 -08:00
Sam Gateau	8fb04af59d	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design	2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub	70c463695a	Merge pull request #3779 from PhilipRosedale/master Remove buckyBalls and faceshift lean-to-drive	2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub	331e9d6558	Merge pull request #3775 from birarda/lobby repairs to local audio injection	2014-11-12 16:26:38 -08:00
David Rowe	8c3bedae9d	Add position vector and color object script value examples OverlayPropertyResult type is needed to successfully move QScriptValue objects from QScriptEngine in Overlays to QScriptEngine in script.	2014-11-12 14:33:52 -08:00
Philip Rosedale	6af2b7aadf	remove buckyballs and face shift lean driving (should be a script if desired)	2014-11-12 07:33:59 -08:00
Sam Gateau	5f0fdeccb2	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-12 00:27:12 -08:00
Sam Gateau	b716a512c6	Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level	2014-11-12 00:26:44 -08:00
Stephen Birarda	b7b371ba61	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
Stephen Birarda	9bd870f4b0	fix hifi url handling after update to 5.3.2	2014-11-11 20:45:04 -08:00
Sam Gateau	7a9f45d34f	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-11 16:40:11 -08:00
Sam Gateau	668c5e298d	clean up the Transform class and the rendering path in Model.cpp	2014-11-11 16:39:00 -08:00
Stephen Birarda	0e30c65e60	handle cleanup of local injection, volume	2014-11-11 15:12:11 -08:00
Andrew Meadows	0d0f98f669	init and step physics simulation	2014-11-11 12:09:59 -08:00
Stephen Birarda	d0e8c294da	handle passing of local audio interface to AudioInjector	2014-11-11 11:22:16 -08:00
Andrew Meadows	fa48da6c98	merge upstream/master into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp	2014-11-11 11:14:12 -08:00
Andrew Meadows	82d7b70ec9	add offset to physics simulation	2014-11-11 10:56:31 -08:00
Ryan Huffman	bedd9c76f2	Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool Conflicts: examples/newEditEntities.js	2014-11-11 10:48:49 -08:00
Ryan Huffman	a1d771a0be	Rename WebWindow to WebWindowClass	2014-11-11 10:03:14 -08:00
Sam Gateau	ad51416c28	move the transform class files to the Shared library, still problem with negative scale composition	2014-11-11 09:54:35 -08:00
Andrzej Kapolka	5f89b6e00e	The spec actually says that the 'L' (should have been 'LL' anyway) isn't necessary; the compiler will know to read the constant as a long long.	2014-11-10 11:58:52 -08:00
Sam Gateau	7ccb7495c7	Merge and resolve conflict on APplication.cpp	2014-11-10 10:07:24 -08:00
Sam Gateau	631ed9da78	let's start reusing the Batch per model from frame to frame	2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub	fc89f92097	Revert "Revert "Fix build warning""	2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub	09490b58b4	Revert "Fix build warning"	2014-11-07 21:47:28 -08:00
David Rowe	94d82455a0	Fix build warning	2014-11-07 19:56:54 -08:00
Andrzej Kapolka	cd110d6048	Fix for invalid projection matrix on startup.	2014-11-07 14:35:01 -08:00
Andrzej Kapolka	7008012492	Trigger fixes.	2014-11-07 14:20:31 -08:00
Andrzej Kapolka	a4db244182	Mirror/warning fixes.	2014-11-07 13:57:20 -08:00
Stephen Birarda	beb7c339f3	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-11-07 11:18:04 -08:00
Stephen Birarda	f1a238a6c2	piping for local UI sounds	2014-11-07 10:08:09 -08:00
Stephen Birarda	0f32346324	resolve conflicts on merge with upstream master	2014-11-07 09:10:12 -08:00
ZappoMan	55576e7f9d	fix crash in mouse messages while quitting	2014-11-06 17:53:22 -08:00
ZappoMan	bceab4ead9	clear all octree related state when disconnecting from a domain	2014-11-06 17:25:49 -08:00
Stephen Birarda	455cbac8a5	repairs to node hash iterations in Application	2014-11-06 15:16:45 -08:00
Ryan Huffman	3e109ee770	Add WebWindow widget for scripts	2014-11-06 14:57:04 -08:00
Sam Gateau	b0189efcdf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-06 10:56:54 -08:00
Stephen Birarda	8a72cdd59d	leverage new libcuckoo hash outside LimitedNodeList	2014-11-05 15:09:54 -08:00
Stephen Birarda	663167d684	wait on AudioInjectors when shutting down interface	2014-11-05 10:37:22 -08:00
Stephen Birarda	2c667d209d	make the AudioInjectorScriptingInterface a singleton	2014-11-05 10:10:05 -08:00
Sam Gateau	99eb46f218	Removed any checkGLError so they do not show	2014-11-04 17:10:17 -08:00
Sam Gateau	27aadd24b3	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-04 16:43:26 -08:00
Sam Gateau	441d09a460	debugiing the mysterious glError coming from glFrustum	2014-11-04 16:42:58 -08:00
Brad Hefta-Gaub	24c324fd1d	Merge pull request #3735 from ctrlaltdavid/20126 CR for Job #20126 - Rift HUD shouldn't move with head	2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub	583b7b1267	Merge pull request #3732 from thoys/20166 CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event	2014-11-04 15:51:05 -08:00
Stephen Birarda	f53455ee55	use a ray from the near clip for action ray	2014-11-04 11:40:47 -08:00
Stephen Birarda	790aa848ae	leverage Camera object for scripting, remove sep interface	2014-11-04 10:33:55 -08:00
Stephen Birarda	957705998f	fix an uninitialized action ray when hitting spacebar	2014-11-04 10:19:56 -08:00
Stephen Birarda	8d6b041758	send a pick ray with HFActionEvent, not x,y	2014-11-04 10:01:25 -08:00
Stephen Birarda	d3372537c5	Merge pull request #3715 from ZappoMan/entityScriptsAndEvents Entity Scripts	2014-11-03 15:02:52 -08:00
Sam Gateau	4d1fbc1cf9	Fix end of line in Application.cpp	2014-11-03 14:39:34 -08:00
Sam Gateau	a4bd0acc91	Fix the syntax issue with if blocks	2014-11-03 14:36:03 -08:00
Sam Gateau	eae604d77e	Merged with upstream master	2014-11-03 13:37:17 -08:00
Sam Gateau	cecf79e580	Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state	2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub	9fb4f91f2a	Merge pull request #3716 from ctrlaltdavid/20152 CR for Job #20152 - Interface cache goes away when you close Interface.	2014-11-03 11:07:36 -08:00
ZappoMan	49a389618e	Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents	2014-11-03 10:54:19 -08:00
Thijs Wenker	af74fc09b9	Adds AudioDevice mute functionality to ScriptEngine	2014-11-01 02:42:22 +01:00
ZappoMan	a5088eece6	first cut at running scripts from entities	2014-10-31 14:03:30 -07:00
David Rowe	170e328f5a	Fix similar problem for HMD third person view getUprightHeadPosition() changes with avatar lean.	2014-10-31 12:40:16 -07:00
ZappoMan	277da5a24f	first cut at wiring up new entity specific UI/UX events	2014-10-31 10:23:45 -07:00
David Rowe	ccc5e0d6ca	Increase Interface's disk cache from default 50MB to 10GB	2014-10-31 10:06:43 -07:00
ZappoMan	e78ac4c1d4	Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties	2014-10-30 16:36:19 -07:00
ZappoMan	81cc15495f	rename Models to Entities, and add menu option to disable Light entities	2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub	1c4e71ebc1	Revert "Worklist #20074 "	2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub	7b5d2ef9f8	Merge pull request #3706 from huffman/entity-tool-help Add edit entities help window	2014-10-30 12:53:17 -07:00
Ryan Huffman	4f2fef0428	Add edit entities help window	2014-10-30 12:02:30 -07:00
Stephen Birarda	45763a96d7	Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays Shadows to3 d overlays	2014-10-30 09:21:25 -07:00
ZappoMan	2570caca40	move 3D overlay rendering into the render portion that supports lighting and shadows	2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub	e314fa1fc3	Merge pull request #3652 from ctrlaltdavid/19976 CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice	2014-10-29 20:46:12 -07:00
Stephen Birarda	5b3897f1cf	Merge pull request #3690 from ZappoMan/rayPickSubMeshes Ray pick sub meshes	2014-10-29 12:10:29 -07:00
ZappoMan	c3d1d13fa9	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
ZappoMan	3e9bc23c2f	moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes	2014-10-29 10:19:04 -07:00
Sam Gateau	dbdd5293fa	Merged with master	2014-10-28 18:31:02 -07:00
Brad Hefta-Gaub	be65a798db	Merge pull request #3681 from birarda/verbose-log-silencer logging tweaks to reduce spam from repeated log messages	2014-10-28 17:58:17 -07:00
Sam Gateau	0dab1c2bc5	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-10-28 14:50:39 -07:00
Stephen Birarda	424793b905	complete output of suppressed repeated messages to log	2014-10-28 14:49:14 -07:00
Sam Gateau	88eaeaee7d	Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api	2014-10-28 14:42:22 -07:00
Stephen Birarda	8e3102266a	use the LogHandler in Interface	2014-10-28 14:23:34 -07:00
Stephen Birarda	d3bbd251db	move Logging to LogHandler	2014-10-28 13:59:23 -07:00
Stephen Birarda	2711ff2b5f	move functionality from VerboseLoggingHelper into the Logging class	2014-10-28 13:48:53 -07:00
Stojce	1229f0e8fa	Merge branch 'master' of https://github.com/highfidelity/hifi into 20143	2014-10-28 21:39:36 +01:00
Stephen Birarda	477b5096e8	don't start/end action/back events on auto-repeat	2014-10-28 11:34:31 -07:00
David Rowe	adf168b7ea	Remove ATL build dependency for Windows speech recognizer	2014-10-28 11:14:45 -07:00
Stojce	1debad3969	Merge branch 'master' of https://github.com/highfidelity/hifi into 20143	2014-10-28 17:22:00 +01:00
Brad Hefta-Gaub	4e7e9641f0	Merge pull request #3673 from birarda/lobby initial groundwork for lobby interface	2014-10-28 08:48:33 -07:00
Stephen Birarda	cb7a6cb93c	Merge branch 'master' of https://github.com/highfidelity/hifi into lobby	2014-10-28 08:40:20 -07:00
Stojce	9be107c9c1	Merge branch 'master' of https://github.com/highfidelity/hifi into 20143	2014-10-28 08:24:23 +01:00
Brad Hefta-Gaub	b506a99200	Merge pull request #3671 from ctrlaltdavid/20107 CR for Job #20107 - Keys p and h and some control keys wont override	2014-10-27 20:30:15 -07:00
Brad Hefta-Gaub	cfe26ead6e	Merge pull request #3669 from lycanthus/20074 Worklist #20074	2014-10-27 20:29:23 -07:00
Stephen Birarda	80d9014726	have spacebar fire an action event at center of screen	2014-10-27 16:54:28 -07:00
Stephen Birarda	8a9f2d172a	rename HFCancelEvent to HFBackEvent, fire from joystick	2014-10-27 15:51:59 -07:00
Stephen Birarda	04e7e979aa	bubble up HFCancelEvent from ESC key	2014-10-27 15:42:40 -07:00
Stephen Birarda	c3fe7c7497	send global HFActionEvent from ControllerScriptingInterface	2014-10-27 15:21:47 -07:00
Stephen Birarda	d38dd2c53a	repairs for recursive source files, move HF meta events to SE	2014-10-27 14:18:23 -07:00
Stephen Birarda	0ddf665b86	add an HFMetaEvent class as super class for meta events	2014-10-27 12:56:48 -07:00
Stephen Birarda	6626787ae5	have mouse press/release fire HFActionEvent	2014-10-27 11:40:33 -07:00
Pete	8d97a20bd9	Worklist #20074 - Add new Preferences item for Oculus Max FPS, defaults to 75, range is [30, 95] - Load and save this value appropriately - When VR mode is enabled/disabled, set the Render Target Framerate to this value/unlimited	2014-10-26 21:14:20 -07:00
Stojce	61c80183ad	fix for mirror size on different scale resloutions	2014-10-26 08:12:07 +01:00
David Rowe	c6463abfb8	Prevent keys captured by script from being used as menu shortcuts	2014-10-25 09:22:30 -07:00
David Rowe	5f91f583e8	Merge branch 'master' into 19976 Conflicts: interface/CMakeLists.txt	2014-10-24 20:34:45 -07:00
David Rowe	f373719f02	Don't include speech recognition if building with Visual Studio Express	2014-10-24 20:12:23 -07:00
Philip Rosedale	2dff75dac1	Merge pull request #3665 from stojce/20143 CR for Job #20143 - BUG: Rearview mirror rendering at wrong size	2014-10-24 19:45:26 -07:00
Sam Gateau	80a87b3b44	framerate is as fast as the display can go	2014-10-24 17:50:31 -07:00
David Rowe	38524b3349	Merge branch 'master' into 19976	2014-10-24 15:43:55 -07:00
Sam Gateau	9f6454f570	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2014-10-23 15:20:20 -07:00
Sam Gateau	ac269e16c0	start working on the target framerate control	2014-10-23 13:19:34 -07:00
stojce	4e75837a64	Merge branch 'master' of https://github.com/highfidelity/hifi into 20143	2014-10-23 14:26:13 +02:00
Clément Brisset	bf9d467328	Merge pull request #3638 from huffman/entity-tools-updates Entity tool fixes	2014-10-22 17:40:21 -07:00
Stephen Birarda	7b0f1477a1	expose AvatarList to Interface SE, add avatarWithDisplayName method	2014-10-22 15:28:04 -07:00
Ryan Huffman	14555c4534	Add UndoStackScriptingInterface and support when editing entities	2014-10-22 14:54:04 -07:00
stojce	a3707a09ae	fix mirror ratio on retina	2014-10-22 09:42:55 +02:00
David Rowe	524c413681	Enable SpeechRecognizer menu item and JavaScript object for Windows	2014-10-20 13:52:37 -07:00
Andrzej Kapolka	e98b99fe84	Merge pull request #3622 from birarda/domain-tunnel work around double login issue by generating keypair on each launch	2014-10-17 18:05:45 -07:00
Stephen Birarda	5ecdb58e20	generate a new keypair on every interface launch	2014-10-17 16:55:50 -07:00
ZappoMan	fc507850be	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -07:00
AndrewMeadows	4fbc589606	Merge pull request #3598 from birarda/domain-tunnel initial pass at using keypairs for username verification for basic domain-server ACL	2014-10-16 10:49:03 -07:00
Stephen Birarda	fcd73858b8	remove Faceplus as a face tracker option	2014-10-15 15:13:52 -07:00
Stephen Birarda	c4b0dc9dcc	initial handling of username signature in domain-server	2014-10-14 16:03:35 -07:00
Stephen Birarda	69402e275c	use DER format for generated keys in RSAKeypairGenerator	2014-10-14 11:51:58 -07:00
Stephen Birarda	d0f91c5c2e	remove old mechanism for octree payments	2014-10-14 11:38:50 -07:00
Stephen Birarda	912512936e	add RSAKeypairGenerator to generate a 2048-bit keypair	2014-10-14 11:36:40 -07:00
Stephen Birarda	cca8b68d2e	update location and profile paths for new format	2014-10-14 10:40:58 -07:00
Stephen Birarda	20f97792bf	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-14 09:26:11 -07:00
Sam Gateau	153d3b532b	merged with upstream, all clear	2014-10-14 00:19:19 -07:00
Sam Gateau	113fb1908a	fix the first issues	2014-10-13 23:28:43 -07:00
samcake	700ec5cf79	Rendering resolution can be different than the native window resolution - Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD) Get rid of the ui to change the mode - INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt - In the paintGL, in the default rendering path: the rendering Framebuffers are resized to the window.size * renderResolutionScale. The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size) at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport - add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.	2014-10-13 18:00:50 -07:00
ZappoMan	c7d544cd58	wire up collision signals	2014-10-13 14:36:06 -07:00
ZappoMan	4c85e9f581	removing particles	2014-10-13 14:10:57 -07:00
David Rowe	958acfcfe0	Fix version logging include to include build number and write in log	2014-10-13 13:23:31 -07:00
Stephen Birarda	21114d5f56	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-10 14:30:43 -07:00
Stephen Birarda	df6f4d4c95	remove cara face tracking, cleanup warnings	2014-10-10 14:17:52 -07:00
David Rowe	b718d27ac6	Merge branch 'master' into 20073	2014-10-10 12:04:36 -07:00
Stephen Birarda	76d00f351d	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-10 09:28:14 -07:00
Stephen Birarda	31df339565	pipe username signature requirement through to DomainHandler	2014-10-09 16:53:22 -07:00
Philip Rosedale	2da4345b21	First person and mirror HMD view almost fixed	2014-10-09 13:32:35 -07:00
Brad Hefta-Gaub	c9c3ab985a	Merge pull request #3565 from PhilipRosedale/master Simplify camera class to have no interpolation, simpler structure	2014-10-08 17:06:21 -07:00
Philip Rosedale	cdd60dead2	Merge branch 'master' of https://github.com/worklist/hifi	2014-10-08 15:28:56 -07:00
Philip Rosedale	01bef6be6d	remove unused cameraPushback variable	2014-10-08 15:28:29 -07:00
Philip Rosedale	12349a8854	Fix rearview mirror camera	2014-10-08 10:59:46 -07:00
Philip Rosedale	00c182ad7b	Fix full screen mirror keyboard controls	2014-10-08 10:51:06 -07:00
Philip Rosedale	2636fdd3cb	Fix third person camera distance	2014-10-08 10:23:45 -07:00
Philip Rosedale	c4c9f4820d	First pass at simplifying camera, removes interpolation to target and setbacks	2014-10-08 10:00:47 -07:00
Philip Rosedale	f4b9ccbceb	remove unused camera functions	2014-10-07 21:51:46 -07:00
Stephen Birarda	f19c5c9850	repair NetworkAccessManager returns, handle custom AS port in assignment-client	2014-10-06 14:57:38 -07:00
Sam Gateau	4f26c9e0fa	fix formatting and syntax issues	2014-10-06 11:06:23 -07:00
David Rowe	32399d8620	Delete calibration message if exit VR display while calibrating	2014-10-04 20:07:37 -07:00
Sam Gateau	bd5c6517a5	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 Conflicts: interface/src/ui/MetavoxelEditor.cpp interface/src/ui/overlays/Sphere3DOverlay.cpp	2014-10-03 17:31:05 -07:00
Stephen Birarda	5203113b41	separate ICE ID and domain ID for reconnections to moved domains	2014-10-03 17:01:33 -07:00
Sam Gateau	738369e21f	Replacing glutSolidSphere by a cached Geometry Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...) - replaced all the instances of "glutSolidSphere" - Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius	2014-10-03 16:55:58 -07:00
David Rowe	d3b37684cd	Add VR display auto-calibration logic	2014-10-03 13:46:41 -07:00
Stephen Birarda	52ec949aac	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-03 11:26:23 -07:00
Stephen Birarda	ea0a1a4fb6	don't store domain hostname, leverage AddressManager only	2014-10-03 10:46:05 -07:00
Stephen Birarda	96aacab8ab	load Address from settings to get back to domain and path	2014-10-03 10:42:15 -07:00
Stephen Birarda	f27105100a	have AddressManager know its current domain and current path	2014-10-03 10:29:02 -07:00
ZappoMan	175e5d5f79	add ray picking to 3D overlays	2014-10-02 20:44:49 -07:00
Stephen Birarda	262054d0eb	handle ICE requirement in address manager response	2014-10-02 14:18:17 -07:00
Philip Rosedale	8f40780af0	Merge pull request #3517 from ctrlaltdavid/20048 CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift	2014-09-30 21:06:45 -07:00
David Rowe	673afca11b	Update camera object's position and orientation with actual Rift values	2014-09-30 10:05:59 -07:00
Stephen Birarda	3c236cc60a	resolve conflicts on merge with upstream master	2014-09-29 16:00:50 -07:00
David Rowe	1bffaa262d	Reference camera object rather than copy it	2014-09-29 15:46:22 -07:00
Stephen Birarda	a847c2d80d	move url handling to after settings load debug	2014-09-29 13:15:28 -07:00
Stephen Birarda	3fbf141686	handle avatar location changes after avatar position has been reloaded	2014-09-29 13:14:25 -07:00
Stephen Birarda	f7a17b7dec	dynamically load sixense lib on OS X to make avoiding hid_init crash easier	2014-09-29 12:58:01 -07:00
Stephen Birarda	eb7ee36168	use two dashes for url as command line option	2014-09-29 10:29:40 -07:00
Stephen Birarda	7c738edbd8	Merge pull request #3488 from PhilipRosedale/master Correct eye contact for Oculus users	2014-09-26 15:42:03 -07:00
Stephen Birarda	5b2b0c47c0	Merge pull request #3483 from stojce/20061 Code Review for Job #20061	2014-09-26 14:24:44 -07:00
AndrewMeadows	7f7861671e	Merge pull request #3471 from ctrlaltdavid/20055 Code Review for Job #20055	2014-09-26 14:00:33 -07:00
David Rowe	aa9511c263	Position Rift camera at avatar model's mid-eye location	2014-09-25 22:49:12 -07:00
Philip Rosedale	1d4b86d85b	Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus	2014-09-25 16:00:56 -07:00
stojce	6a3bc8f255	Merge branch 'master' of https://github.com/highfidelity/hifi into 20061	2014-09-25 23:57:19 +02:00
Philip Rosedale	693bc11868	Merge branch 'master' of https://github.com/worklist/hifi	2014-09-25 11:59:14 -07:00
Philip Rosedale	7836fd8a85	Add world space eye locations (for making eye contact) to the oculus manager	2014-09-25 11:58:41 -07:00
AndrewMeadows	697c7f6a61	Merge pull request #3481 from ZappoMan/collidingEntities First cut at colliding entities	2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub	0775e9dde4	Merge pull request #3479 from PhilipRosedale/master Improved eye contact, audio driven mouth and brows, linear audio scope	2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub	712f88baa3	Merge pull request #3476 from birarda/xbox-controller add script support for general SDL controllers	2014-09-25 09:25:08 -07:00
ZappoMan	f43ba4a68b	first cut at getting entities to collide	2014-09-24 15:28:04 -07:00
Philip Rosedale	75e536235c	Avatars look at your camera, not your avatar. Improvements to lookAt code	2014-09-24 14:38:44 -07:00
stojce	92cb17cbbe	Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 Conflicts: interface/src/Menu.h	2014-09-24 09:25:04 +02:00
Stephen Birarda	13d3eb02e3	report the 360 axis values in xbox.js	2014-09-23 17:19:57 -07:00
Stephen Birarda	00b0806c4d	move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick	2014-09-23 17:09:46 -07:00
stojce	8031454f61	use backslash to activate chat	2014-09-24 00:22:51 +02:00
Philip Rosedale	729d3cf9bc	Merge branch 'master' of https://github.com/worklist/hifi	2014-09-23 12:50:52 -07:00
Philip Rosedale	21a15cff2a	Avatar can look at corrected position when looking at me	2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub	b7245f8259	Merge pull request #3469 from ctrlaltdavid/20054 Code Review for Job #20054	2014-09-23 09:57:31 -07:00
Stephen Birarda	1007f528f0	Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations	2014-09-22 17:42:59 -07:00
Stephen Birarda	5be045d612	remove LocationManager and NamedLocation, replace with DataWebDialog	2014-09-22 16:55:44 -07:00
Stephen Birarda	eb0f7da517	cleanup to snapshot class to reduce passing of variables	2014-09-22 16:14:06 -07:00
Andrzej Kapolka	e6b0dc592b	Don't save the billboard.	2014-09-22 15:03:25 -07:00
Andrzej Kapolka	aeb424cd71	Fix for billboards.	2014-09-22 15:01:39 -07:00
stojce	cc83c2b2e0	Merge branch 'master' of https://github.com/highfidelity/hifi into 20061	2014-09-22 20:52:17 +02:00
stojce	466dbdcee5	added address bar dialog	2014-09-22 20:51:19 +02:00
David Rowe	a11bf7f15b	Decouple Rift head tracking from avatar's head position This makes the Rift's view reflect the user's physical movements exactly while the avatar follows the movements as best it can.	2014-09-22 11:02:12 -07:00
Andrzej Kapolka	8d3eef708a	Move various avatar render bits to post-lighting section.	2014-09-19 13:13:05 -07:00
Andrzej Kapolka	08fda3bbef	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-19 10:30:40 -07:00
Andrzej Kapolka	c6aad42f21	Move LocalLight to AvatarManager, apply it at the avatar level.	2014-09-18 17:09:53 -07:00
Andrzej Kapolka	c54e1c937c	Merge branch 'master' of https://github.com/highfidelity/hifi into deference Conflicts: interface/src/avatar/Head.cpp	2014-09-18 13:08:55 -07:00
David Rowe	ff8ea46e26	Hide menu bar when fullscreen in Rift VR display mode	2014-09-18 11:34:48 -07:00
Stephen Birarda	533a60c35e	make sure OAuthWebViewHandler is ready before the NodeList is	2014-09-18 10:34:17 -07:00
Philip Rosedale	929e463e40	Merge pull request #3447 from birarda/webkit-dialogs add a DataWebDialog class to display auth'ed pages from data-web	2014-09-18 09:48:22 -07:00
Stephen Birarda	d860b8e8db	remove test DataWebDialog from Application	2014-09-18 09:22:14 -07:00
Stephen Birarda	e2c3b626b3	add a DataWebDialog for authenticated access to data-web html	2014-09-18 09:05:25 -07:00
Andrew Meadows	8359e672bb	merge upstream/master into andrew/ragdoll	2014-09-17 17:56:35 -07:00
Stephen Birarda	7848c63fae	handle name location shortcut explicitly to work around bug	2014-09-17 14:43:48 -07:00
Andrew Meadows	489871d0d6	added MyAvatar.setMotorVelocity() & friends for JS	2014-09-16 17:09:32 -07:00

... 18 19 20 21 22 ...

4342 commits