29358 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	d7b42e264e	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt	2015-08-05 16:49:06 -07:00
Seth Alves	12286b7e9b	Merge pull request #5514 from howard-stearns/only-update-motion-state-for-my-avatar ... Don't try to animate other people's avatars!	2015-08-05 16:17:22 -07:00
Howard Stearns	ca6d798aa5	Don't try to animate other people's avatars!	2015-08-05 15:59:22 -07:00
samcake	a4f105f6c3	Merge pull request #5495 from highfidelity/core ... Update the rendering pipeline to use OpenGL 4.1 Core profile everywhere	2015-08-05 15:10:46 -07:00
Stephen Birarda	998a8168a3	remove an extra unneeded message	2015-08-05 14:38:14 -07:00
Stephen Birarda	653e0d29c7	resolve conflicts on merge with upstream/core	2015-08-05 14:37:30 -07:00
Stephen Birarda	078e60076c	don't set a default build type	2015-08-05 14:34:00 -07:00
Stephen Birarda	6c337b8aeb	repairs for build type of glew external	2015-08-05 14:30:36 -07:00
Bradley Austin Davis	252677e1c2	Fix MD5 of glew dep	2015-08-05 14:02:14 -07:00
Bradley Austin Davis	89cc2ccfa5	More merge comments	2015-08-05 13:53:19 -07:00
Bradley Austin Davis	649b9d6ce9	Fixing signed/unsigned comparisons	2015-08-05 13:48:05 -07:00
Brad Davis	754bf5c6f7	Merge pull request #5509 from birarda/core ... get GLEW for all platforms as external project	2015-08-05 13:41:48 -07:00
David Rowe	e8eac7db34	Render look-at vectors and target in first person view	2015-08-05 13:40:57 -07:00
David Rowe	a15943d941	Increase size of look-at target sphere	2015-08-05 13:39:26 -07:00
Brad Davis	5723d2689b	Merge pull request #5510 from SamGondelman/core ... Core Profile: Merge from master	2015-08-05 12:52:37 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Stephen Birarda	34e188fe6e	log more of the steps for glew external project	2015-08-05 12:35:37 -07:00
Stephen Birarda	cc909507f4	get GLEW for all platforms as external project	2015-08-05 12:34:11 -07:00
David Rowe	3be2ddf234	Fix calibration menu item actions	2015-08-05 12:05:04 -07:00
Anthony Thibault	49be7c49b7	Merge pull request #5506 from howard-stearns/smooth-faded-animations ... Smooth fading of animations in and out.	2015-08-05 12:02:44 -07:00
Stephen Birarda	4b673838ac	Merge pull request #5508 from jherico/marge ... Removing integrated glew	2015-08-05 11:31:17 -07:00
Bradley Austin Davis	04d579be7a	Removing integrated glew	2015-08-05 11:21:59 -07:00
Andrew Meadows	59f6988e56	Merge pull request #5465 from SamGondelman/connexionFixes ... Trying to fix/clean up 3DConnexion stuff	2015-08-05 11:16:34 -07:00
Howard Stearns	bb974edf7f	Add assert on mix range.	2015-08-05 11:09:04 -07:00
Howard Stearns	f51b5be167	Simplify fade normalization, eliminating a loop.	2015-08-05 11:00:40 -07:00
Andrew Meadows	5be8583b7d	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files ... gzip json entity persist files	2015-08-05 10:56:03 -07:00
Howard Stearns	653e46fdd3	const methods.	2015-08-05 10:51:26 -07:00
Seth Alves	eb87023416	code review	2015-08-05 10:16:45 -07:00
Howard Stearns	5f895e8aff	Merge pull request #5448 from PhilipRosedale/master ... test script to load test with lots of entities	2015-08-05 10:08:03 -07:00
Howard Stearns	2f2b59b6b6	Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations	2015-08-05 10:05:05 -07:00
Philip Rosedale	f1a4e185cd	Added lifetime and better notes, per PR	2015-08-05 10:04:59 -07:00
Howard Stearns	6ea06ffc3c	Merge pull request #5504 from sethalves/rig ... set-hand-position in rig	2015-08-05 09:05:29 -07:00
Philip Rosedale	df60453344	Merge pull request #5462 from ctrlaltdavid/20574 ... CR for 20574 - Use single file robot model as fallback for full avatar models	2015-08-05 08:55:00 -07:00
Philip Rosedale	06710618d1	Merge pull request #5463 from ctrlaltdavid/20640 ... CR for 20640 - Add DDE option to couple eyelids	2015-08-05 08:47:28 -07:00
samcake	6783ec300a	Merge pull request #5499 from jherico/homer ... CORE PROFILE: Fix star point smoothing... sort of	2015-08-04 20:15:09 -07:00
samcake	a2a47bc0fc	Merge pull request #5507 from jherico/lisa ... CORE PROFILE: Fix diagonal slashes in text	2015-08-04 20:10:17 -07:00
Howard Stearns	a1f86cc7b8	Make MSVC happy.	2015-08-04 19:49:12 -07:00
David Rowe	0c174e27c3	Merge branch 'master' into 20639	2015-08-04 18:36:53 -07:00
David Rowe	fae26d901c	Add menu option to render look-at targets	2015-08-04 18:34:56 -07:00
David Rowe	c771574578	Add 5 point eye tracker calibration option	2015-08-04 18:02:34 -07:00
Bradley Austin Davis	fc5ec22810	Fix diagonal slashes in text	2015-08-04 17:28:42 -07:00
Howard Stearns	731bcba956	Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations	2015-08-04 17:27:23 -07:00
Howard Stearns	61198a658c	Smooth fading of animations in and out. ... Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)	2015-08-04 17:04:15 -07:00
Brad Davis	8dfe129da3	Merge pull request #5505 from samcake/punk ... CORE PROFILE: Fixing the rear view mirror rendering problems	2015-08-04 17:02:31 -07:00
David Rowe	72c4ab33a1	Handle eye calibration errors	2015-08-04 16:54:21 -07:00
David Rowe	11ec5f5ddf	Don't display duplicate error message box	2015-08-04 16:46:48 -07:00
Sam Gateau	730ad2da2f	removing dead code	2015-08-04 16:37:01 -07:00
Sam Gateau	d2360d1406	Merge branch 'core' of https://github.com/highfidelity/hifi into punk	2015-08-04 16:31:33 -07:00
Sam Gateau	fc0ee28b84	FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD	2015-08-04 16:31:20 -07:00
Bradley Austin Davis	2221c839c3	Fix star point smoothing... sort of	2015-08-04 16:29:07 -07:00