4436 commits

Author	SHA1	Message	Date
Ryan Huffman	34138f07bd	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-07 08:58:47 -08:00
Brad Davis	11917ca501	Fixing preview / vsync functionality	2015-12-04 12:46:19 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Davis	60aa93c38c	Fixing menu items in display plugins	2015-12-04 10:28:19 -08:00
Brad Davis	d8bb9f8d18	Fixing screenshot functionality	2015-12-04 10:28:17 -08:00
Brad Davis	b9ace94ff1	Prototyping threaded present	2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	8b58aa706a	Merge pull request #6534 from jherico/homer ... Windows 64 bit updates	2015-12-04 10:05:45 -08:00
Brad Hefta-Gaub	f472b515c3	remove wantsColor support since its always true and required for entities	2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub	81fb4476bc	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub	1df24dd174	Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval	2015-12-03 16:31:15 -08:00
samcake	902b6b8ea1	Merge pull request #6506 from jherico/maggie ... OpenGL class cleanup	2015-12-03 13:55:29 -08:00
Brad Hefta-Gaub	1a5bc5d111	removing optional compression	2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub	849a8707d2	remove wantsColor support since its always true and required for entities	2015-12-03 11:11:15 -08:00
Brad Davis	2cea593fbd	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
Brad Hefta-Gaub	0c05ffe9ce	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 10:20:04 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Howard Stearns	38182bfd9d	Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements ... MyAvatar::reset() improvements	2015-12-02 11:40:46 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Anthony J. Thibault	99065f10fa	Avatar Warning fixes on linux	2015-12-01 18:12:01 -08:00
James B. Pollack	52d6fdac1a	Merge pull request #6487 from ctrlaltdavid/20740 ... Get the Leap Motion working again	2015-12-01 15:40:48 -08:00
Brad Davis	0023c034c4	Fixing naming of GL classes	2015-11-30 18:27:03 -08:00
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