5063 commits

Author	SHA1	Message	Date
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Howard Stearns	6f50d91208	Merge pull request #6461 from hyperlogic/tony/remove-joint-states ... Refactor of Rig and MyAvatar animation JavaScript interface	2015-11-30 16:28:15 -08:00
Anthony J. Thibault	31cecdc174	Menu: removed Enable Avatar Threading option. ... To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp. Also, removed other unused strings.	2015-11-30 15:45:23 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Anthony J. Thibault	11bfed4185	Merge branch 'master' into tony/remove-joint-states	2015-11-30 11:21:44 -08:00
Ryan Huffman	1b0413f8e3	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:23:40 -08:00
Ryan Huffman	99dd9646bc	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:20:13 -08:00
Seth Alves	081174fe69	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 10:18:01 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Andrew Meadows	bc20b72645	Merge pull request #6453 from howard-stearns/avatar-render-controller2 ... Survive Flash Mobs Without Making Everyone Sick	2015-11-25 09:52:28 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
David Rowe	5ecbaa5b93	Fix InputController (Leap Motion) not being updated	2015-11-25 09:43:55 +13:00
Andrew Meadows	5135c9dded	whitespace cleanup	2015-11-24 10:20:19 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Stephen Birarda	ab7cbc0b76	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06:00
David Rowe	d73e3a5490	Fix avatar pitch rate depending on FPS	2015-11-24 09:48:37 +13:00
David Rowe	f5d66bbf2e	Fix avatar rotation rate depending on FPS	2015-11-24 09:42:12 +13:00
Anthony J. Thibault	821264a031	Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states	2015-11-22 16:15:03 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Anthony J. Thibault	007a3c5134	Fix one frame lag in AnimDebugDraw	2015-11-20 19:00:51 -08:00
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -08:00
howard-stearns	1ddcc62db9	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2	2015-11-20 14:05:40 -08:00
howard-stearns	6c784256cb	final(?) cleanup	2015-11-20 13:51:12 -08:00
howard-stearns	a366598598	snapshot. It works.	2015-11-20 11:48:44 -08:00
Howard Stearns	0f6a37f0f7	remainder->fmod!	2015-11-20 09:49:14 -08:00
Howard Stearns	431a8c9584	cleanup	2015-11-19 17:12:50 -08:00
Ryan Huffman	07d21514c5	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-19 10:47:37 -08:00
Howard Stearns	7d30cd0159	checkpoint: it works!	2015-11-19 09:18:40 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Stephen Birarda	cb708859fb	resolve conflicts on merge with upstream master	2015-11-18 15:34:56 -08:00
howard-stearns	42a1ee353e	checkpoint	2015-11-18 14:09:33 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub	35677d3a48	Merge pull request #6418 from birarda/test-ds-settings-fail ... move keepalive pings transparently to NL	2015-11-18 11:12:16 -08:00
Stephen Birarda	0e3d3451d7	make keep alive pings the responsibility of NL	2015-11-18 10:24:10 -08:00
Brad Davis	2636e43fab	Merge pull request #6413 from samcake/controllers ... Recording: Moving the Recording js interface to the Script engine	2015-11-18 10:22:55 -08:00
Anthony J. Thibault	b481d7c73d	Merge branch 'master' into tony/remove-joint-states	2015-11-18 09:38:21 -08:00
Howard Stearns	fee13d4375	Rebuild on a new branch after original stopped building.	2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub	a1e10a9f04	Merge pull request #6309 from thoys/20724 ... CR for Job #20724 - Camera entity mode	2015-11-17 20:05:22 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -08:00
Stephen Birarda	5dc48dc9dc	resolve conflicts on merge with upstream/master	2015-11-17 17:04:12 -08:00
Stephen Birarda	935c0cc137	handle AudioInjectorManager cleanup in Application	2015-11-17 16:39:23 -08:00
Brad Hefta-Gaub	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00
Brad Hefta-Gaub	1e0b66a68f	more work	2015-11-16 19:23:39 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
Stephen Birarda	aa77c4894c	add an AudioInjectorManager for more efficient threading	2015-11-16 16:04:10 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
Seth Alves	36af315e5d	Merge pull request #6383 from birarda/goodbye-packet ... send a hopeful disconnect packet from ACs and Interface	2015-11-16 11:28:48 -08:00
Anthony J. Thibault	55adedcec8	Merge branch 'master' into tony/remove-joint-states	2015-11-16 11:22:44 -08:00
Stephen Birarda	ea38c4cc49	don't allow domain check-ins while shutting down	2015-11-12 18:04:15 -08:00
Stephen Birarda	d932ba74fd	remove the avatar kill packet from Interface	2015-11-12 17:58:12 -08:00
Stephen Birarda	6b2987eef8	handle domain server node removal in NodeList	2015-11-12 17:47:51 -08:00
Anthony J. Thibault	11440f92f4	Removed rig animations ... * Deleted AnimationHandle class * Removed enableAnimGraph and anableRigAnimations from Menu. * Removed *some* references to old IK system. But it is still used when computing collision bounding volumes	2015-11-11 15:32:57 -08:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
Anthony J. Thibault	eacc2cae0c	WIP checkpoint	2015-11-09 18:36:23 -08:00
Thijs Wenker	a58bd4ff05	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-09 22:37:44 +01:00
Seth Alves	f3d26e163d	turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system	2015-11-07 07:19:27 -08:00
Brad Davis	7c433f47c0	Breaking up input devices and input plugins classes.	2015-11-06 15:20:00 -08:00
AlessandroSigna	fdd4a55057	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 12:47:04 -08:00
AlessandroSigna	6d3a79af83	changed the behaviour of Standard.LY input	2015-11-06 12:46:08 -08:00
Atlante45	c53c0ec53f	Fix double delete on shutdown	2015-11-06 11:13:10 -08:00
Thijs Wenker	de98a17ada	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
Anthony J. Thibault	d9f4b0218e	Merge branch 'master' into tony/mac-fixes	2015-11-05 08:26:44 -08:00
samcake	00797b4dea	Merge pull request #6314 from jherico/homer ... Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 23:33:45 -08:00
Brad Davis	20d1035821	Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 15:54:50 -08:00
Thijs Wenker	42cbccc725	fix stretchy HMD view on entity camera	2015-11-04 21:39:22 +01:00
Thijs Wenker	ee218faf5e	Merge branch '20724' of github.com:thoys/hifi into 20724	2015-11-04 21:21:57 +01:00
Anthony J. Thibault	69f1cfbcb9	Fixes for Mac build and crash on startup ... For some reason the qt code gen is getting confused by the #if 0 in 3DConnextionClient.h, so I added a stub implementation. In Application.cpp the change of moving idle into paintGL had a sideeffect of calling OffscreenGlCanvas before it was initialized. To work around this I added a guard to prevent calling idle before all the gl windows/widgets have been initialized.	2015-11-04 12:04:34 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Thijs Wenker	d7279e4c88	Support for Camera Entities. ... - New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.). - New CameraMode: CameraEntity - Example script using the new cameraEntity - Updated edit.js to use the CameraEntities (with button to preview the camera)	2015-11-04 02:51:23 +01:00
Seth Alves	ffb0317a50	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-03 16:53:00 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Anthony J. Thibault	31f361d49c	Moved fps timing to beginning of paintGL ... This should improve accuracy. However the fps displayed can still sometimes be slightly greater then the vsync, this is either due to timer accuracy problems or QTimer delay within OpenGLDisplayPlugin.	2015-11-03 15:51:18 -08:00
Anthony J. Thibault	c139b62217	fps calculation now based on moving average ... fps stat is now calcualted the same way as simRate and avatarRate are calculated, based on a moving average that is sampled once a second. Also, Removed unused constants and renamed Application::checkFPS to Application::ping	2015-11-03 11:19:49 -08:00
EdgarPironti	603405ad61	Do not merge - Spacemouse	2015-11-02 23:29:15 -08:00
Anthony J. Thibault	0c12bb5a4e	Remove idleTimer and call idle directly from paintGL.	2015-11-02 18:47:18 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub	9c23f2551d	Merge pull request #6207 from jherico/pluginSupport ... Support for runtime plugins (DLLs)	2015-11-01 14:57:13 -08:00
Brad Davis	cfb2fd1523	Support for runtime plugins (DLLs)	2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub	e899229cde	tweaks to how VrMenu is shown	2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub	05dea847be	add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu	2015-10-31 15:47:40 -07:00
samcake	f72146c35d	FIxing the mac build	2015-10-29 14:17:52 -07:00
samcake	d73eafddd1	COmfort mode working with the COntroller system observing the menu state	2015-10-29 13:48:16 -07:00
samcake	e902e5e97a	Introduce the concept of loading the default Mapping	2015-10-29 13:05:29 -07:00
Brad Davis	c4e82a85d9	Remove DeviceProxy in favor of InputDevice	2015-10-29 09:32:56 -07:00
Brad Davis	570b4a32da	Merge pull request #6206 from samcake/controllers ... Controllers : Add a new kind onf controller to expose ReadOnly state from the application	2015-10-28 13:42:15 -07:00
Brad Davis	3c1a0930da	Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-10-28 13:38:22 -07:00
samcake	bbc6d9f5e7	Fixing typo and review comments	2015-10-28 12:52:21 -07:00
samcake	b37a6f689a	Fixing typo and review comments	2015-10-28 12:51:22 -07:00
samcake	fc15c7cd98	Adding the ApplicationStateDevice to the APplication class and add one entry ythere	2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub	731fab6ffc	Merge pull request #6196 from jherico/gl ... Move GL utilities to their own library	2015-10-28 12:10:52 -07:00
samcake	57aa89d14f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-28 09:24:24 -07:00
samcake	92ca658aae	Trying to get a state controller to work	2015-10-28 09:23:20 -07:00
samcake	6ec87086bc	Adding the state controller	2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub	19743c1f39	gak, build busters and more CR feedback	2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub	133d48ebee	CR feedback	2015-10-27 15:53:48 -07:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
Brad Hefta-Gaub	5a42991e0c	first pass at cleaning up MyAvatars use of PalmData	2015-10-27 13:51:42 -07:00
Andrew Meadows	a1f1e50431	split CharacterController btw phys and interface	2015-10-27 13:15:38 -07:00
samcake	87cf3b237b	Supporting a InHMD action and using it to enable COmfort mode	2015-10-27 09:59:22 -07:00
Brad Davis	e8be92cab8	Adding input action event	2015-10-23 13:36:06 -07:00
Seth Alves	264b658132	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
Brad Davis	afcec347ff	Wiring yaw action to avatar	2015-10-21 21:35:19 -07:00
Brad Davis	044a28212d	Wiring step yaw to the avatar	2015-10-21 20:44:38 -07:00
Brad Davis	a124d3b433	Moving to InputEndpoint, fixing build problem	2015-10-20 22:00:16 -07:00
samcake	da55011c2a	Trying to merge	2015-10-20 16:38:41 -07:00
Seth Alves	bc99ef778c	change how render engine is told about model position changes	2015-10-20 12:04:29 -07:00
Brad Davis	bea6fdd890	Working on JSON parsing and cleanup ... Conflicts: libraries/controllers/src/controllers/Route.cpp libraries/controllers/src/controllers/ScriptingInterface.cpp libraries/controllers/src/controllers/StandardController.cpp libraries/controllers/src/controllers/impl/RouteBuilderProxy.h	2015-10-20 10:20:28 -07:00
Brad Davis	a8e707ced2	Correcting update order to fix mouse	2015-10-18 22:46:14 -07:00
Seth Alves	a78f2a9577	have avatar make use of SpatiallyNestable	2015-10-18 09:48:46 -07:00
Brad Davis	57be59935d	Move controller test to app	2015-10-17 19:13:38 -07:00
samcake	f0034844e7	Actions working from the Controller layer	2015-10-16 12:24:12 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Brad Davis	80c962a4cc	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-15 12:27:53 -07:00
Andrew Meadows	2ae62de84e	Merge pull request #6026 from birarda/qt-polling-env ... set bearer poll timeout env for wlan scan in Qt 5.5	2015-10-15 09:58:32 -07:00
Brad Davis	0063f9ae1d	Merging old and new controller interfaces	2015-10-14 15:16:54 -07:00
Anthony J. Thibault	3e7a6fd490	Change to boom offset for 3rd person HMD camera. ... Previously the boom offset was computed in HMD sensor space instead of world space, so it did not play well with the vive, or the oculus if you weren't facing the camera directly. Now it is computed in world space, and is always behind the character's position/orientation. This can cause the boom to swing if the character rotation changes but now the avatar rotation in HMD uses comfort mode. It's not that disorienting.	2015-10-14 14:43:59 -07:00
Andrew Meadows	073b019458	Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup ... Don't reload/recenter some avatar data on startup	2015-10-13 17:08:00 -07:00
Howard Stearns	93e908a592	Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.	2015-10-13 12:15:13 -07:00
James B. Pollack	8d9bcbd793	Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle ... Remove overlay hiding from middle mouse button.	2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub	8e8ba15aaa	Merge pull request #6065 from sethalves/reorder-sims ... grab changes	2015-10-13 08:35:38 -07:00
Anthony J. Thibault	6a8ff676ed	Remove overlay hiding from middle mouse button. ... Because it conflicts with edit.js camera panning. You can still toggle the overlay via the O key.	2015-10-12 17:33:27 -07:00
Seth Alves	ed9907ce66	do avatar simulation before physics simulation so that physics actions can update based on avatar	2015-10-12 16:23:12 -07:00
Atlante45	cfba5752ce	Change checkbox text	2015-10-12 15:03:37 -07:00
Atlante45	51acf07c15	Factor couple methods in AssetUtils	2015-10-12 15:03:37 -07:00
Atlante45	eea89ba010	CR - Rename method	2015-10-12 14:26:28 -07:00
Atlante45	7b41efcf86	All file types eligible for upload to asset server	2015-10-12 13:35:21 -07:00
Atlante45	ae83dfe041	Move auto-resize to update	2015-10-09 12:23:19 -07:00
Atlante45	e056743621	Check for upload rights	2015-10-09 12:23:19 -07:00
Atlante45	2229f942df	Spawn fbx dropped in front of avatar	2015-10-09 12:23:19 -07:00
Atlante45	a1c154e7be	Fix compile error	2015-10-09 12:23:19 -07:00
Atlante45	b666acdb26	Add fbx upload on drop	2015-10-09 12:23:19 -07:00
Atlante45	2d12b2ba9a	Spacing	2015-10-09 12:23:19 -07:00
Atlante45	327154b0c0	Make _acceptedExtensions static const	2015-10-09 12:23:19 -07:00
Stephen Birarda	7987595dcd	set the bearer poll timeout for wlan scan in Qt 5.5	2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub	e1b69a1704	Merge pull request #6022 from jherico/lisa ... Fix mouse events for entity scripts	2015-10-07 20:43:41 -07:00
Brad Davis	50592a87a6	Fix mouse events for entity scripts	2015-10-07 19:44:08 -07:00
Andrew Meadows	ef58238c66	Merge pull request #6017 from ZappoMan/animationGroupSettings ... fix a bunch of warnings	2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub	c6d50af085	Merge pull request #5999 from AndrewMeadows/save-sixense-settings ... Save hydra calibration settings	2015-10-07 15:27:06 -07:00
Brad Hefta-Gaub	bfd014203e	fix a bunch of warnings	2015-10-07 14:48:42 -07:00
Andrew Meadows	0680be0422	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
Andrew Meadows	039d9a6a98	Merge pull request #6010 from ZappoMan/disableHandMouseByDefault ... Disable hand mouse by default	2015-10-07 14:15:58 -07:00
Brad Hefta-Gaub	05fd62ac51	Merge pull request #6009 from jherico/homer ... Enabling programmatic access to the IPD scale	2015-10-07 01:43:10 -07:00
Brad Davis	eff5a4c395	Picking fixes in the HMD	2015-10-06 22:56:48 -07:00
Brad Davis	028935f831	Removing deprecated function usage	2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub	6e5847bb1c	make Hand Input Mouse off by default	2015-10-06 19:58:25 -07:00
Brad Davis	19fb4e92a6	Enabling programmatic access to the IPD scale ... Conflicts: interface/src/Application.cpp interface/src/avatar/MyAvatar.cpp interface/src/scripting/HMDScriptingInterface.cpp interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:08:17 -07:00
Atlante45	ed13c02075	Fix rebase	2015-10-06 13:57:51 -07:00
Atlante45	7b25c9d417	More header cleanup	2015-10-06 13:57:50 -07:00
Atlante45	b63df98b8b	More unused	2015-10-06 13:57:49 -07:00
Atlante45	17edd38cb9	Remove unused variables	2015-10-06 13:57:48 -07:00
Atlante45	39e0d0e1dc	Put timers on the stack	2015-10-06 13:56:26 -07:00
Atlante45	e9b7125894	Misc cleanup	2015-10-06 13:56:26 -07:00
Atlante45	5e9425d9eb	Fix view frustum preference	2015-10-06 13:56:25 -07:00
Atlante45	60ebd3a544	Remove unused members (Mostly mouse stuff)	2015-10-06 13:56:25 -07:00
Atlante45	35e2f8cd89	Removed _myAvatar from Application	2015-10-06 13:56:25 -07:00
Atlante45	2fc80e58b6	Fix warning	2015-10-06 13:56:24 -07:00
Atlante45	9827c90851	Rebase fixes	2015-10-06 13:56:24 -07:00
Atlante45	8c653c70fb	Remove fps throttle from Application	2015-10-06 13:56:23 -07:00
Atlante45	4ccc2bbcd0	Enclose entire functions in ifdef	2015-10-06 13:56:23 -07:00
Atlante45	dde11c5cd1	More unused	2015-10-06 13:56:23 -07:00
Atlante45	34bba28775	More header cleanup	2015-10-06 13:56:22 -07:00
Atlante45	311edabe51	More header cleanup	2015-10-06 13:56:21 -07:00
Atlante45	765608d0ff	More unused	2015-10-06 13:56:21 -07:00
Atlante45	7da55747f5	Simplify friends window	2015-10-06 13:56:21 -07:00
Atlante45	77a7814854	Move sendPingPackets	2015-10-06 13:56:20 -07:00
Atlante45	e74df484cc	Remove unused methods	2015-10-06 13:56:20 -07:00
Atlante45	a5f31dba5f	Fix startup timer	2015-10-06 13:56:20 -07:00
Atlante45	0aab013a0e	Remove unused members	2015-10-06 13:56:20 -07:00
Atlante45	92e974929c	Move tray icon to MainWindow	2015-10-06 13:56:19 -07:00
Atlante45	0f18db886c	Remove 4 Application static methods ... - Replace by lambda - Cleaned up global scope	2015-10-06 13:56:19 -07:00
Atlante45	cf3b33a96b	Replace Application::getInstance() with qApp	2015-10-06 13:56:19 -07:00
Brad Davis	8090bc8e8d	Revert "Enabling programmatic access to the IPD scale"	2015-10-06 10:16:42 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
Howard Stearns	fdba55e56e	Merge pull request #5973 from ctrlaltdavid/20698 ... Fix Reload Content menu item not reloading FST files	2015-10-02 16:43:11 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
David Rowe	2fbb436bc5	Fix Reload Content menu item	2015-10-01 12:42:23 -07:00
Seth Alves	89ab1f626f	Merge pull request #5921 from huffman/import-export-fix ... Import/Export entities fix	2015-09-28 16:21:18 -07:00
Ryan Huffman	dde1c8b42f	Fix use of EntityTree in import/export operations ... The EntityTree needs to be references by a shared_ptr somewhere. The EntityTree does not start with a root element by default, which some operations rely on to work as expected.	2015-09-28 15:05:48 -07:00
Anthony J. Thibault	e32eb38c3b	Fix for Oculus timewarp judder introduced by 20d784ba39 ... Moved myAvatar->updateFromHMDSensorMatrix from Application::update back into Application::paintGL, so it occurs between displayPlugin->preRender() and displayPlugin->display(). We should render with the most up-to-date camera position as possible, and sample it at the same frequency as the display rate.	2015-09-28 14:38:03 -07:00
Howard Stearns	a820682816	Merge pull request #5901 from hyperlogic/tony/gangsta-lean ... Threshold based walking/leaning while in HMD.	2015-09-25 15:51:39 -07:00
Thijs Wenker	9ed1397a63	Merge branch 'master' of https://github.com/worklist/hifi into 20672	2015-09-25 21:09:38 +02:00
Anthony J. Thibault	fc9b270951	Merge branch 'master' into tony/gangsta-lean	2015-09-25 11:36:58 -07:00
Anthony J. Thibault	20d784ba39	Threshold based walking while in HMD. ... This is a blend of the previous 'sitting' and 'standing' HMD modes. Basically, when you move your head within a small range (20cm) your avatar will lean appropriately, however when you cross that threshold your body will move underneath you, re-centering your head above the body. While this occurs the avatar should play the appropriate walking animations.	2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Thijs Wenker	6d4e4af0a5	ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer	2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub	d14820d3ef	Merge pull request #5880 from thoys/20668 ... Worklist job #20668 - JS: Add option to listen audio from camera	2015-09-23 20:40:32 -07:00
samcake	46e9c463fc	Merge pull request #5885 from ZappoMan/batchOptimizations ... Batch optimizations	2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -07:00
Anthony J. Thibault	90a551214e	Fix for AnimDebugDraw crash on shutdown.	2015-09-23 11:09:43 -07:00
David Rowe	eda12fd3af	Don't look straight ahead in fullscreen mirror	2015-09-22 16:15:54 -07:00
Andrew Meadows	3af1329be2	Merge pull request #5825 from thoys/20655 ... CR for Job #20655 - Add ability to close one script from another script	2015-09-22 14:52:39 -07:00
Philip Rosedale	c09ac51d75	Merge pull request #5871 from ctrlaltdavid/20688 ... DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view	2015-09-22 10:17:28 -07:00
Thijs Wenker	90b89cbb45	Merge branch 'master' of https://github.com/worklist/hifi into 20655	2015-09-22 18:44:25 +02:00
Thijs Wenker	dfb9034b4e	- delete new AudioListenerMode menu on script ending ... - style fix (function naming)	2015-09-22 15:45:57 +02:00
Thijs Wenker	617f048883	Added JS interface to change audio listening position / orientation in Interface ... - MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM - MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions	2015-09-22 13:40:33 +02:00
David Rowe	30dc07b621	Code tidying	2015-09-21 21:22:36 -07:00
David Rowe	0f85c28098	Fix HMD 3rd person view	2015-09-21 21:08:13 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
samcake	a485d3d6de	Fixing the rendering of ProceduralSkybox	2015-09-21 15:21:48 -07:00
David Rowe	46524632fe	Fix eyeball directions in fullscreen HMD view	2015-09-21 14:18:33 -07:00
David Rowe	7ffde27224	Fix HMD fullscreen mirror view	2015-09-21 14:04:32 -07:00
samcake	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub	416acb1d4a	remove call to _entities.render() in displaySide()	2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub	0ba1e8c945	remove renderingInWorldInterface signals	2015-09-18 09:49:57 -07:00
Brad Hefta-Gaub	7840f122dc	add reload all support for entity scripts	2015-09-16 16:46:46 -07:00
Atlante45	9678e70444	Asset caching	2015-09-16 15:17:15 +02:00
Atlante45	eabee9857a	Enum coding standard	2015-09-16 15:17:14 +02:00
Thijs Wenker	9992f4b5c5	Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: ... made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename	2015-09-16 01:16:58 +02:00
Howard Stearns	848bb4fccb	Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines ... Added point and grab support to the AnimGraph	2015-09-15 15:47:19 -07:00
Brad Hefta-Gaub	54a45f3173	Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup ... Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub	94b273a029	more work on script engine	2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub	a3c0288eae	more work on proper threading of ScriptEngine	2015-09-14 20:26:04 -07:00
Anthony J. Thibault	90f46ba2c8	Added hand state machines to AnimGraph. ... * Application: Forward trigger values to the MyAvatar's PalmData * SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then the Rig::inverseKinematics methods. * AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets * Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars * avatar.json - udpated with new hand state machine with temporary animations	2015-09-14 18:54:12 -07:00
Seth Alves	49ee251238	quiet compiler	2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub	f85cb2c888	first cut at cleaning up ScriptEngine class	2015-09-11 19:12:09 -07:00
Seth Alves	e65ef93663	Merge pull request #5778 from jherico/homer ... Fixing some entity race condition crashes	2015-09-11 17:54:53 -07:00
Andrew Meadows	9c6060160a	Merge pull request #5784 from howard-stearns/rationalize-rig-settings ... Rationalize rig settings	2015-09-11 16:56:44 -07:00
Brad Davis	9b81842850	Merge branch 'master' into homer ... Conflicts: assignment-client/src/octree/OctreeSendThread.cpp interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/EntityTreeElement.h libraries/entities/src/EntityTreeHeadlessViewer.cpp libraries/entities/src/RecurseOctreeToMapOperator.cpp libraries/octree/src/Octree.h libraries/physics/src/EntityMotionState.cpp	2015-09-11 16:31:18 -07:00
Brad Davis	e458eb7ae9	Merge pull request #5734 from sethalves/octree-shared-pointers ... octree uses shared pointers	2015-09-11 16:00:04 -07:00
Howard Stearns	f8f2a067a1	whitespace	2015-09-11 12:59:07 -07:00
Howard Stearns	02fba12a48	Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings	2015-09-11 11:53:19 -07:00
Howard Stearns	67ce0966d1	Rationalize the rig state setters.	2015-09-11 11:52:20 -07:00
Brad Davis	7fecd3261d	Fixing bad merge	2015-09-11 11:40:57 -07:00
Brad Davis	244795b629	Merge branch 'homer' into temp ... Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Atlante45	449d6a04d8	CR	2015-09-11 14:21:56 +02:00
Atlante45	42d1ab3745	Remove accidentally added header	2015-09-11 14:21:55 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Brad Davis	e9edbb9dd1	Can't promote readlock to writelock	2015-09-10 22:52:40 -07:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
David Rowe	4aa553c183	Stop DDE and EyeTracker early but don't destroy until later in shutdown	2015-09-10 14:53:56 -07:00
Andrew Meadows	35b894872d	Merge pull request #5753 from ctrlaltdavid/20671 ... Terminate DDE earlier during shut-down and always at start-up	2015-09-10 07:46:53 -07:00
Brad Hefta-Gaub	f29bcd8b6a	Merge pull request #5755 from jherico/lisa ... Fix possible hang when switching out of Oculus mode	2015-09-09 19:24:00 -07:00
Brad Davis	382de2b4aa	Fix possible hang when switching out of Oculus mode	2015-09-09 14:09:01 -07:00
Howard Stearns	ed2ed525b2	Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate.	2015-09-09 12:15:48 -07:00
David Rowe	01d7e68dbb	Terminate DDE earlier during shut-down and always at start-up	2015-09-09 11:29:57 -07:00
Seth Alves	9c4fdfd653	merge from upstream	2015-09-08 18:01:07 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	26f63a44fc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 15:30:22 -07:00
Howard Stearns	27f4bca0a4	Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! ... Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.	2015-09-08 14:49:58 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Stephen Birarda	25aeda2e18	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Howard Stearns	d472fd66ff	Cleanup.	2015-09-07 17:26:22 -07:00
Howard Stearns	efeaf21305	Checkpoint smoother.	2015-09-07 16:32:51 -07:00
Howard Stearns	0065c64b31	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
James B. Pollack	670c5ee484	Merge pull request #5723 from jherico/lisa ... Toggle mute while holding the hydras	2015-09-06 21:45:47 -07:00
David Rowe	6923e3ce70	Fix logging of intentionally crashing Interface	2015-09-06 16:28:55 -07:00
Brad Davis	644e81e20b	Toggle mute while holding the hydras	2015-09-04 16:19:58 -07:00
Brad Hefta-Gaub	b63e15f2e9	fix a bug in bad PPS calculation	2015-09-04 15:06:56 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Anthony J. Thibault	df28c7bf1a	Merge branch 'master' into ajt/new-anim-system	2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub	20bd14c8db	Merge pull request #5684 from rabedik/fxaa ... Post-process anti-aliasing effect	2015-09-04 09:01:39 -07:00
Howard Stearns	c0fec44f32	Menu item to switch between threaded and not (without restart!).	2015-09-03 19:34:25 -07:00
Anthony J. Thibault	3716d5612b	Merge branch 'master' into ajt/new-anim-system	2015-09-03 19:20:06 -07:00
Howard Stearns	32eb51d0fa	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-03 13:55:57 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
Anthony J. Thibault	de31b92fd5	Merge branch 'master' into ajt/new-anim-system	2015-09-02 17:53:56 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Howard Stearns	8cf71f285d	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-01 16:03:40 -07:00
Stephen Birarda	33f6933544	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-01 14:36:16 -06:00
Anthony J. Thibault	2401e6cc4b	Merge branch 'master' into ajt/new-anim-system	2015-09-01 10:58:38 -07:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Raffi Bedikian	59a758b5ec	Add AA state to RenderContext and Menu	2015-08-30 20:38:05 -07:00
Seth Alves	752c787f0b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-28 12:50:31 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Howard Stearns	b3a919a5ca	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-27 13:46:12 -07:00
Seth Alves	e97e7de19c	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-27 13:19:15 -07:00
Stephen Birarda	229015a5da	don't allow asset-server upload if no server present	2015-08-27 12:21:38 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 ... Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Anthony J. Thibault	a04f356857	Merge branch 'master' into ajt/new-anim-system	2015-08-27 09:32:53 -07:00
Seth Alves	435863d1f0	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-26 17:33:59 -07:00
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Howard Stearns	0e18395fd0	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 12:04:28 -07:00
Anthony J. Thibault	46c1e008bc	Merge branch 'master' into ajt/new-anim-system	2015-08-26 10:37:39 -07:00
Seth Alves	23dbbcc7bb	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-26 09:42:20 -07:00
Andrew Meadows	45c846572e	Merge pull request #5645 from jherico/maggie ... Fixing problems reported by static analysis tool	2015-08-26 08:31:05 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub	b19f1e0631	Merge pull request #5658 from ctrlaltdavid/20653 ... Add Desktop object to JavaScript with width and height properties	2015-08-25 23:18:20 -07:00
Howard Stearns	38bc8634de	displayPlugin is not thread safe, and switch from simulate rate to interval in prep for sleep.	2015-08-25 21:26:46 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Brad Davis	f176003dad	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
Howard Stearns	b8ca604bf8	Checkpoint before GenericThread.	2015-08-25 16:17:50 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Howard Stearns	2ca4768766	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-25 10:44:54 -07:00
Seth Alves	91254245e4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-24 20:21:24 -07:00
Brad Hefta-Gaub	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
Howard Stearns	828509e8eb	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-24 15:01:46 -07:00
Anthony J. Thibault	fa5256eefd	Merge branch 'master' into ajt/new-anim-system	2015-08-24 14:32:28 -07:00
David Rowe	f6cf77ae68	Add Developer > Display Crash Options menu item ... Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.	2015-08-24 13:24:31 -07:00
David Rowe	9c782f6a6d	Display dialog of crash handling options at startup if Interface crashed ... Default option and Esc continue without taking any action.	2015-08-24 12:45:35 -07:00
David Rowe	63ad972576	Write and delete "application is running" marker file	2015-08-24 11:09:41 -07:00
David Rowe	07c9a0e2bb	Add Developer > Crash Interface menu item	2015-08-24 10:48:58 -07:00
Thijs Wenker	0f8cf80d45	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Thijs Wenker	748625399e	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
Brad Davis	d3135dcfa6	Stereo rendering work	2015-08-22 16:15:10 -07:00
Howard Stearns	74fd640f16	Restore the ability to change avatars from the edit.js marketplace button.	2015-08-21 16:49:07 -07:00
Seth Alves	fdad8fc651	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-21 13:19:19 -07:00
Howard Stearns	e84cc03bcc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 11:35:42 -07:00
samcake	66087872a3	Merge pull request #5621 from highfidelity/stereo ... New stereo rendering mechanism	2015-08-21 11:23:14 -07:00
Seth Alves	105470bf26	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-21 11:02:16 -07:00
Seth Alves	6db0442fda	allow for asynchronous building of collision shape	2015-08-21 10:48:26 -07:00
Brad Davis	b8b0917d9d	Attempting to fix judder issues	2015-08-21 10:01:11 -07:00
ZappoMan	a0552050b0	set vsync on startup	2015-08-21 08:23:18 -07:00
Howard Stearns	ae3e052e72	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 08:13:44 -07:00
Brad Davis	1e074ab81c	Remove superfluous clear	2015-08-21 00:29:28 -07:00
Brad Davis	cc037c8828	Fix culling calculations in HMD with new stereo mechanism	2015-08-21 00:29:27 -07:00
Brad Davis	476e5edb32	Fixing HMD wobble	2015-08-21 00:29:26 -07:00
Brad Davis	7fb491e48c	Cleanup plugin interface, break up oculus plugins	2015-08-21 00:29:25 -07:00
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
ZappoMan	bd29fb2474	fix ifdef	2015-08-20 19:33:39 -07:00
ZappoMan	06b2a88fb6	toggle menu near top of window	2015-08-20 19:33:22 -07:00
ZappoMan	9f501d4d72	first cut at attempting to hide menu in full screen	2015-08-20 19:33:06 -07:00
ZappoMan	cd050b2e60	don't show hmd tools for direct mod HMDs	2015-08-20 09:53:58 -07:00
Brad Davis	9faf452196	Make sure that items added via plugins can be removed as well	2015-08-20 00:32:25 -07:00
ZappoMan	6a7f367e5f	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
Stephen Birarda	42a7262707	Merge pull request #5565 from murillodigital/node-version ... DO NOT MERGE - Node versioning	2015-08-19 13:32:48 -07:00
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Seth Alves	537b690d60	Merge pull request #5566 from howard-stearns/recapitate ... Get rid of separate head/body avatar	2015-08-19 10:46:05 -07:00
Philip Rosedale	eef556eeb2	Merge pull request #5593 from thoys/20528 ... CR for Job #20528 - Tool window unavailable in Windows Client.	2015-08-18 21:23:14 -07:00
Howard Stearns	c90845dfcb	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-18 15:38:14 -07:00
Howard Stearns	dc75b238a8	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates ... And update with current code.	2015-08-18 15:35:37 -07:00
Brad Davis	944734fed2	Remove focus highlight on delete entity	2015-08-18 13:59:39 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00
Thijs Wenker	44399da41c	Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever.	2015-08-18 14:54:21 +02:00
Seth Alves	e29bb9183b	minimize diff	2015-08-18 02:08:21 -07:00
Seth Alves	8435550fe9	only update simRate once per second	2015-08-18 02:05:50 -07:00
Seth Alves	551f0aaba3	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
Brad Davis	3cbbb5fb79	Fix crash on mouse click	2015-08-18 00:05:02 -07:00
Howard Stearns	9ed418f7b6	Simple frequencey decoupling. Still same thread.	2015-08-17 19:19:11 -07:00
Brad Davis	cb5f80bf78	Add highlighting of keyboard focused items	2015-08-17 17:11:26 -07:00
Brad Davis	5d65937120	Merge pull request #5583 from ZappoMan/clickToFocusWebEntity ... make web entity focus click based	2015-08-17 16:57:39 -07:00
Philip Rosedale	01108bdf6b	Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors ... Synchronize eye joint and debugging vectors	2015-08-17 16:56:01 -07:00
ZappoMan	49cf29ce8f	cleanup debugging and dead code	2015-08-17 15:57:20 -07:00
ZappoMan	47b0e2fda6	more hacking on click to focus	2015-08-17 14:02:24 -07:00
ZappoMan	b7d9dc444b	more work on clicking focus	2015-08-17 13:06:32 -07:00
ZappoMan	8cf450cb67	first cut at making focus click based	2015-08-17 11:41:54 -07:00
Brad Davis	9706a44ca1	Merge pull request #5571 from ZappoMan/hmdToolsRedux ... remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 20:11:27 -07:00
Brad Davis	dc2ddd0303	switch statement spacing	2015-08-14 17:12:00 -07:00
Howard Stearns	d28c555a79	Synchronize eye joint and debugging vectors when the other avatar is looking at me.	2015-08-14 16:47:34 -07:00
Brad Davis	db95657455	PR comments	2015-08-14 16:40:53 -07:00
ZappoMan	6a802560f2	remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 16:27:50 -07:00
Brad Davis	208e41efd1	WebEntity keyboard input with mouse hover	2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub	31a49a551a	Merge pull request #5556 from jherico/bart ... QML framerate improvments	2015-08-14 11:11:14 -07:00
Howard Stearns	1133e053d1	Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.	2015-08-14 07:33:36 -07:00
Howard Stearns	0f6c0a3117	Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate	2015-08-13 15:56:13 -07:00
Howard Stearns	2756a00638	Get default avatar url from resources.	2015-08-13 14:23:34 -07:00
Leonardo Murillo	cda5b29fd3	Another take at versioning details exchange - checkpoint	2015-08-13 14:19:13 -06:00
Howard Stearns	62941c0914	Remove dead code.	2015-08-13 12:39:30 -07:00
Brad Davis	0fa3044231	QML framerate improvments	2015-08-12 16:24:34 -07:00
David Rowe	0f56285283	Fix HMD look-at positions and lines	2015-08-11 18:54:55 -07:00
David Rowe	3e8d0ad712	Fix to use new HMD methods	2015-08-11 13:40:08 -07:00
David Rowe	e6473fc8b9	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.h tests/ui/src/main.cpp	2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub	35d6528d08	Merge pull request #5550 from jherico/marge ... PLUGINS - Cleaning up HMD tools	2015-08-11 10:46:59 -07:00
Bradley Austin Davis	7694c1c0a6	Cleaning up HMD tools	2015-08-10 21:39:36 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
David Rowe	80e296edd0	Merge branch 'master' into 20639	2015-08-10 19:25:12 -07:00
David Rowe	8b326414ac	Start eye tracker streaming such that don't block Interface ... Start method is called in a separate thread.	2015-08-10 19:19:29 -07:00
Bradley Austin Davis	61ecee93b8	Fix mis-positioning of QML elements when moving from retina to non-retina display	2015-08-10 15:18:49 -07:00
ericrius1	0f7c21ddd7	rearranged entity props and added check in setNormals to avoid uninitialized binormal values	2015-08-10 11:55:47 -07:00
Brad Davis	57408c4338	Automatically show HMD tools when switching an HMD plugin	2015-08-09 12:14:29 -07:00
Brad Davis	5515b9d8ee	Decouple Application and plugin definitions, cleanup container usage	2015-08-08 17:51:16 -07:00
Bradley Austin Davis	2878950dbe	Fix crash on startup on mac	2015-08-08 15:26:38 -07:00
Brad Davis	751db23bc8	Fixing naming, and improving viewport handling	2015-08-08 14:19:43 -07:00
Brad Davis	639a0822fe	Fixing aspect ratio	2015-08-08 14:08:41 -07:00
Brad Davis	ccc4a59992	Cleanup and PR comments	2015-08-08 13:54:37 -07:00
Brad Davis	4b5c71e16d	Merge fixes	2015-08-08 13:37:46 -07:00
Brad Davis	caf93d1aff	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Menu.h	2015-08-08 13:18:13 -07:00
David Rowe	051a398fa2	Merge branch 'master' into 20639	2015-08-07 18:26:56 -07:00
David Rowe	ea03067a02	When eye tracking data is lot for > N seconds handle as "not tracking" ... Revert to default look-at behaviour and saccades until tracking resumes.	2015-08-07 12:23:43 -07:00
David Rowe	e2bf5cad3e	Resume eye tracking at start-up if was running at shut-down	2015-08-07 11:59:11 -07:00
ZappoMan	87f609b9af	remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows	2015-08-07 11:26:07 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
David Rowe	551c00dc23	Fix look-at position calculation when in HMD display ... Calculate look-at target from camera position and orientation. Render own look-at vectors from camera eye positions. Draw other avatar's look-at vectors from their eyeballs. With and without eye trackers.	2015-08-06 16:41:06 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
David Rowe	d7b42e264e	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt	2015-08-05 16:49:06 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Andrew Meadows	59f6988e56	Merge pull request #5465 from SamGondelman/connexionFixes ... Trying to fix/clean up 3DConnexion stuff	2015-08-05 11:16:34 -07:00
Stephen Birarda	052978898e	resolve conflicts on merge with upstream master	2015-08-05 11:16:20 -07:00
Philip Rosedale	06710618d1	Merge pull request #5463 from ctrlaltdavid/20640 ... CR for 20640 - Add DDE option to couple eyelids	2015-08-05 08:47:28 -07:00
Anthony J. Thibault	b8bae7cc3f	Debug rendering of MyAvatar’s skeletonModel skeleton	2015-08-04 18:14:47 -07:00
Anthony J. Thibault	91ca13c66d	Added AnimDebugDraw to render-utils	2015-08-04 18:14:46 -07:00
David Rowe	c771574578	Add 5 point eye tracker calibration option	2015-08-04 18:02:34 -07:00
Sam Gateau	fc0ee28b84	FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD	2015-08-04 16:31:20 -07:00
David Rowe	fefddb631f	Add 1 and 3 point eye tracker calibration	2015-08-04 14:46:03 -07:00
Bradley Austin Davis	3c76c0d4b6	Merge remote-tracking branch 'upstream/master' into core	2015-08-04 10:23:54 -07:00
Bradley Austin Davis	29c9e6e45e	Updating plugins to core profile	2015-08-04 00:33:03 -07:00
Bradley Austin Davis	53ccbfc4fa	Merge branch 'core' into plugins	2015-08-03 22:25:50 -07:00
Bradley Austin Davis	ed5f70039f	Merge branch 'master' into core	2015-08-03 22:18:38 -07:00
David Rowe	b71ad31812	Merge branch 'master' into 20639	2015-08-03 20:53:12 -07:00
Ryan Huffman	027adf73bb	Merge branch 'master' of github.com:highfidelity/hifi into asset-server	2015-08-03 16:41:24 -07:00
Sam Gondelman	c9780338ae	merge from master	2015-08-03 16:27:45 -07:00
Ryan Huffman	4e1b52a022	Add thread for AssetClient	2015-08-03 16:25:07 -07:00
ericrius1	12770edbe1	Merge branch 'master' into polyLineInProgress	2015-08-03 15:52:26 -07:00
David Rowe	7749b912ea	Merge branch 'master' into 20639	2015-08-03 09:55:35 -07:00
ericrius1	47bc8f50ab	cleaning	2015-08-03 08:45:14 -07:00
Brad Davis	8ac33453b5	Fix v-sync functionality	2015-08-01 22:10:47 -07:00
Sam Gondelman	01c4e17236	trying to fix connexion linker errors, general style fixes, renamed some files	2015-08-01 11:41:29 -07:00
SamGondelman	8908c7c141	working on windows crash	2015-07-31 17:55:59 -07:00
Zander Otavka	0524155349	Expose face tracking to the script engine.	2015-07-31 11:26:04 -07:00
Zander Otavka	c77a91eb63	Expose address bar toggling to scripts.	2015-07-31 11:26:04 -07:00
Brad Davis	155f88e267	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/devices/TV3DManager.h libraries/gpu/src/gpu/GPUConfig.h	2015-07-31 10:28:06 -07:00
Bradley Austin Davis	ac0ec0a458	Ensure the app moves back to a non-rift screen if the saved geometry is bad	2015-07-30 17:09:08 -07:00
Brad Davis	948d5dab0c	Cleaning up diff	2015-07-30 15:30:05 -07:00
Sam Gateau	14f4c9c6c0	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
Brad Davis	f7a2513f26	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/MyAvatar.h tests/ui/src/main.cpp	2015-07-30 12:55:22 -07:00
Bradley Austin Davis	fccb07dc93	Tweaking timing of geometry restoration	2015-07-30 12:44:47 -07:00
Sam Gondelman	b19376ef6e	trying to fix connexion linker errors, general style fixes, renamed some files	2015-07-30 12:17:36 -07:00
Brad Davis	5878a4661c	Restoring HMD tools dialog, phase 1	2015-07-30 11:35:55 -07:00
Brad Davis	382ef057b0	Revert to using QGLWidget	2015-07-30 10:59:05 -07:00
David Rowe	46b4817155	Add DDE option to couple eyelids ... Use the most "open" value for both.	2015-07-29 20:08:58 -07:00
samcake	e32e45ed2b	make sure the writting mask is on for depth buffer	2015-07-29 18:06:46 -07:00
samcake	ac46b2bd17	Keep the resetstage in	2015-07-29 17:38:23 -07:00
Sam Gateau	8b7ad9cfcb	merge with upstream	2015-07-29 17:13:48 -07:00
Sam Gateau	ab4b940d83	merge with upstream	2015-07-29 17:11:13 -07:00
Sam Gondelman	9025bc3ead	press o to toggle overlays in case you don't have a middle mouse click	2015-07-29 16:43:25 -07:00
David Rowe	02ae008c9c	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt	2015-07-29 16:24:30 -07:00
David Rowe	ed259e6bbb	Merge branch 'master' into 20639	2015-07-29 11:44:58 -07:00
David Rowe	e5d2a78980	Don't check SMI Eye Tracker menu item if tracking doesn't start	2015-07-29 11:33:21 -07:00
samcake	4ebc75da1f	Merge pull request #5369 from ericrius1/hitEffect ... Added functionality for displaying a screen-space hit effect	2015-07-29 11:28:08 -07:00
David Rowe	76fe0c8764	Control eyes only if in HMD view or simulating	2015-07-29 11:14:00 -07:00
Andrew Meadows	a1e6fdc4b2	Merge pull request #5435 from MarcelEdward/hifi-2-20069 ... Hifi 2 20069	2015-07-29 11:13:30 -07:00
Brad Davis	900c2c11df	Another whack at touch events	2015-07-29 10:29:27 -07:00
ericrius1	697cb4c9d0	fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine	2015-07-29 10:02:06 -07:00
Brad Davis	07553e7a7c	Accept touch events in the GL window	2015-07-29 10:00:41 -07:00
David Rowe	1ae920368d	Calculate and look at the point the eye tracker user is looking at	2015-07-29 08:38:20 -07:00
Brad Davis	bb29127eff	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-28 23:14:41 -07:00
Anthony J. Thibault	044ea2ace5	Changed mirror position to not be achored to the head. ... But instead it's anchored to the "default" eye position, which is where the eyes are in the model, before IK or animations occur.	2015-07-28 19:31:43 -07:00
Brad Davis	3210037bc1	Merge pull request #5449 from ZappoMan/plugins ... Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity	2015-07-28 16:49:30 -07:00
Brad Davis	91768b3992	Merge pull request #5450 from SamGondelman/sam/input-plugins ... Plugins branch - re-remove hand lasers	2015-07-28 16:25:55 -07:00
Brad Davis	8202862750	Working on display plugins stability	2015-07-28 16:22:22 -07:00
samcake	9cf3dfd3f7	test this on windows ?	2015-07-28 15:49:39 -07:00
ZappoMan	c15161b71a	fix crash in Particle Entities and pendingChanges.updateItem()	2015-07-28 14:56:38 -07:00
David Rowe	f0ed8d8cef	Add menu item that enables / disables simulated eye tracking	2015-07-28 14:07:25 -07:00
SamGondelman	482f064c64	Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins	2015-07-28 12:56:54 -07:00
SamGondelman	782a5c491e	removed hand lasers because they had been renamed so they weren't removed	2015-07-28 12:56:31 -07:00
Bradley Austin Davis	6df260b3f9	Bad variable usage on OSX	2015-07-28 12:47:52 -07:00
Brad Davis	2bb7a20578	Working on fullscreen targeting	2015-07-28 11:30:35 -07:00
David Rowe	72a590e34c	Initialize, start, and stop eye tracking with simulated data	2015-07-28 11:02:56 -07:00
Sam Gateau	22e70ee691	merged master	2015-07-28 10:13:05 -07:00
Sam Gondelman	469696f283	Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins	2015-07-28 10:06:42 -07:00
Brad Davis	a049b14d13	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub	43eec08514	Merge pull request #5376 from venkatn93/avatar ... New ambient occlusion effect in render pipeline	2015-07-28 09:58:51 -07:00
David Rowe	8a7cdb1c64	Make Throttle FPS If Not Focus be enabled by default	2015-07-27 19:53:38 -07:00
Sam Gateau	baf7873ce1	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-27 17:40:19 -07:00
Sam Gateau	f525a8a245	Removing all the unecessary calls of Batch from the gl legacy time	2015-07-27 17:17:56 -07:00
Niraj Venkat	34e400ac67	Changing var name to 'DebugAmbientOcclusion'	2015-07-27 17:14:09 -07:00
David Rowe	e0ca6eb5ed	Add eye tracker class and menu item	2015-07-27 15:33:15 -07:00
Sam Gateau	a5ad40bee9	INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked	2015-07-27 14:07:28 -07:00
Sam Gondelman	b2e18b529b	toggle overlay with mouse middle click, controller 'right click'	2015-07-27 10:09:59 -07:00
Stephen Birarda	d3c6d8b3cc	move call to get VoxelPositionSize inside debug that uses it	2015-07-27 10:06:34 -07:00
Marcel Verhagen	32d0513962	The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 ... For now without a merge conflict. Updated the menu name. Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.	2015-07-27 19:04:49 +02:00
Stephen Birarda	615218c77d	use a ref in stats unpacking	2015-07-27 09:58:58 -07:00
Stephen Birarda	9c57d1544f	fix OctreeSceneStat unpacking in Application	2015-07-27 09:53:27 -07:00
Niraj Venkat	83e0856279	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-27 09:20:19 -07:00
Bradley Austin Davis	0cbc12af8b	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-27 10:15:10 -04:00
Seth Alves	24fff719c5	quiet compiler	2015-07-25 21:11:23 -07:00
Bradley Austin Davis	7edf138843	Attempting to fix offscreen UI event handling	2015-07-25 19:26:38 -04:00
Sam Gondelman	f801471dd7	remove unnecessary line	2015-07-24 17:33:06 -07:00
Sam Gondelman	1af51572af	fixed init crash if you follow very specific startup steps	2015-07-24 17:10:39 -07:00
Sam Gondelman	0e4d065cbc	Merge remote-tracking branch 'upstream/plugins' into macPluginsFix	2015-07-24 16:52:16 -07:00
Brad Davis	dc4ef8e648	Merge pull request #5426 from hyperlogic/ajt/vive-camera-fix ... paintGL camera change for Vive	2015-07-24 18:43:34 -04:00
Stephen Birarda	82def6e15f	resolve conflicts on merge with upstream/master	2015-07-24 15:40:35 -07:00
Sam Gondelman	07aed20280	paintGL camera change for Vive ... During rendering the application camera needs to be somewhere near where it's final position. This is because it is used in several places, specifically it is used to determine if the camera is close to the avatar's head, in order to hide it.	2015-07-24 15:37:39 -07:00
Bradley Austin Davis	0efa2c0eee	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-24 17:33:24 -04:00
Niraj Venkat	fc612ab8cd	Merge conflict fix	2015-07-24 11:29:52 -07:00
Niraj Venkat	e036602726	Fixing merge conflicts	2015-07-24 11:08:40 -07:00
Bradley Austin Davis	975c95eded	Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins	2015-07-24 13:59:11 -04:00
samcake	f3dc159e33	Merge pull request #5401 from ZappoMan/renderLaserPointers ... remove renderLaserPointers()	2015-07-24 10:41:32 -07:00
Bradley Austin Davis	a60e669d3d	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
Brad Hefta-Gaub	939638a3a8	Merge pull request #5414 from birarda/slow-events ... allow the QEvent queue in Application to get behind	2015-07-24 10:10:42 -07:00
Brad Davis	6eec04c798	Merge pull request #5407 from samcake/yellow ... Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target	2015-07-24 13:09:07 -04:00
samcake	e6f2504514	FIx the problem of clear when the color mask is not WRITE_ALL	2015-07-24 09:26:32 -07:00
Brad Davis	6899279d7d	Merge pull request #5399 from ZappoMan/fixJSRayPick ... Fix JS calls to computePickRay() when mini-mirror is showing	2015-07-24 11:46:07 -04:00
Seth Alves	6841a47c4b	Merge pull request #5412 from AndrewMeadows/bohrium ... decouple FPS from rotation rate during mouse drag	2015-07-24 07:44:22 -07:00
samcake	52ac5b3ef6	On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize	2015-07-24 03:38:21 -07:00
Sam Gateau	cb375e8ece	FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler	2015-07-24 02:15:50 -07:00
Anthony J. Thibault	87a0e48d30	Updates to overlay fade ... * vive rendering works again * overlay fades away in standing mode, if you look or move away from the overlay sphere. * middle mouse button can be used to fade in or out the overlay * mouse pointer renders properly on overlay	2015-07-23 20:36:58 -07:00
samcake	8421aafe33	try to fix the scaling issues on mac	2015-07-23 18:17:10 -07:00
Stephen Birarda	cdcab299b6	bring back delayed queue of Application events	2015-07-23 18:00:35 -07:00
Andrew Meadows	2fc158246d	decouple FPS from rotation rate during mouse drag	2015-07-23 17:30:50 -07:00
Anthony J. Thibault	1d93abf90c	Overlay can be shown and hidden and has better behavior in Standing HMD Mode. ... Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.	2015-07-23 17:17:03 -07:00
Sam Gateau	a424ff98ca	Fixing issues with the review process	2015-07-23 16:55:18 -07:00
Sam Gateau	d56b5f39fb	strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels	2015-07-23 16:31:11 -07:00
Sam Gateau	be9d99264f	Introducing the download Framebuffer call on the context to capture a snapshot	2015-07-23 16:15:10 -07:00
Sam Gondelman	7c9189cfbe	trying to fix init issue	2015-07-23 16:13:27 -07:00
Ryan Huffman	0b2e896ea4	Add Asset-related types and packets	2015-07-23 15:13:56 -07:00
Sam Gateau	dc10f30d3d	Merged	2015-07-23 15:10:42 -07:00
Sam Gateau	a561874ce3	Render the rear view mirror in a separate target and then display it during overlay pass	2015-07-23 14:56:14 -07:00
Bradley Austin Davis	00342d2c76	Fixing the avatar / HMD pose compisition for Oculus	2015-07-23 17:48:06 -04:00
Stephen Birarda	9e7fb9ae16	shuffle Packet headers, use static enum for PacketType	2015-07-23 13:56:47 -07:00
Bradley Austin Davis	4ad72be0c7	Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins	2015-07-23 15:40:22 -04:00
Bradley Austin Davis	96a52c4f02	Working on mac oculus functionality	2015-07-23 15:38:23 -04:00
Sam Gondelman	4c6783a791	Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins	2015-07-23 11:46:07 -07:00
David Rowe	ad7167c67a	Merge branch 'master' into 20602	2015-07-23 11:22:05 -07:00
Bradley Austin Davis	40485948f9	Fixing merge boo-boos	2015-07-23 13:49:17 -04:00
ZappoMan	f4ec09a48b	move renderLaserPointers() into a draw item	2015-07-23 10:42:22 -07:00
Bradley Austin Davis	1db4162371	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
Niraj Venkat	9ccf316513	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-23 10:36:46 -07:00
Stephen Birarda	67ca8b2347	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-23 09:51:44 -07:00
ZappoMan	3350d638dd	always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror	2015-07-23 09:29:27 -07:00
Brad Hefta-Gaub	a27a2f601b	Merge pull request #5395 from huffman/fix-ray-picking ... Fix ray picking working intermittently	2015-07-23 08:15:15 -07:00
Ryan Huffman	198b6cfa88	Fix ray picking working intermittently ... Ray picking relies on the Application's viewFrustum which was being set to both the main camera and mirror camera for their respective pass while rendering. This makes sure the viewFrustum only ever holds the main camera. Application::_displayViewFrustum still gets updated to the current camera while rendering.	2015-07-23 06:17:08 -07:00
Stephen Birarda	7cee5f3ce5	don't reset the idleTimer if the interval hasn't changed	2015-07-22 18:05:04 -07:00
Stephen Birarda	db5e8c72ee	force event processing up to a certain max time	2015-07-22 17:59:07 -07:00
Stephen Birarda	785ae190ca	add back send posted touch events	2015-07-22 17:49:27 -07:00
ZappoMan	71eeecc7f6	Revert "Instrument the inter-idle time and tweaking the timeout setting" ... This reverts commit 0c88972f09.	2015-07-22 16:53:56 -07:00
SamGondelman	e27ba86f75	fixing merge issues with plugins	2015-07-22 14:57:59 -07:00
SamGondelman	505ef4c5cc	set up sixense/vive menu items with correct event forwarding	2015-07-22 11:36:31 -07:00
Sam Gateau	f70553ec95	Fixing merge	2015-07-22 11:31:46 -07:00
Anthony J. Thibault	700909d537	Fix for mirror rendering ... RenderArgs _renderMode was not getting set properly in renderRearViewMirror(). Previously this was set in PaintGL but was lost during display plugins refactor.	2015-07-22 11:11:12 -07:00
Stephen Birarda	8363b0d522	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-22 11:06:53 -07:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Niraj Venkat	adf7a1098d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-22 10:27:39 -07:00
Bradley Austin Davis	408bb082d7	Merge fixes, OSX compile fixes	2015-07-22 13:24:47 -04:00
Bradley Austin Davis	114ab9e47f	Merge branch 'master' into plugins	2015-07-22 11:47:56 -04:00
Bradley Austin Davis	2f13488f11	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04:00
Bradley Austin Davis	c0048afbec	Merge branch 'bart' into marge	2015-07-22 09:07:45 -04:00
Bradley Austin Davis	ae539afafb	Fix deadlock when using textoverlay from main thread	2015-07-22 07:23:12 -04:00
SamGondelman	e3bc4b3b89	working on plugin menu manipulation	2015-07-21 13:45:33 -07:00
Stephen Birarda	086e4efe44	verify packet versions at ice-server	2015-07-21 13:03:39 -07:00
Niraj Venkat	e0634de403	Turn on/off debug AO from menu item	2015-07-21 12:14:09 -07:00
Stephen Birarda	a61c04aa92	allow socket owner to specify unfiltered packets	2015-07-21 12:00:16 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	6d4c7cd4f2	Merge pull request #5374 from ZappoMan/warningFixes ... Warning fixes and removing dead code	2015-07-21 07:23:40 -07:00
Brad Davis	9fd80d7954	Working on batch	2015-07-20 19:21:29 -07:00
Brad Davis	5744200f64	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/avatar/MyAvatar.h	2015-07-20 19:21:02 -07:00
Brad Davis	51973674f5	Merge remote-tracking branch 'upstream/master' into marge	2015-07-20 17:26:36 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
David Rowe	ac4b64c853	Merge branch 'master' into 20602	2015-07-20 17:14:52 -07:00
Sam Gateau	5bf85961d2	removing dead code	2015-07-20 17:13:02 -07:00
Brad Davis	94d57a2e43	fixing missing glew init	2015-07-20 16:51:01 -07:00
Sam Gateau	9d9142c274	cleaning commented code supposedly dead now	2015-07-20 16:50:24 -07:00
Sam Gateau	6a0ca6e113	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-20 16:22:12 -07:00
Stephen Birarda	9fb8b55359	repairs to early return for sendNackPackets	2015-07-20 16:10:11 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
David Rowe	a488a12151	Merge branch 'master' into 20602	2015-07-20 15:37:43 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
Anthony J. Thibault	80dea6831c	Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers ... Conflicts: interface/src/Application.cpp libraries/input-plugins/src/input-plugins/SixenseManager.cpp	2015-07-20 15:18:23 -07:00
ZappoMan	648d0f6d43	fix a bunch of warnings	2015-07-20 15:12:27 -07:00
Niraj Venkat	eaf75c01b9	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar ... Conflicts: libraries/render-utils/src/AmbientOcclusionEffect.cpp libraries/render-utils/src/AmbientOcclusionEffect.h	2015-07-20 14:55:27 -07:00
Niraj Venkat	85c9ee0feb	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar ... Conflicts: libraries/render-utils/src/AmbientOcclusionEffect.cpp	2015-07-20 14:53:19 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Brad Davis	c0859ffd4c	Removing some dead forward declarations	2015-07-20 14:33:10 -07:00
Andrew Meadows	7578a70c4c	Merge pull request #5359 from birarda/protocol ... Network Protocol Refactor	2015-07-20 14:30:58 -07:00
Brad Davis	9fafc920ee	Merge branch 'homer' into plugins ... Conflicts: interface/src/Application.cpp libraries/render-utils/src/AmbientOcclusionEffect.cpp	2015-07-20 13:53:15 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Brad Davis	488a449cb1	Merge branch 'master' into homer	2015-07-20 13:34:21 -07:00
Brad Davis	359abd6474	Merge branch 'master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/GLCanvas.cpp interface/src/GLCanvas.h interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h interface/src/devices/TV3DManager.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp libraries/render-utils/src/OffscreenGlCanvas.cpp libraries/render-utils/src/OffscreenGlCanvas.h libraries/render-utils/src/text/EffectType.h	2015-07-20 13:33:24 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub	c41e20b90f	Merge pull request #5366 from jherico/marge ... Naked GL removal work	2015-07-20 12:12:22 -07:00
ericrius1	e75a6feafe	can toggle hit effect on and off from a script	2015-07-20 11:58:26 -07:00
Brad Davis	dcaaeec593	Removing AO effect (temporarily) and wireframe mode	2015-07-20 10:55:11 -07:00
SamGondelman	d88e484b00	hand information is in correct coordinate space, cleanup	2015-07-20 10:44:27 -07:00
Atlante45	fc2956342e	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 10:39:16 -07:00
Brad Davis	de92e66635	Removing shadows code	2015-07-20 09:59:22 -07:00
Brad Davis	d4e637c5b8	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Brad Davis	5b494c23fd	More header cleanup	2015-07-18 22:38:26 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Brad Davis	e4f6586c3c	Working on star rendering, removal of naked GL	2015-07-18 16:40:54 -07:00
Philip Rosedale	61c2b172d4	Merge pull request #5357 from ctrlaltdavid/scriptable-muting ... Mute / un-mute face tracking when menu item is changed from script	2015-07-18 15:45:01 -07:00
David Rowe	47fdbedfb2	Fix FPS throttle default	2015-07-18 15:22:47 -07:00
David Rowe	d0489bf2a0	Add menu item, Developer > Render > Throttle FPS If Not Focus	2015-07-18 14:18:06 -07:00
Brad Davis	b7fdfd8663	Working on lighting	2015-07-18 10:55:53 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Sam Gateau	a0590182ad	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-17 17:44:54 -07:00
Sam Gateau	96e18af77b	trying to remove the naked gl calls aroiund the rearViewMirror	2015-07-17 17:44:25 -07:00
Anthony J. Thibault	01c740f415	cleaning up plugin architecture, fixed hand controllers	2015-07-17 17:19:49 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ZappoMan	26e8090ec1	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub	3ea348b73b	Merge pull request #5349 from jherico/marge ... Working on text rendering overlays	2015-07-17 16:47:48 -07:00
Niraj Venkat	0580c8477e	3-step groundwork for AO in the pipeline	2015-07-17 16:42:03 -07:00
ZappoMan	8692f51399	dead code cleanup	2015-07-17 16:15:02 -07:00
Stephen Birarda	1fd4a1f0c3	resolve conflicts on merge with upstream master	2015-07-17 16:07:45 -07:00
Stephen Birarda	54edc6f993	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-07-17 16:04:45 -07:00
ZappoMan	c20c6e4b90	fix retina in an Austin approved manner	2015-07-17 16:01:32 -07:00
ZappoMan	03a44a1c80	fix retina	2015-07-17 15:45:42 -07:00
Atlante45	3f4041595a	Fix compile error in connect	2015-07-17 15:26:04 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
Brad Hefta-Gaub	2df75f8bff	Merge pull request #5337 from bwent/audioStatsDialog ... Added a dialog box to display Audio Network Statistics	2015-07-17 14:45:51 -07:00
David Rowe	550e9224c5	Mute / un-mute face tracking when menu item is changed from script	2015-07-17 11:45:15 -07:00
Stephen Birarda	7a13c867ae	quit the ScriptEngine thread once the script is done	2015-07-17 11:18:14 -07:00
Anthony J. Thibault	5fe4d06562	fixed input devices menu exclusivity	2015-07-17 11:11:31 -07:00
Stephen Birarda	e5722098f6	resolve conflicts on merge with upstream/master	2015-07-17 11:06:01 -07:00
Ryan Huffman	9725184b24	Move dataSent signal from PacketReceiver to LimitedNodeList	2015-07-17 11:05:07 -07:00
Brad Davis	ea74aac1d6	Working on cleaning up diff	2015-07-17 11:02:32 -07:00
ZappoMan	efa2001325	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 09:25:37 -07:00
Brad Davis	7f6bb552a3	Working on cleaning up diff	2015-07-16 20:51:37 -07:00
Anthony J. Thibault	e8da4b9586	merge with plugins, needs testing	2015-07-16 18:47:39 -07:00
Anthony J. Thibault	060f6c19a6	almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly	2015-07-16 18:16:59 -07:00
Atlante45	ceea5143e1	Avoid string copy	2015-07-16 16:55:37 -07:00
Atlante45	6ce710f237	Fix domain request denied reason read	2015-07-16 16:47:09 -07:00
Brad Davis	ae882c8347	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-16 16:37:55 -07:00
ZappoMan	398075e45a	hacking on more naked GL	2015-07-16 16:26:28 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
David Rowe	f5b02c1731	Remove dead code ... Camera mode cannot be mirror	2015-07-16 14:06:42 -07:00
David Rowe	6c6e3eb758	Rename and refactor eye deflection slider	2015-07-16 14:05:34 -07:00
Atlante45	b4121eb464	Remove unnecessary move	2015-07-16 13:14:17 -07:00
David Rowe	9980233a0d	Use estimated eye pitch and yaw from DDE to deflect eyes	2015-07-16 13:03:33 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
Anthony J. Thibault	ce80bff7cb	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-15 18:50:52 -07:00
Anthony J. Thibault	56e7af081e	input plugin architecture, fixed sixense	2015-07-15 18:50:44 -07:00
Anthony J. Thibault	442b701c9a	refactor of myAvatar sensor matrix updating ... Much simpler and maintanable. * updateFromHMDSensorMatrix is called at start of Application::update() It moves the avatar forward taking into account head motion in the room. * all other avatar manipulation call setPosition and setOrientation normally * Then at the end of Application::update() updateSensorToWorldMatrix is called. This ensures that rendering will use the correct camera position w.r.t. the body.	2015-07-15 17:38:12 -07:00
Howard Stearns	01a3701b52	Merge pull request #5329 from SamGondelman/hydraFix ... Hydra hand and mouse fixes	2015-07-15 19:03:04 -05:00
Stephen Birarda	6a02e6d001	resolve final conflict in Application	2015-07-15 16:23:23 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
samcake	de7aed1abc	Merge pull request #5338 from ZappoMan/removeGlowEffect ... Remove the glow effect.	2015-07-15 14:50:15 -07:00
Niraj Venkat	0ee916fb6f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-15 14:10:42 -07:00
Niraj Venkat	1b13f837bd	Porting AO to new pipeline	2015-07-15 14:10:17 -07:00
ZappoMan	c17794849d	more GlowEctomy	2015-07-15 12:58:15 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
bwent	70e3e7caa4	Merge branch 'master' into audioStatsDialog	2015-07-15 12:29:33 -07:00
bwent	2c24251b52	Clean up from previous commit	2015-07-15 11:41:26 -07:00
Sam Gateau	48f23a6eaf	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-15 11:29:41 -07:00
bwent	5b0b7229ba	Added a dialog box to display audio network statistics	2015-07-15 11:10:39 -07:00
Stephen Birarda	e127c5c06d	rename Packet methods for clarity	2015-07-15 10:40:40 -07:00
Anthony J. Thibault	fb62fda2d2	started working on input plugin architecture	2015-07-15 10:26:48 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
ZappoMan	e39ea72daf	removed dead code	2015-07-14 21:25:49 -07:00
Anthony J. Thibault	9363ca2f97	Fix for camera matrix position when in Vive HMD.	2015-07-14 18:36:42 -07:00
Sam Gondelman	6a0df442f9	emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc)	2015-07-14 17:59:59 -07:00
ZappoMan	f1b85aefa9	more dead code removal: NodeBounds	2015-07-14 17:59:20 -07:00
Atlante45	fbb6a94579	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
Philip Rosedale	17ec524253	Merge pull request #5324 from ZappoMan/fixLaggingTouch ... fix lagging touch events	2015-07-14 16:28:00 -07:00
Ryan Huffman	c6ffda12f9	Merge branch 'atp' of github.com:birarda/hifi into receive_packets	2015-07-14 16:21:57 -07:00
Stephen Birarda	e596733c8b	fix for stats grab from iterator	2015-07-14 16:21:34 -07:00
Ryan Huffman	ede9217483	Merge branch 'atp' of github.com:birarda/hifi into receive_packets	2015-07-14 16:15:01 -07:00
Stephen Birarda	e4849d29ec	re-use iterator when checking _octreeServerSceneStats	2015-07-14 16:14:43 -07:00
ZappoMan	68f4fe6566	fix lagging touch events	2015-07-14 16:03:44 -07:00
Ryan Huffman	bd345cdccd	Merge branch 'atp' of github.com:birarda/hifi into receive_packets ... Conflicts: libraries/networking/src/PacketReceiver.cpp	2015-07-14 15:59:16 -07:00
Stephen Birarda	bbe5a3d682	remove commented out call to resetCounters	2015-07-14 15:51:32 -07:00
Stephen Birarda	fb7cb7ff53	add the option for PacketReceiver to drop packets	2015-07-14 15:49:54 -07:00
Stephen Birarda	789235b8c7	make NodeList deleter be deleteLater	2015-07-14 15:28:38 -07:00
Ryan Huffman	56b5c9acff	Merge branch 'atp' of github.com:birarda/hifi into receive_packets ... Conflicts: assignment-client/src/entities/EntityServer.cpp domain-server/src/DomainServer.cpp	2015-07-14 14:53:45 -07:00
Stephen Birarda	8d4c945874	cleanup audioIO connections in Application	2015-07-14 14:34:39 -07:00
Stephen Birarda	1f4ac0f17c	emit mutedByMixer signal for a noisy mute	2015-07-14 14:30:46 -07:00
Stephen Birarda	d617b71232	remove SharedNodePointer from some packet callbacks	2015-07-14 14:27:26 -07:00
Atlante45	bbb00b9d3a	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-07-14 14:11:41 -07:00
Stephen Birarda	0637f589b5	add PacketListener to help unregister for packets	2015-07-14 13:52:38 -07:00
Anthony J. Thibault	aa66691a73	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-14 12:37:09 -07:00
Atlante45	7bf45308b6	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 12:31:37 -07:00
Anthony J. Thibault	dbc18ce51f	merge with plugins	2015-07-14 12:30:47 -07:00
Anthony J. Thibault	9209e0745e	Added "Standing HMD Sensor Mode" checkbox to menu ... removed static bool isRoomTracking and instead moved into the View menu.	2015-07-14 12:12:38 -07:00
Ryan Huffman	0edc909818	Merge branch 'protocol' of github.com:birarda/hifi into receive_packets ... Conflicts: assignment-client/src/audio/AudioMixer.cpp interface/src/Application.cpp libraries/networking/src/Packet.cpp	2015-07-14 10:21:31 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
Anthony J. Thibault	158c1c6aa8	Removed some debugging prints and drawing	2015-07-13 20:41:19 -07:00
Brad Davis	fee5f7cd0f	Merge fixes	2015-07-13 19:07:44 -07:00
Atlante45	c80df94b06	Update includes for moved files	2015-07-13 15:28:55 -07:00
Stephen Birarda	d990420565	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
Anthony J. Thibault	d07a02cef3	Refactor of MyAvatar and Application HMD sensor ... MyAvatar now uses a cached copy of the HMDSensor location, instead of calling into Application for every access. This allows us to simplify application to always return the most recent pose, instead of a different one pre and post physics. Added accessors to HMD Sensor in MyAvatar, besides being helpful, it also an optimization to avoid extracting quaternions from the HMD matrix on every access.	2015-07-13 12:56:33 -07:00
Brad Davis	9eb15d3d55	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/GLCanvas.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h libraries/render-utils/src/DeferredLightingEffect.cpp	2015-07-13 12:54:19 -07:00
Atlante45	957e6394a9	sendPacket function take Node& not a pointer	2015-07-13 11:57:20 -07:00
Stephen Birarda	264f39fa59	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
Stephen Birarda	3d62162812	cleanup octree networking code to use new API	2015-07-13 09:40:26 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Anthony J. Thibault	ac9e1384c0	controllers render in right position, wrong rotation	2015-07-10 18:27:12 -07:00
Anthony J. Thibault	94918be949	another fix for viewing vive user in third person	2015-07-10 18:27:12 -07:00
Stephen Birarda	ffcd8e1613	update connection for packet version mismatch	2015-07-10 17:54:51 -07:00
Stephen Birarda	9ee62a8a38	fix for connection denied packet in Application	2015-07-10 17:52:51 -07:00
Howard Stearns	51be245159	Remove old octreeFade code that wasn't working anyway.	2015-07-10 16:55:45 -07:00
Atlante45	ec7e1df8c0	Move and rename menu item	2015-07-10 15:47:46 -07:00
Ryan Huffman	99aaefbd03	Fix and update signature of Application::handleDomainConnectionDeniedPacket	2015-07-10 15:00:29 -07:00
Atlante45	4702b39130	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-10 10:56:11 -07:00
Brad Hefta-Gaub	33016e2797	Merge pull request #5293 from jherico/bart ... More profiling ranges and updated performance testing scripts	2015-07-09 19:10:45 -07:00
Anthony J. Thibault	653b0d7789	started working on rendering controllers	2015-07-09 19:03:11 -07:00
Brad Hefta-Gaub	74ef91550c	Merge pull request #5296 from venkatn93/master ... Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 18:54:06 -07:00
Niraj Venkat	007d662db1	Re-added for shouldRenderEntities	2015-07-09 17:40:14 -07:00
Niraj Venkat	706f85e4ce	Fixes to comply with coding standard	2015-07-09 17:31:38 -07:00
Seth Alves	d0d0b2a143	Merge pull request #5295 from birarda/master ... potential fix for windows domain connect cycling	2015-07-09 17:04:06 -07:00
Atlante45	bfeb095fb4	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-09 16:30:56 -07:00
Niraj Venkat	adf5b95835	Changing formatting	2015-07-09 16:25:29 -07:00
Niraj Venkat	52095fd38d	Fixing merge	2015-07-09 16:23:40 -07:00
Niraj Venkat	1dce5f80cc	Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 16:17:58 -07:00
Brad Davis	214405a0e5	Fixing typo	2015-07-09 16:06:27 -07:00
Stephen Birarda	efb89c281f	fix creation of QTimer parented by NodeList	2015-07-09 16:02:29 -07:00
Stephen Birarda	a4f1145f06	fix QTimer connection to nodeList	2015-07-09 16:01:41 -07:00
Stephen Birarda	408ecb9735	move domain server check in timer to node thread	2015-07-09 15:59:32 -07:00
Brad Davis	446f800aee	More profiling ranges and updated performance testing scripts	2015-07-09 15:43:30 -07:00
Ryan Huffman	5e65f422fa	Move mute environment handling to Application	2015-07-09 15:30:25 -07:00
Ryan Huffman	dd9dea7a97	Merge remote-tracking branch 'birarda/protocol' into receive_packets ... Conflicts: interface/src/DatagramProcessor.cpp interface/src/octree/OctreePacketProcessor.cpp libraries/entities/src/EntityEditPacketSender.cpp libraries/networking/src/LimitedNodeList.h libraries/networking/src/NLPacket.h	2015-07-09 14:08:35 -07:00
Stephen Birarda	1b4e333c49	Merge pull request #3 from birarda/atp ... initial networking API changes for new protocol	2015-07-09 16:51:37 -04:00