overte

mirror of https://github.com/overte-org/overte.git synced 2025-05-11 03:33:03 +02:00

Author	SHA1	Message	Date
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
Andrzej Kapolka	bfaac9eae1	Deferred lighting tweaks.	2014-09-15 18:38:10 -07:00
Andrzej Kapolka	580d591dc4	Working on getting glow to work with deferred lighting.	2014-09-15 17:11:36 -07:00
Andrzej Kapolka	0f3a020b5d	Working on getting particles/entities to work with deferred lighting; normalize normals from buffer.	2014-09-15 16:07:48 -07:00
Andrzej Kapolka	467a9582c7	Somehow my reverting the ambient occlusion effect didn't take.	2014-09-15 13:29:03 -07:00
Andrzej Kapolka	4475759461	Revert the normal-based ambient occlusion; I wasn't crazy about the look of it. Will perhaps revisit later.	2014-09-15 11:52:44 -07:00
Andrzej Kapolka	af546e6b05	Fix for shadows in rear view mirror.	2014-09-12 19:18:31 -07:00
Andrzej Kapolka	e36ff0d238	Fix deferred lighting for rear view mirror.	2014-09-12 18:56:07 -07:00
Andrzej Kapolka	53933fc9c6	Working on deferred lighting for models.	2014-09-12 17:09:07 -07:00
Andrzej Kapolka	3d48a5b872	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-12 15:39:52 -07:00
Brad Hefta-Gaub	e69e90b5b4	Merge pull request #3405 from thoys/20017 Code Review for Job #20017	2014-09-12 15:34:50 -07:00
Stephen Birarda	3b21348a63	make sure AddressManager signal is connected to before file event	2014-09-12 15:22:51 -07:00
Stephen Birarda	29dae39ad7	handle location lookup for offline user or not found	2014-09-12 15:01:08 -07:00
Andrzej Kapolka	d0f30dfd45	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-12 14:44:45 -07:00
Thijs Wenker	df0cbd54fc	Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 Conflicts: interface/src/Application.cpp	2014-09-12 23:04:05 +02:00
Brad Hefta-Gaub	b209b70094	Merge pull request #3404 from birarda/data-web-domain-lookup initial transition to new metaverse API	2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub	fc33de28a0	Merge pull request #3399 from huffman/19831 Code Review for Job #19831	2014-09-12 13:45:20 -07:00
Stephen Birarda	f0ead98a2a	put back LocationScriptingInterface so it works prior to replacement	2014-09-12 13:28:18 -07:00
Thijs Wenker	dd47b7afc6	Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 Conflicts: interface/src/scripting/WindowScriptingInterface.cpp	2014-09-12 22:04:21 +02:00
Stephen Birarda	348bcdb37a	resolve conflicts on merge with upstream master	2014-09-12 11:23:16 -07:00
Stephen Birarda	93ff34baaa	force address bar lookup through handleLookupString	2014-09-12 11:21:38 -07:00
Stephen Birarda	ab7df8679d	fix broken hifi linking	2014-09-12 11:19:22 -07:00
Stephen Birarda	b77a3f4904	cleanup application file event handler	2014-09-12 10:15:51 -07:00
Stephen Birarda	1f2020d169	some url handling repairs, move existing error reply handlers to new format	2014-09-12 10:13:33 -07:00
Stephen Birarda	7896119228	remap two goToUrl calls to AddressManager	2014-09-12 09:56:40 -07:00
Andrzej Kapolka	76728e4fb1	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-11 18:07:33 -07:00
Andrzej Kapolka	e6f37544fd	Use deferred lighting for voxels as well as metavoxels.	2014-09-11 18:06:56 -07:00
Philip Rosedale	8428b1a4ba	Merge pull request #3401 from chansensturm/audio-noise New stereo audio panning object	2014-09-11 17:53:55 -07:00
Craig Hansen-Sturm	ecae9d5e85	compiler warnings	2014-09-11 17:20:15 -07:00
Stephen Birarda	b56ea5c936	centralize path creation from position and orientation to AddressManager	2014-09-11 17:17:47 -07:00
Andrzej Kapolka	c2b58c9781	Move deferred lighting into its own class.	2014-09-11 16:39:17 -07:00
Stephen Birarda	de24842cf0	fix stuck drive keys for Avatar when modifier released	2014-09-11 11:48:26 -07:00
Ryan Huffman	4315d63fb5	Merge branch 'master' of github.com:highfidelity/hifi into 19831	2014-09-11 11:13:13 -07:00
Stephen Birarda	aaabe6b1e1	handle domain changes via address bar	2014-09-11 10:45:45 -07:00
Stephen Birarda	dd1b23044f	hook meta+enter up to address bar display	2014-09-11 10:24:04 -07:00
Stephen Birarda	71f2c0b542	initial addition of the AddressManager with location switch hooked up	2014-09-11 10:14:00 -07:00
Andrzej Kapolka	fe249ef348	Make sure the frustum that we use for culling contains the current camera information.	2014-09-10 15:51:10 -07:00
Andrzej Kapolka	423e6d0594	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-09-10 13:51:46 -07:00
Andrzej Kapolka	2cba7b37bf	Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion.	2014-09-10 13:51:14 -07:00
wangyix	7a2897fb6b	fixes/patches for win32/vs2013 startup and shutdown	2014-09-10 12:24:59 -07:00
Thijs Wenker	cb907c1891	GlobalServicesScriptingInterface added, functions and properties functional	2014-09-10 13:57:38 +02:00
Andrzej Kapolka	a9eb35448a	Comment fix.	2014-09-08 15:39:20 -07:00
Andrzej Kapolka	e9964c71c9	Fix for rear view mirror.	2014-09-08 14:13:28 -07:00
Andrzej Kapolka	1ef9126482	Migrating to device-independent coordinates.	2014-09-08 13:59:19 -07:00
Brad Hefta-Gaub	a77739f31c	Merge pull request #3369 from ctrlaltdavid/20007 Code Review for Job #20007	2014-09-06 15:36:29 -07:00
David Rowe	5ebe6962a4	Make scripts loaded with Script.load() not persist	2014-09-06 09:59:47 -07:00
Andrzej Kapolka	0b2d0a0b07	Fix for mouse events.	2014-09-05 17:30:19 -07:00
Andrzej Kapolka	c2cd23a54c	Mouse coordinate fix.	2014-09-05 17:07:37 -07:00
Andrzej Kapolka	5bdad18ade	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-09-05 16:45:15 -07:00
Andrzej Kapolka	7f6b3d3649	Dimension fixes for Retina displays.	2014-09-05 16:44:45 -07:00
Andrzej Kapolka	37b4fe5166	Fix for deferred lighting/ambient occlusion when glow effect is disabled.	2014-09-05 14:16:12 -07:00
Andrzej Kapolka	b278857091	Wireframe option, fix for shadow menu group.	2014-09-05 13:51:22 -07:00
Ryan Huffman	e590f992f6	Merge branch 'master' of git://github.com/highfidelity/hifi into 19831	2014-09-05 10:18:02 -07:00
Ryan Huffman	d54dc5f2aa	Merge branch 'master' of github.com:highfidelity/hifi into 19935 Conflicts: interface/src/Menu.h	2014-09-04 12:05:17 -07:00
Clément Brisset	cc6d70c5ab	Merge pull request #3336 from huffman/19995 Code Review for Job #19995	2014-09-04 11:37:35 -07:00
AndrewMeadows	8223481ecb	Merge pull request #3341 from huffman/19967 Code Review for Job #19967	2014-09-03 16:51:19 -07:00
AndrewMeadows	bd55da4a83	Merge pull request #3335 from ZappoMan/virtualEntities Model Server to Entity Server Refactoring	2014-09-03 15:48:58 -07:00
MarcelEdward	e62834c197	This patch updates Application::updateLocationInServer() in Application.cpp The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds. This function had an LastLocationObject in which only send in the location info to the data web in case the location changed. Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.	2014-09-03 16:43:39 +02:00
Ryan Huffman	ece3390b4e	Fix bug with dropping hifi images not working on Windows URLs on Windows included three forward-slashes, ex `file:///C:...`. Using `toLocalFile()` correctly stringifies the location.	2014-09-01 22:14:28 -07:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
David Rowe	1d3a176f5f	Rename method	2014-08-28 13:53:47 -07:00
David Rowe	46c1a9d59a	Make login dialog automatically show only once per domain visit	2014-08-28 11:25:13 -07:00
ZappoMan	30e00bbd69	final pass on entities import/export/overlays working as well as production	2014-08-27 11:34:50 -07:00
Craig Hansen-Sturm	e941e58626	merge HEAD with PR-3281	2014-08-26 18:25:40 -07:00
ZappoMan	b14158385c	first cut at getting pastEntities() working	2014-08-26 16:47:32 -07:00
ZappoMan	4895ee32f7	test and fix issues with exportEntities()	2014-08-26 15:59:49 -07:00
Ryan Huffman	e38d8f7afd	Update all locations that update settings to call bumpSettings()	2014-08-26 07:47:22 -07:00
ZappoMan	58759d344f	cleanup in prep for PR	2014-08-25 10:56:43 -07:00
Ryan Huffman	b0361025b0	Remove custom behavior from running scripts widget	2014-08-21 14:32:38 -07:00
Andrew Meadows	7e4c72445e	JS scripts set joint animation priorities	2014-08-20 17:14:59 -07:00
ZappoMan	ef86d86234	split out entity rendering into subclasses, improved rendering of models	2014-08-20 15:49:50 -07:00
Clément Brisset	c76afe7d4a	Merge pull request #3298 from PhilipRosedale/master First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering	2014-08-20 10:16:25 -07:00
Philip Rosedale	8e958b49c0	Merge pull request #3303 from Atlante45/record_feature Record feature JS API + File Format	2014-08-19 21:25:18 -07:00
Atlante45	b13604f968	JS API for recording	2014-08-19 16:43:26 -07:00
Ryan Huffman	284c4d8ac0	Merge branch 'master' of github.com:highfidelity/hifi into 19864 Conflicts: interface/CMakeLists.txt	2014-08-19 11:59:53 -07:00
Philip Rosedale	7b86f668a6	Add SPACE to scripting JS, change reset to apostrophe	2014-08-18 23:22:55 -07:00
Atlante45	6d567e67a9	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-18 15:41:19 -07:00
ZappoMan	32d5eb3cea	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/CMakeLists.txt interface/CMakeLists.txt libraries/entities/CMakeLists.txt libraries/models/src/ModelEditPacketSender.cpp libraries/models/src/ModelEditPacketSender.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h libraries/octree/src/OctreePacketData.h libraries/octree/src/OctreeQuery.cpp libraries/particles/src/ParticleEditPacketSender.cpp libraries/particles/src/ParticleEditPacketSender.h libraries/script-engine/CMakeLists.txt tests/octree/CMakeLists.txt	2014-08-18 15:16:35 -07:00
Clément Brisset	a6f0c9bb01	Merge pull request #3288 from nivardus/19616 Code Review for Job #19616	2014-08-18 14:44:29 -07:00
Atlante45	1d30b52ec2	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-18 14:23:40 -07:00
Atlante45	52640c8482	Various tweaks and code cleanup	2014-08-18 14:23:29 -07:00
Atlante45	acb55ce65e	Switched audio play back to AudioInjector out of Audio	2014-08-18 12:31:44 -07:00
AndrewMeadows	4b7208ac53	Merge pull request #3280 from huffman/19907 Code Review for Job #19907	2014-08-18 10:20:01 -07:00
Atlante45	47685b0e88	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-17 12:56:19 -07:00
Atlante45	6592a6dca2	Fix for custom URL schemes	2014-08-15 10:28:22 -07:00
Ryan Huffman	7d11994cce	Add cursor hiding to gracefulControls.js	2014-08-14 22:37:23 -07:00
Bennett Goble	e21392f553	Merge branch 'master' into 19616	2014-08-14 18:37:11 -04:00
Atlante45	2981132395	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-14 11:39:44 -07:00
Ryan Huffman	a2e7c9b75c	Update build for speechRecognizer	2014-08-13 14:53:26 -07:00
wangyix	db0fbcab97	merge with upstream	2014-08-13 11:09:55 -07:00
Atlante45	73a3a13c59	More recording work	2014-08-12 18:15:48 -07:00
Stephen Birarda	4bf7bbe0df	if enable VR mode is re-checked then attempt to re-connect to Oculus	2014-08-12 15:20:04 -07:00
Philip Rosedale	9933c011d7	Remove filtered eye position from head	2014-08-12 14:31:40 -07:00
Ryan Huffman	0296d0deeb	Add domain connection status to window title	2014-08-11 18:43:26 -07:00
ZappoMan	275a5c4a47	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-08 15:13:55 -07:00
Bennett Goble	46007e2c56	Merge branch 'master' into 19616	2014-08-08 17:38:53 -04:00
ZappoMan	027b1d58cc	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h interface/src/entities/EntityTreeRenderer.h interface/src/models/ModelTreeRenderer.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.h	2014-08-08 14:26:56 -07:00
Stephen Birarda	45afce48f7	remember old session UUID in AvatarHashMap to work around ghosting	2014-08-08 13:14:03 -07:00
Ryan Huffman	9127ac24a0	Move speechRecognizer to Menu	2014-08-07 17:45:27 -07:00
wangyix	1153a76ab1	new option knobs added, no new behavior yet	2014-08-07 16:37:36 -07:00
AndrewMeadows	2653b33b67	Merge pull request #3257 from Atlante45/referentials Referentials	2014-08-06 14:12:18 -07:00
Atlante45	b360b6c55d	PR cleanup + JS API	2014-08-05 17:07:03 -07:00
Atlante45	d9dde06c14	Various tweaks to referentials	2014-08-04 14:59:15 -07:00
Atlante45	15cbfa0715	Merge branch 'master' of https://github.com/highfidelity/hifi into referentials	2014-08-04 12:45:57 -07:00
ZappoMan	3a8c5018ee	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h libraries/entities/src/EntityTreeElement.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.cpp libraries/models/src/ModelTree.h libraries/models/src/ModelTreeElement.cpp libraries/networking/src/PacketHeaders.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h	2014-08-04 12:01:23 -07:00
Atlante45	8d1438a44c	Plugged in dde face tracker	2014-08-04 10:28:52 -07:00
Bennett Goble	b634f8d8c0	Merge branch 'master' into 19616	2014-08-03 14:08:09 -04:00
Bennett Goble	bd409f2de4	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
Brad Hefta-Gaub	e9286e5700	Merge pull request #3238 from ctrlaltdavid/19824 Code Review for Job #19824	2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub	211bed946f	Merge pull request #3232 from huffman/19783 Code Review for Job #19783	2014-08-01 16:34:50 -07:00
Ryan Huffman	d01d605b40	Add ModelItemProperties::copyFromNewModelItem	2014-08-01 13:52:00 -07:00
Ryan Huffman	3e572cdf76	Add SpeechRecognizer to js and speechControl.js	2014-08-01 13:44:40 -07:00
Ryan Huffman	ffb178cb43	Add SpeechRecognizer	2014-08-01 13:44:06 -07:00
David Rowe	f3b4f708a5	Add Script.load() JavaScript method	2014-07-31 21:50:07 -07:00
Atlante45	ee4b7664b0	Merge branch 'master' of https://github.com/highfidelity/hifi into referentials	2014-07-31 13:39:23 -07:00
Atlante45	5fd3fd9f8f	Moved MyAvatar update at the end of Application::update() to have latest data for simulation	2014-07-31 11:54:39 -07:00
Ryan Huffman	3e2bb0f168	Add more complete error handling for import/export models	2014-07-31 10:40:45 -07:00
ZappoMan	77e1867b11	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h	2014-07-31 10:34:23 -07:00
Stephen Birarda	453c37f4b9	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth	2014-07-31 10:05:40 -07:00
Ryan Huffman	a39a7e2356	Update exportModels implementation	2014-07-31 01:13:17 -07:00
Ryan Huffman	01737e18b2	Update LocalModelOverlay to work prorperly with translations	2014-07-30 19:06:10 -07:00
Ryan Huffman	06294b403b	Add pasteModels	2014-07-30 18:31:58 -07:00
Stephen Birarda	db25cd9d2c	call PaymentManager when an OctreeEditPacketSender needs to pay	2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub	d6e6cfd585	Merge pull request #3216 from wangyix/inbound_audio_stream Audio ringbuffer classes refactored into subclasses of InboundAudioStream	2014-07-30 18:00:17 -07:00
Stephen Birarda	9c1dd7c4a4	fix call to connect in Application	2014-07-30 17:35:49 -07:00
Stephen Birarda	99daa062c0	trigger domainSettingsReceived slot when connected to domain	2014-07-30 17:35:33 -07:00
Stephen Birarda	363cef6d8a	move satoshi costs to VoxelEditPacketSender	2014-07-30 17:33:37 -07:00
wangyix	daeb2a898d	added staticDesiredJitterBufferFrames feature; AudioMixer crashing moved some callbacks from Application::updateAvatar() to Application::update()	2014-07-30 15:35:40 -07:00
wangyix	d49970d010	maxFramesOverDesired added; settable from domain page and preferences	2014-07-29 15:57:32 -07:00
ZappoMan	378b555046	fix entity server name and sending to servers when voxels not enabled	2014-07-28 21:21:54 -07:00
Zu	4016f8ca44	Merge branch 'master' into add_cara_face_tracker	2014-07-29 12:21:40 +08:00
ZappoMan	805a88b73b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/editModels.js interface/src/entities/EntityTreeRenderer.h libraries/models/src/ModelsScriptingInterface.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-28 13:39:35 -07:00
wangyix	6fc5c74c0b	renamed ringbuffer variables to audiostream	2014-07-28 13:08:53 -07:00
Atlante45	1849ec8e07	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting Conflicts: examples/editVoxels.js	2014-07-25 16:39:39 -07:00
Ryan Huffman	d777e4be53	Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 Conflicts: interface/src/scripting/WindowScriptingInterface.cpp interface/src/scripting/WindowScriptingInterface.h	2014-07-25 15:53:36 -07:00
Atlante45	72a31ec8fc	Removed magic number to use DEFAULT_NEAR/FAR_CLIP	2014-07-25 10:56:44 -07:00
AndrewMeadows	73ec862474	Merge pull request #3207 from PhilipRosedale/master Velocity filter head position for less jitter in camera	2014-07-25 09:50:21 -07:00
Zu	2d921924bf	added: Cara Face Tracker added: decode cara udp packets added: head rotation added: hook into hifi interface	2014-07-25 16:52:29 +08:00
Philip Rosedale	a5d6b2282e	Merge pull request #3201 from wangyix/master moved audio stats to own overlay; audio stats now reset when audiomixer is killed;	2014-07-24 21:40:43 -07:00
Philip Rosedale	9a83be618a	Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine ScriptEngine now inherit from QScriptEngine	2014-07-24 21:38:13 -07:00
Philip Rosedale	a1b74c5272	remove unused code	2014-07-23 23:07:37 -07:00
Philip Rosedale	5aecbe690d	made calculateAverageEyePosition private, changed to getEyePosition() where used outside head	2014-07-23 22:56:59 -07:00
Philip Rosedale	00fdc37822	add velocity filtering to eyePosition to reduce camera jitter from faceshift	2014-07-23 22:45:50 -07:00
Philip Rosedale	f05855dcc2	Merge pull request #3199 from ey6es/master Fix for shadows in close-up inset mirror.	2014-07-23 17:49:55 -07:00
wangyix	a36c9e872e	merged with upstream	2014-07-23 15:36:37 -07:00
Atlante45	e1365a2927	Forgot one change	2014-07-23 14:19:47 -07:00
Thijs Wenker	9d5c81bd67	Merge branch 'master' of https://github.com/worklist/hifi	2014-07-23 16:59:23 +02:00
Thijs Wenker	b6cb19c2f6	FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)	2014-07-23 16:55:59 +02:00
Andrzej Kapolka	9cf0d6c851	Fix for shadows in close-up inset mirror.	2014-07-22 19:19:13 -07:00
Philip Rosedale	4f52098da1	tuning tweaks to world and avatar lights	2014-07-22 20:23:23 -04:00
Andrzej Kapolka	be028c2b01	Fixes for local lights.	2014-07-22 14:13:51 -07:00
wangyix	847bc28990	Audio stats now reset when AudioMixer is killed	2014-07-22 10:27:26 -07:00
barnold1953	03bc3a9ff8	Added checkable menu option for laser toggle	2014-07-21 12:35:46 -07:00
barnold1953	c6bda4bf16	Moved sixense laser stuff to MyAvatar	2014-07-18 15:26:18 -07:00
Brad Hefta-Gaub	d8d6d08958	Merge pull request #3145 from samcake/19734 19734 - Leapmotion support	2014-07-17 08:45:55 -07:00
Andrzej Kapolka	3be00b972d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-07-15 18:11:54 -07:00
ZappoMan	5869039bf3	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-15 14:26:07 -07:00
ZappoMan	2baac96665	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp	2014-07-15 10:04:40 -07:00
Andrzej Kapolka	e32bab5b04	Beginnings of some metavoxel scriptability, to create some test landscapes.	2014-07-14 14:32:55 -07:00
TonyPeng	1aa20dff60	Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.	2014-07-14 13:59:57 -07:00
Andrew Meadows	456a3c3739	cleanup Leapmotion initialization removes warning about unused variable	2014-07-14 09:26:42 -07:00
Andrew Meadows	8ffc3aa73d	merge upstream/master into andrew/thermonuclear (AKA samcake/19734) Conflicts: interface/src/Application.cpp	2014-07-14 09:10:27 -07:00
Brad Hefta-Gaub	a94e077a75	Merge pull request #3153 from wangyix/quick_audio_PR Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg	2014-07-11 11:42:55 -07:00
wangyix	a7ef7647ed	application stats tracking and packing updated;	2014-07-10 16:54:26 -07:00
wangyix	b4c9e51011	Audio now periodically sends downstream audio stats to audiomixer	2014-07-10 14:14:29 -07:00
barnold1953	a785ceb3da	Restored UI fade animation	2014-07-09 17:33:41 -07:00
barnold1953	56ff74dd56	Removed ApplicationOverlay::resize()	2014-07-09 16:39:05 -07:00
barnold1953	6e92beeb1c	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.h	2014-07-09 16:32:02 -07:00
samcake	c6e308bc87	fixes after first review - lots of cleaning of the syntax to respect the coding standard - Fixed the device tracker singleton for clean destruction - introduced the Factory for the Leapmotion itstead of a naked constructor	2014-07-09 15:52:57 -07:00
Andrew Meadows	6ffa09f9e6	modified scope of devices stats	2014-07-09 13:58:54 -07:00
Andrew Meadows	3d6752ad90	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-07-09 12:52:00 -07:00
Andrew Meadows	d26585728b	Improved stat accumulation and context names	2014-07-09 11:53:53 -07:00
barnold1953	862f311306	Fixed full screen mirror mode for non oculus	2014-07-09 11:29:33 -07:00
Ryan Huffman	874b542c0c	Add import/export/paste model functionality to editModels.js	2014-07-09 04:13:53 -07:00
Clément Brisset	3f24feeb1d	Merge pull request #3143 from PhilipRosedale/master Add Low Velocity Filter for hand movement as menu option	2014-07-08 23:22:46 -07:00
Clément Brisset	2003dc41df	Merge pull request #3138 from ctrlaltdavid/19836 Code Review for Job #19836	2014-07-08 23:16:32 -07:00
Philip Rosedale	c50d9ae3e4	Hand low velocity filter as a menu option	2014-07-08 22:22:27 -07:00
barnold1953	b5a9f50ae7	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-07-08 17:15:35 -07:00
ZappoMan	e800d5457b	Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities	2014-07-08 13:02:31 -07:00
Atlante45	a225df63f6	Removed deprecated moveToThread()	2014-07-07 11:40:03 -07:00
samcake	abacefa723	Merge remote-tracking branch 'upstream/master' into 19734 Conflicts: interface/CMakeLists.txt interface/src/avatar/SkeletonModel.cpp	2014-07-05 19:25:46 -07:00
samcake	fca3a6aa13	Merge branch 'master' of https://github.com/highfidelity/hifi into 19734	2014-07-05 18:10:59 -07:00
David Rowe	2ad2b6cd1c	Resize the overlay framebuffer when the application window is resized	2014-07-03 18:23:37 -07:00
David Rowe	97ca6d70fa	Fixed performance timer scope	2014-07-03 17:15:46 -07:00
David Rowe	8b04a9c8b6	Add toggle for user interface display - "/" toggles UI (incl. stats if displayed); menu View > User Interface - "%" = toggle status; menu View > Stats - Acts on normal, 3DTV, and Oculus display.	2014-07-03 16:19:05 -07:00
barnold1953	ba997334ff	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-07-03 16:10:26 -07:00
barnold1953	bf2959675f	First pass at laser oculus UI pointer	2014-07-03 16:09:54 -07:00
Atlante45	8e1b8334a1	Fixed invokeMethod unable to find method + fixed children in different thread	2014-07-03 14:46:17 -07:00
ZappoMan	ec0c350f60	Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities Conflicts: interface/src/Application.cpp interface/src/DatagramProcessor.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-03 14:20:40 -07:00
Brad Hefta-Gaub	b8071d8050	Merge pull request #3113 from birarda/master initial pass at MIDI input for scripting	2014-07-03 13:40:25 -07:00
Brad Hefta-Gaub	dbdce32b68	Merge pull request #3107 from wangyix/master prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;	2014-07-03 13:32:31 -07:00
Stephen Birarda	15619b5a98	don't require RtMidi if it isn't present	2014-07-03 13:30:14 -07:00
Stephen Birarda	f1e2ba1267	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-03 09:25:03 -07:00
Brad Hefta-Gaub	67910a5ba2	Merge pull request #3115 from Barnold1953/OculusSDK 3DTV UI overlay + Oculus fixes	2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub	1b29b7c120	Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback Removed json callback	2014-07-02 21:45:19 -07:00
Atlante45	69533c25c2	Fix script not being loaded at startup	2014-07-02 17:54:21 -07:00
barnold1953	edcf4d04f8	Fixed bug when switching from normal view to oculus	2014-07-02 17:05:06 -07:00
barnold1953	ee30a446e9	Fixed 3rd person camera for non oculus	2014-07-02 16:45:05 -07:00
barnold1953	a859094d4a	Clickable 3D UI in 3DTV	2014-07-02 16:40:02 -07:00
Atlante45	1ac38c9884	Switched call to setCache to invokeMethod	2014-07-02 14:31:19 -07:00
Stephen Birarda	55d8b763c5	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 09:42:32 -07:00
barnold1953	67ecde7d31	Made tree editor voxel world stationary and not crash	2014-07-01 21:39:19 -07:00
Atlante45	c5a997a567	Switched Application to NetworkAccessManager	2014-07-01 17:43:25 -07:00
ZappoMan	865566414c	Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities Conflicts: interface/src/entities/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelTree.cpp libraries/models/src/ModelTreeElement.cpp libraries/models/src/ModelsScriptingInterface.cpp tests/octree/CMakeLists.txt tests/octree/src/ModelTests.cpp	2014-07-01 16:32:47 -07:00
Atlante45	e9826250cb	CR	2014-07-01 12:57:39 -07:00
Atlante45	958367f579	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity Conflicts: interface/src/devices/OculusManager.cpp	2014-07-01 12:45:42 -07:00
barnold1953	1a1050cb06	Added back _raiseMirror usage for mirror mode.	2014-07-01 12:31:48 -07:00
wangyix	fd051310da	prune missing set before constructing nack packets; make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use that value as the default history size	2014-07-01 12:01:51 -07:00
Stephen Birarda	f389e3a6da	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -07:00
Brad Hefta-Gaub	df51d26625	Merge pull request #3094 from wangyix/seqNumberStats Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;	2014-07-01 10:54:35 -07:00
Brad Hefta-Gaub	a88c92ea17	Merge pull request #3099 from Barnold1953/OculusSDK Oculus SDK Upgrade	2014-07-01 10:43:39 -07:00
barnold1953	80bfb0766b	Fixed warnings	2014-07-01 10:28:40 -07:00
Stephen Birarda	5ba4a4dbb5	initial pass of MIDI implementation that bubbles events to JS	2014-07-01 09:53:18 -07:00
samcake	a8b875d32e	Merge remote-tracking branch 'origin/LeapMotion' into 19734	2014-07-01 03:20:26 -07:00
samcake	3ce455aba4	Support for LeapMotion and worklist 19734 - Introduce the DeviceTracker class to abstract all the possible devices - Introduce the MotionTracker ( a DeviceTracker ) that contains a transform tree of joints - Add Leapmotion class as a MotionTracker and the support for the Leapmotion sdk in external - Add InputController as the abstraction of a MotionTracker/Joint for Javascript	2014-07-01 03:15:26 -07:00
Atlante45	2015861e13	Fixed spelling mistake	2014-06-30 20:10:53 -07:00
Atlante45	7c797449ab	Comments + connectedDevice	2014-06-30 19:02:43 -07:00
wangyix	f51a77ce45	reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed	2014-06-30 18:00:29 -07:00
Atlante45	1a2fd4483b	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity	2014-06-30 17:54:34 -07:00
Atlante45	d102795314	Added application version to logger	2014-06-30 17:18:49 -07:00
barnold1953	1cd2066e79	Added option to disable glow effect for 10fps boost for oculus	2014-06-30 17:13:47 -07:00
Atlante45	f33ad8a100	Adding logger calls	2014-06-30 17:10:17 -07:00
Atlante45	e9dffc0681	Removed testing code	2014-06-30 14:31:39 -07:00
Atlante45	ff8694d5c5	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity	2014-06-30 14:30:17 -07:00
wangyix	c789f3c6b9	merge with upstream	2014-06-30 14:13:34 -07:00
barnold1953	6e954e7f53	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-06-30 11:44:49 -07:00
barnold1953	ffab329af4	Made camera line up with eyes in mirror mode	2014-06-30 11:39:33 -07:00
barnold1953	d109ef6fe1	Proper mirror and third person mode in Oculus	2014-06-30 11:33:22 -07:00
David Rowe	9449ad7192	Add missing script engine hash key code changes The script engine hash key changed starting at commit [62f85d] on 11 Jun.	2014-06-29 19:40:53 -07:00
Clément Brisset	9eba4b01f0	Merge pull request #3092 from ctrlaltdavid/19789 Code Review for Job #19789	2014-06-27 17:28:48 -07:00
wangyix	0ae58bd7f9	added senderUUID arg to seq stats	2014-06-27 15:39:11 -07:00
barnold1953	508fed9146	Add ability for FBO to have a different res than glWidget	2014-06-27 11:44:05 -07:00
barnold1953	67c5281205	Fixed CMake for oculus. Gave Oculus its own camera for minimum latency.	2014-06-26 17:10:53 -07:00
wangyix	cb48825561	added seq number to all Audio types, untested	2014-06-26 16:52:23 -07:00
ZappoMan	ccc9eabd33	first cut at renaming Models to Entities	2014-06-26 16:39:52 -07:00
Atlante45	8d00a8d535	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity Conflicts: libraries/networking/src/LimitedNodeList.cpp	2014-06-26 14:56:15 -07:00
Atlante45	9d393bbe8c	Added some functions to UserActivityLogger + made logAction public	2014-06-26 14:55:11 -07:00
Clément Brisset	463ac9cc74	Merge pull request #3078 from PhilipRosedale/master Improved toy ball, JS calls for palm position, concertCamera.js	2014-06-26 11:03:48 -07:00
wangyix	2ec04fb756	replaced old seqnum tracking code with SequenceNumberStats	2014-06-25 17:20:57 -07:00
David Rowe	9fb64386aa	Fix stopping scripts in the script editor	2014-06-25 11:44:58 -07:00
Philip Rosedale	95a66a06af	Merge branch 'master' of https://github.com/worklist/hifi	2014-06-25 02:57:54 -07:00
Ryan Huffman	3bec59fd33	Fix unindented line	2014-06-24 20:38:46 -07:00
Ryan Huffman	5ece424a45	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/ui/runningScriptsWidget.ui	2014-06-24 20:27:44 -07:00
Stephen Birarda	5f4baaffa5	revert credit balance rounding	2014-06-24 16:25:41 -07:00
Philip Rosedale	81e7f8e0a5	Merge branch 'master' of https://github.com/worklist/hifi	2014-06-24 16:21:35 -07:00
Ryan Huffman	173be2c89d	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644	2014-06-24 12:01:04 -07:00
Ryan Huffman	f249020d6d	Clean up redundant if statement	2014-06-24 11:50:54 -07:00
Ryan Huffman	652543cdca	Update _scriptEngineHash to work with duplicate running scripts	2014-06-24 11:46:35 -07:00

... 12 13 14 15 16 ...

3495 commits