14234 commits

Author	SHA1	Message	Date
Atlante45	35e2f8cd89	Removed _myAvatar from Application	2015-10-06 13:56:25 -07:00
Atlante45	2fc80e58b6	Fix warning	2015-10-06 13:56:24 -07:00
Atlante45	9827c90851	Rebase fixes	2015-10-06 13:56:24 -07:00
Atlante45	ba5c20b7a6	Header cleanup	2015-10-06 13:56:24 -07:00
Atlante45	9c7a480fda	Remove shadowMatrices/Distances	2015-10-06 13:56:23 -07:00
Atlante45	8c653c70fb	Remove fps throttle from Application	2015-10-06 13:56:23 -07:00
Atlante45	4ccc2bbcd0	Enclose entire functions in ifdef	2015-10-06 13:56:23 -07:00
Atlante45	dde11c5cd1	More unused	2015-10-06 13:56:23 -07:00
Atlante45	34bba28775	More header cleanup	2015-10-06 13:56:22 -07:00
Atlante45	f55f146d1b	More code cleanup	2015-10-06 13:56:22 -07:00
Atlante45	38f23ef79e	Remove Application friend	2015-10-06 13:56:22 -07:00
Atlante45	311edabe51	More header cleanup	2015-10-06 13:56:21 -07:00
Atlante45	765608d0ff	More unused	2015-10-06 13:56:21 -07:00
Atlante45	7da55747f5	Simplify friends window	2015-10-06 13:56:21 -07:00
Atlante45	77a7814854	Move sendPingPackets	2015-10-06 13:56:20 -07:00
Atlante45	e74df484cc	Remove unused methods	2015-10-06 13:56:20 -07:00
Atlante45	a5f31dba5f	Fix startup timer	2015-10-06 13:56:20 -07:00
Atlante45	0aab013a0e	Remove unused members	2015-10-06 13:56:20 -07:00
Atlante45	92e974929c	Move tray icon to MainWindow	2015-10-06 13:56:19 -07:00
Atlante45	0f18db886c	Remove 4 Application static methods ... - Replace by lambda - Cleaned up global scope	2015-10-06 13:56:19 -07:00
Atlante45	cf3b33a96b	Replace Application::getInstance() with qApp	2015-10-06 13:56:19 -07:00
Andrew Meadows	2c276bb13e	Merge pull request #5986 from sethalves/kinematic-grab ... Kinematic grab	2015-10-06 10:30:06 -07:00
Brad Davis	8090bc8e8d	Revert "Enabling programmatic access to the IPD scale"	2015-10-06 10:16:42 -07:00
Seth Alves	8caa7abca6	assert that deltaTimeStep is always greater than zero	2015-10-06 09:35:54 -07:00
Seth Alves	5abaf38efd	include setVelocity in returned arguments	2015-10-06 09:24:18 -07:00
Seth Alves	18b5b994b4	include setVelocity in returned arguments	2015-10-06 09:23:38 -07:00
Seth Alves	febdb52b26	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-06 09:20:13 -07:00
Seth Alves	c3142ab90b	include setVelocity in returned arguments	2015-10-06 09:20:07 -07:00
Seth Alves	91f5a6fec6	make setting of rigid-body velocity controlled by an action argument	2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub	d95fe3ddb7	Merge pull request #5989 from jherico/homer ... Enabling programmatic access to the IPD scale	2015-10-05 17:22:19 -07:00
Clément Brisset	5eda3095bb	Merge pull request #5998 from birarda/qt-5.5 ... suppress warnings for overriden methods in Xcode 7	2015-10-05 17:00:43 -07:00
Stephen Birarda	25a1f2dd11	add override to suppress warning for PluginContainerProxy	2015-10-05 15:53:37 -07:00
Stephen Birarda	a2c9d7a4b2	add overrides for Avatar classes in Interface	2015-10-05 15:52:47 -07:00
Anthony Thibault	2a406481d4	Merge pull request #5992 from howard-stearns/reset-on-calibration ... Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 15:19:16 -07:00
Seth Alves	99be44f92d	smooth out vibrating appearance for kinematic hold	2015-10-05 14:58:42 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Howard Stearns	844270e306	Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 12:44:22 -07:00
Andrew Meadows	1ead20683c	Merge pull request #5976 from sethalves/fix-action-deletes ... Fix action deletion/addition when more than one interface are involved	2015-10-05 12:31:01 -07:00
Seth Alves	993111d22f	code review	2015-10-05 11:28:59 -07:00
Seth Alves	8c25f2e16c	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-05 09:09:01 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
Seth Alves	6a770a870b	set correct type in kinematic hold	2015-10-02 17:31:45 -07:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
Howard Stearns	fdba55e56e	Merge pull request #5973 from ctrlaltdavid/20698 ... Fix Reload Content menu item not reloading FST files	2015-10-02 16:43:11 -07:00
Seth Alves	cf8955a8c5	kinematic grab	2015-10-02 15:27:01 -07:00
Brad Hefta-Gaub	255689e24f	add GLEW_STATIC to fix link warnings	2015-10-02 15:08:04 -07:00
Howard Stearns	f6665a4ac6	Merge pull request #5839 from sethalves/transmit-joint-translation ... WARNING protocol change: Transmit joint translation	2015-10-02 13:37:56 -07:00
Anthony J. Thibault	c0be32d359	Fix for model offset when using Rig Animations.	2015-10-02 11:40:46 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub	4c556dd43a	Merge pull request #5962 from samcake/calvin ... Rendering the background elements after opaque and only work on the far pixels	2015-10-02 11:38:45 -07:00