34261 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	b56c49a182	add makeAxis support to JSON parsing	2015-10-29 17:33:30 -07:00
James B. Pollack	846310f9fb	Merge pull request #6208 from ericrius1/closePaintModel ... Added to the whiteboard model, and some bug fixes	2015-10-29 17:05:20 -07:00
Thijs Wenker	35e03d662d	fix the constants of Vec3 , const glm::vec3& UNIT_***() weren't accessible in javascript. Solved it by making them properties that are CONSTANT. Also added function to multiply a vec3 by a vec3 called multiplyVbyV since overloading it over multiply gave me some problems	2015-10-30 00:58:32 +01:00
ericrius1	6bdf66534f	light tweak	2015-10-29 16:53:03 -07:00
Ryan Huffman	fef39b5dc8	Merge pull request #6235 from Atlante45/master ... Check keyLight is defined before accessing it.	2015-10-29 16:49:49 -07:00
Howard Stearns	502cc7f580	Don't copy while converting.	2015-10-29 16:44:01 -07:00
Atlante45	f4bbf8db60	Check keyLight is defined	2015-10-29 16:43:36 -07:00
Atlante45	8b46ed7dff	Check keyLight is defined	2015-10-29 16:42:48 -07:00
Howard Stearns	6613a0e0a6	Merge pull request #6234 from hyperlogic/tony/new-grab-anim ... New left and right grab animations.	2015-10-29 16:42:36 -07:00
ericrius1	b6b71e7e76	increased range and intensity of light	2015-10-29 16:40:50 -07:00
Howard Stearns	303491817b	assert to get hard error in dev, warning and no-op in release.	2015-10-29 16:35:59 -07:00
Anthony J. Thibault	047614b2eb	New left and right grab animations.	2015-10-29 16:18:39 -07:00
Ryan Huffman	03a082383f	Convert billboard display to feet and cleanup trails earlier	2015-10-29 16:10:17 -07:00
Ryan Huffman	8a29f4fc61	Add distances and billboard display to pitching.js	2015-10-29 16:09:33 -07:00
samcake	2bf6ce09c7	Merge pull request #6233 from ZappoMan/comfortTweaks ... tweak comfort mode filters	2015-10-29 16:08:59 -07:00
Howard Stearns	6b4b4440e8	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-29 16:06:24 -07:00
Clément Brisset	e818028043	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-10-29 15:53:44 -07:00
Brad Hefta-Gaub	b070306c2c	tweak comfort mode filters	2015-10-29 15:53:17 -07:00
Clément Brisset	0ea2ca589b	Merge branch 'physics-ccd' of https://github.com/huffman/hifi ... Conflicts: examples/libraries/walkApi.js examples/toybox/flashlight/flashlight.js examples/walk.js	2015-10-29 15:47:14 -07:00
Clément Brisset	bf7911e517	Merge pull request #6232 from Atlante45/master ... edit.js fix	2015-10-29 15:39:20 -07:00
Atlante45	c237072195	edit.js fix	2015-10-29 15:29:12 -07:00
Brad Hefta-Gaub	c962697b18	Merge pull request #6230 from samcake/controllers ... Controllers : Comfort mode is working through the stanadrd mapping	2015-10-29 14:59:42 -07:00
Atlante45	923fcfd4ed	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-29 14:41:44 -07:00
samcake	c1e00ca08c	FIxing the mac build again ?	2015-10-29 14:30:51 -07:00
Stephen Birarda	d03a837263	resolve conflicts on merge with upstream master	2015-10-29 14:28:50 -07:00
samcake	f72146c35d	FIxing the mac build	2015-10-29 14:17:52 -07:00
Brad Hefta-Gaub	ffa805affb	Merge pull request #6223 from AlessandroSigna/controllers ... Vive Controller	2015-10-29 14:16:34 -07:00
ericrius1	020566b76a	no deleting	2015-10-29 14:14:15 -07:00
samcake	1b6a2ff56f	Merge pull request #6231 from Atlante45/master ... edit.js fix	2015-10-29 14:13:29 -07:00
Atlante45	904326cd1c	edit.js fix	2015-10-29 14:11:27 -07:00
samcake	f7aa77253b	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-29 14:09:04 -07:00
samcake	9c860346df	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 14:05:34 -07:00
Ryan Huffman	a7517ff210	CP	2015-10-29 14:01:53 -07:00
Brad Davis	036ae62dd3	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-29 14:00:52 -07:00
Atlante45	6cb7a5e607	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-29 13:57:55 -07:00
Atlante45	608af3c61f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-29 13:53:07 -07:00
samcake	d73eafddd1	COmfort mode working with the COntroller system observing the menu state	2015-10-29 13:48:16 -07:00
Andrew Meadows	9bc44d678b	Merge pull request #6228 from ZappoMan/scriptCleanup ... removed old metavoxel example, since the api is no longer available	2015-10-29 13:26:11 -07:00
Brad Hefta-Gaub	3c11cf2926	Merge pull request #6226 from kencooke/master ... Workaround for audio having channels swapped under Qt 5.5.1	2015-10-29 13:25:41 -07:00
Andrew Meadows	fa96349155	Merge pull request #6229 from birarda/sleep-dt-loop ... guard timeElapsed for simulateKinematicMotion to max 1s	2015-10-29 13:23:57 -07:00
AlessandroSigna	ffd2b39874	Fix vive controller - update to new input plugin register	2015-10-29 13:18:37 -07:00
samcake	b09a159090	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-29 13:06:52 -07:00
samcake	77759fa8af	t reset --:wq ... Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 13:06:16 -07:00
samcake	e902e5e97a	Introduce the concept of loading the default Mapping	2015-10-29 13:05:29 -07:00
Ken Cooke	1eabb924f1	Fixed the logic to be correct	2015-10-29 12:53:47 -07:00
Stephen Birarda	fb55f0becb	guard timeElapsed for simulateKinematicMotion to max 1s	2015-10-29 12:50:34 -07:00
Brad Hefta-Gaub	dd8295b908	Merge pull request #6225 from ZappoMan/controllers ... Controllers merged from master	2015-10-29 12:39:35 -07:00
Andrew Meadows	0c5b4115ed	Merge pull request #6221 from huffman/physics-substep-fix ... Physics substep fix	2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub	1c2973f17d	removed old metavoxel example, since the api is no longer available	2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub	1f53e425eb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 12:28:28 -07:00