33045 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	74c89ad099	Merge pull request #5984 from Atlante45/cleanup_app ... Application cleanup	2015-10-06 16:58:05 -07:00
Andrew Meadows	224fc55033	put IK targets in skeleton's model-frame	2015-10-06 16:49:29 -07:00
James B. Pollack	4788480186	reset balls if they move too far	2015-10-06 16:48:34 -07:00
Atlante45	3a8deff53e	Return if innactive	2015-10-06 16:38:16 -07:00
Brad Hefta-Gaub	867d34b617	clean up warnings and coding standard issues	2015-10-06 16:33:24 -07:00
Brad Hefta-Gaub	7a2bad0b29	Merge branch 'master' of https://github.com/ZappoMan/hifi	2015-10-06 16:25:30 -07:00
Atlante45	ca575bee89	Remove unecessary move	2015-10-06 16:15:51 -07:00
Atlante45	5ee966261d	Start thread right away	2015-10-06 16:12:50 -07:00
Atlante45	81b88cb096	Renamed MessagePart > MessagePartNumber	2015-10-06 16:12:04 -07:00
Brad Hefta-Gaub	016bf4011d	cleanup	2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub	1319642a59	fix frame jumping behavior on restart	2015-10-06 15:59:35 -07:00
Atlante45	76e0006732	Remove forgotten cursorVisible	2015-10-06 15:58:35 -07:00
Howard Stearns	e66f6b79cc	Merge pull request #6004 from birarda/av-mixer-stats ... add receive rate and inbound kbps to avatar-mixer stats	2015-10-06 15:24:30 -07:00
Brad Hefta-Gaub	be79101a93	Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings	2015-10-06 15:20:37 -07:00
Stephen Birarda	0db88ba572	fix a typo in comment	2015-10-06 15:06:28 -07:00
Stephen Birarda	4c695b179a	remove out of order assert in avatar-mixer	2015-10-06 15:04:48 -07:00
Stephen Birarda	593153deec	add receive rate and inbound kbps to av stats	2015-10-06 14:58:51 -07:00
Stephen Birarda	fbf6d166b7	add wire size to BasePacket	2015-10-06 14:48:28 -07:00
Atlante45	8a7871e15b	rebase fix	2015-10-06 14:13:28 -07:00
Stephen Birarda	9079f891e9	repair broken node bandwidth stats	2015-10-06 14:09:21 -07:00
Atlante45	ed13c02075	Fix rebase	2015-10-06 13:57:51 -07:00
Atlante45	c745050dea	Fix QObject::connect warning	2015-10-06 13:57:51 -07:00
Atlante45	7b25c9d417	More header cleanup	2015-10-06 13:57:50 -07:00
Atlante45	775994f9d0	Fix for 3DConnection	2015-10-06 13:57:49 -07:00
Atlante45	b63df98b8b	More unused	2015-10-06 13:57:49 -07:00
Atlante45	17edd38cb9	Remove unused variables	2015-10-06 13:57:48 -07:00
Atlante45	39e0d0e1dc	Put timers on the stack	2015-10-06 13:56:26 -07:00
Atlante45	e9b7125894	Misc cleanup	2015-10-06 13:56:26 -07:00
Atlante45	5e9425d9eb	Fix view frustum preference	2015-10-06 13:56:25 -07:00
Atlante45	60ebd3a544	Remove unused members (Mostly mouse stuff)	2015-10-06 13:56:25 -07:00
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