36595 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	32b9f60bd5	Merge pull request #6731 from imgntn/grabhotfix1 ... fix handControllerGrab merge problems	2015-12-22 17:24:30 -08:00
James B. Pollack	4115138b5b	fix merge problems	2015-12-22 17:22:55 -08:00
Brad Hefta-Gaub	7a09582a65	Merge pull request #6729 from zzmp/fix/reorder ... Reorder RenderContext initializer to avoid -Wreorder	2015-12-22 17:19:32 -08:00
Seth Alves	46233b24c0	Merge pull request #6630 from imgntn/particle_grab ... Add Various Grab Visualization Options	2015-12-22 16:51:30 -08:00
James B. Pollack	64eb22bf22	merging	2015-12-22 16:34:01 -08:00
Brad Davis	88d36487f8	Merge pull request #6727 from samcake/hdr ... Clean up shaders removing glowIntensity and alphaThreshold legacy	2015-12-22 15:41:08 -08:00
Zach Pomerantz	df78f895a6	Reorder RenderContext initializer to avoid -Wreorder	2015-12-22 14:54:47 -08:00
James B. Pollack	edd11a670a	minor adjustments to particles	2015-12-22 14:38:53 -08:00
James B. Pollack	60f2314469	remove debugging print	2015-12-22 14:38:05 -08:00
Brad Davis	a6d9dbc5c4	Merge pull request #6728 from ZappoMan/rightClickMenu ... More Hand Reticle movement improvements	2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub	9a3d72c7b6	tweak sleep cycle slightly	2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub	119f3e9895	make both hands and mouse work	2015-12-22 13:35:16 -08:00
samcake	f9070ee989	Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore	2015-12-22 12:41:31 -08:00
James B. Pollack	88a5a0a35d	Merge pull request #6685 from ericrius1/polylineOptimizations ... First pass at Flow Arts Hut	2015-12-22 12:28:34 -08:00
James B. Pollack	52e6b84968	Update lightBall.js ... zeroes	2015-12-22 12:09:16 -08:00
James B. Pollack	5e0a428dec	Update hiddenEntityReset.js ... add zeroes	2015-12-22 12:07:57 -08:00
James B. Pollack	51630734df	Update masterReset.js ... add initial zeroes	2015-12-22 12:07:02 -08:00
ericrius1	6fc98bd577	fixed ravestick, merged	2015-12-22 12:03:03 -08:00
James B. Pollack	7bc7bddc3a	set defaults	2015-12-22 12:00:45 -08:00
Brad Hefta-Gaub	cc00aa01fb	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-22 11:54:34 -08:00
James B. Pollack	80e8fcf502	Merge branch 'master' into particle_grab	2015-12-22 11:49:51 -08:00
ericrius1	bb28369dee	Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations	2015-12-22 11:49:31 -08:00
Eric Levin	e8803ad9ae	Lightsaber looks way better now	2015-12-22 11:35:04 -08:00
Brad Hefta-Gaub	298e4d0f83	Merge pull request #6726 from jherico/legacy_oculus ... Legacy oculus work	2015-12-22 11:02:37 -08:00
Eric Levin	653e3ecdcc	fixed offset issue with lightsaber	2015-12-22 11:02:36 -08:00
Brad Hefta-Gaub	22bc6f861a	Merge pull request #6722 from jherico/server_only_build ... Add CMake flag for building only server components	2015-12-22 10:53:26 -08:00
Bradley Austin Davis	79d8b20637	Simulating Oculus interaction on legacy platforms	2015-12-22 10:09:45 -08:00
ericrius1	fdb909ca31	merged	2015-12-22 09:40:42 -08:00
Brad Davis	7fdeb66cf4	Merge pull request #6723 from ZappoMan/macHydraCrash ... fix crash on mac when sixense DLL can't be loaded	2015-12-22 09:32:23 -08:00
Bradley Austin Davis	e0e1ae43f5	Fixing legacy oculus plugin	2015-12-22 09:28:38 -08:00
Brad Davis	243fba461d	Add CMake flag for building only server components	2015-12-22 09:19:07 -08:00
Brad Hefta-Gaub	eff830ad4b	fix crash on mac when sixense DLL can't be loaded	2015-12-22 01:03:23 -08:00
ericrius1	1031489ada	changed dates	2015-12-21 19:08:34 -08:00
ericrius1	ba993eccd4	cleanup	2015-12-21 18:32:07 -08:00
ericrius1	8d80c06f02	updated ravestick model	2015-12-21 18:26:28 -08:00
Brad Hefta-Gaub	025e769a9f	average both hands, enabled both mouse clicks, and detect base station resting hand	2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub	3dfc48e205	Merge pull request #6687 from jherico/marketplace ... Support the marketplace in QML	2015-12-21 17:55:55 -08:00
Brad Davis	fc4ece5671	Merge pull request #6719 from ZappoMan/rightClickMenu ... fix reticle drive	2015-12-21 17:11:48 -08:00
Brad Hefta-Gaub	da86686533	fix reticle drive	2015-12-21 17:10:01 -08:00
samcake	757e94ed98	Merge pull request #6715 from zzmp/refactor/scene-render-js ... Clean up interfaces for JS Scene/Render	2015-12-21 16:50:41 -08:00
Brad Hefta-Gaub	ce426f0144	Merge pull request #6695 from birarda/qxmpp-deletion ... remove an unused qxmpp external	2015-12-21 16:49:04 -08:00
Brad Davis	95c524fba1	Fixing authentication token for followed links	2015-12-21 15:44:35 -08:00
Zach Pomerantz	4df8fa4ac3	Create Render/Scene unique_ptr without C++14 make_unique	2015-12-21 15:39:49 -08:00
Zach Pomerantz	f146b207c4	Update JS debug scripts to use nested props	2015-12-21 15:27:37 -08:00
Brad Hefta-Gaub	e527bfd645	Merge pull request #6717 from birarda/collision-verbose-debug ... remove extra audio injector debug	2015-12-21 15:26:59 -08:00
Stephen Birarda	ba89c8a97a	remove some extra debug that isn't needed	2015-12-21 16:23:23 -07:00
Ryan Huffman	f5f0829216	Merge pull request #6716 from birarda/master ... fix for stop of a nullptr QTimer	2015-12-21 15:21:42 -08:00
ericrius1	f19d1a3067	cleanup	2015-12-21 15:20:36 -08:00
Stephen Birarda	8c6449a886	fix for stopping a nullptr QTimer	2015-12-21 16:20:06 -07:00
Zach Pomerantz	d8022aa5b0	Add back deferred debugging and combine context init	2015-12-21 14:32:06 -08:00