34070 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	0211e00c86	Cleaning the feature not conditional do the true design	2015-11-02 15:01:59 -08:00
samcake	c2687b4998	Cleaning the feature not conditional do the true design	2015-11-02 14:17:07 -08:00
samcake	543f322ffe	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub	8431ef9b98	Merge pull request #6267 from jherico/externals ... Update external version of Sixense.	2015-11-02 09:49:29 -08:00
Brad Davis	a79933b7f8	Merge pull request #6268 from ZappoMan/rightClickMenu ... add mouseClicked inputs vs mouseButton inputs	2015-11-02 09:48:07 -08:00
Brad Hefta-Gaub	d9dd045886	better parameter name	2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub	c3a78ed151	cleanup	2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub	b00f572e1a	add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag	2015-11-02 09:21:15 -08:00
Brad Davis	017e42bbc2	Update sixense SDK	2015-11-02 09:15:54 -08:00
Brad Hefta-Gaub	0f78a0b301	Merge pull request #6266 from ZappoMan/rightClickMenu ... remove right click context menu until we can make it work with camera move better	2015-11-02 07:43:22 -08:00
Brad Hefta-Gaub	70b9aa5ff1	remove right click context menu until we can make it work with camera move better	2015-11-02 07:42:52 -08:00
Brad Davis	71a6e783e3	Merge pull request #6265 from ZappoMan/fixWarnings ... warnings fixes	2015-11-01 16:16:17 -08:00
Brad Hefta-Gaub	92bcd9ca9e	make oculus plugin use static glew	2015-11-01 15:48:01 -08:00
Brad Hefta-Gaub	b9d60e803b	fix mac warning	2015-11-01 15:13:28 -08:00
Brad Hefta-Gaub	fe4a6fa2bf	Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings	2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub	9c23f2551d	Merge pull request #6207 from jherico/pluginSupport ... Support for runtime plugins (DLLs)	2015-11-01 14:57:13 -08:00
Brad Davis	1e47a53603	Fixing mac oculus crash	2015-11-01 14:34:03 -08:00
Brad Hefta-Gaub	13e805ac15	replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case	2015-11-01 13:18:53 -08:00
Brad Hefta-Gaub	886c4526c0	Merge pull request #6263 from jherico/externals ... Move ZLib to automatically downloaded externals on Win32	2015-11-01 12:33:05 -08:00
Brad Davis	e0ac48fe27	PR comments	2015-11-01 12:19:19 -08:00
Brad Hefta-Gaub	4a08329d22	fix unix warnings for comparing enums to enums	2015-11-01 12:10:42 -08:00
Brad Hefta-Gaub	43df5b55fe	fix linker warnings	2015-11-01 11:55:55 -08:00
Brad Davis	f751d5bf85	Merge pull request #6264 from ZappoMan/fixControllers ... tweaks to how VrMenu is shown	2015-11-01 11:29:25 -08:00
Brad Davis	cfb2fd1523	Support for runtime plugins (DLLs)	2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub	e899229cde	tweaks to how VrMenu is shown	2015-11-01 09:55:30 -08:00
Brad Davis	cad1d28b7b	Updating build notes	2015-11-01 01:49:33 -07:00
Brad Davis	99d8554cc8	Make zlib a true external on windows (linux and OSX should rely on system libraries)	2015-11-01 01:36:59 -07:00
Brad Davis	7fa6fb1308	Remove GLEW spam in cmake	2015-11-01 01:36:12 -07:00
Brad Davis	7fdb8e28e7	Merge pull request #6262 from ZappoMan/fixControllers ... Tweaks to standard hand controller mappings	2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub	286905c20c	Merge pull request #6250 from jherico/peek ... Adding peek support for endpoints	2015-10-31 16:09:27 -07:00
Brad Hefta-Gaub	77816d818a	make RY map to jump	2015-10-31 16:00:22 -07:00
Brad Hefta-Gaub	05dea847be	add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu	2015-10-31 15:47:40 -07:00
Brad Hefta-Gaub	158dfbe4b7	Merge pull request #6261 from sethalves/master ... fix grab script	2015-10-31 14:30:29 -07:00
Seth Alves	9346366fc5	fix grab script	2015-10-31 14:28:54 -07:00
Brad Davis	0e13348b5a	PR feedback	2015-10-31 14:26:14 -07:00
Brad Davis	abbfe15395	Adding peek support for endpoints	2015-10-31 14:26:14 -07:00
Seth Alves	93eed1c0da	Merge pull request #6259 from ZappoMan/fixControllers ... fix handControllerGrab.js	2015-10-31 14:24:52 -07:00
Brad Hefta-Gaub	46f9a432ab	fix handControllerGrab.js	2015-10-31 14:21:50 -07:00
Brad Davis	9138ca4627	Merge pull request #6258 from ZappoMan/fixControllers ... fix SDL joysticks	2015-10-31 13:04:21 -07:00
Brad Hefta-Gaub	b877f832a9	fix SDL joysticks	2015-10-31 13:02:17 -07:00
Brad Hefta-Gaub	2c4bd7e441	Merge pull request #6257 from sethalves/quiet-compiler ... quiet compiler	2015-10-31 10:29:36 -07:00
Seth Alves	5916875345	one more	2015-10-31 08:20:24 -07:00
Seth Alves	224aeea044	quiet compiler	2015-10-31 08:11:43 -07:00
Andrew Meadows	9809fcfa54	Merge pull request #6244 from sethalves/grab ... kinematic grab fixes	2015-10-31 04:36:13 -07:00
Brad Hefta-Gaub	c53553a00a	Merge pull request #6256 from jherico/sdl22 ... Fixing paths for SDL2 and Sixense libs	2015-10-30 23:30:03 -07:00
Brad Davis	aee03e79f3	Fix win32 and linux Sixense config	2015-10-30 22:37:00 -07:00
Bradley Austin Davis	0355a37fb1	Fixing SDL2 active/inactive value	2015-10-30 22:19:44 -07:00
Bradley Austin Davis	9b9e35d396	Limit sixense to mavericks and below	2015-10-30 22:02:20 -07:00
Seth Alves	896ed3927c	merge from upstream	2015-10-30 19:17:43 -07:00
Bradley Austin Davis	46d87dda5a	Fixing paths for SDL2 and Sixense libs	2015-10-30 19:00:26 -07:00