32714 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Atlante45	f5f349e13a	Bumped packet version numbers	2015-10-02 14:20:20 -07:00
Atlante45	1e56d0c99b	Add parenthesis to quiet gcc warning	2015-10-02 14:18:18 -07:00
Atlante45	1f07ba46d0	Fix in-class initialization for windows build	2015-10-02 14:18:18 -07:00
Atlante45	48ff912dd2	Use one channel per packet list	2015-10-02 14:18:18 -07:00
Atlante45	3db99f50e5	Change takeFront name	2015-10-02 14:18:18 -07:00
Atlante45	7007d9f223	Use message part to check recieved packet list	2015-10-02 14:18:17 -07:00
Atlante45	c3fc6f4f79	Add message part to Packet	2015-10-02 14:18:17 -07:00
Atlante45	8cecb95bf2	Use array for stats	2015-10-02 14:16:47 -07:00
Atlante45	f1a9aba704	Magic number	2015-10-02 14:16:46 -07:00
Atlante45	91c779ddd8	Templatized DoubleLock	2015-10-02 14:16:46 -07:00
Atlante45	732ad41080	Introduce PacketQueue	2015-10-02 14:16:46 -07:00
Atlante45	709dab6beb	Release send queue before cleanup	2015-10-02 14:16:45 -07:00
Atlante45	290a0e573d	House cleaning	2015-10-02 14:16:45 -07:00
Atlante45	b0fe8535fd	Release _sendQueue before cleanup	2015-10-02 14:16:45 -07:00
Atlante45	eb8b37309d	Use lock_guard when possible	2015-10-02 14:16:44 -07:00
Atlante45	a4d383b384	Check handshake separately	2015-10-02 14:16:44 -07:00
Atlante45	3a61e6b6a3	Coding standart for locks	2015-10-02 14:16:44 -07:00
Atlante45	a34e1d85a5	Close current packet fix	2015-10-02 14:16:44 -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
Brad Hefta-Gaub	328467e019	Merge pull request #5909 from imgntn/particle_explorer ... [Scripts] Particle Explorer	2015-10-02 12:40:36 -07:00
James Pollack	1c6e833028	cleanup weird function formatting, remove unused code, improve spacing for logical units	2015-10-02 12:31:55 -07:00
Brad Hefta-Gaub	9bb2ada0a7	Merge pull request #5964 from ericrius1/sprayPaint ... Added closePaint script and removed no longer used spray paint scripts	2015-10-02 12:21:00 -07:00
Brad Hefta-Gaub	dce4d94f30	Merge pull request #5941 from ctrlaltdavid/particles-fix ... Fix particle radius, color, and alpha starts/finishes	2015-10-02 11:40:47 -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
James Pollack	55178cdc91	Merge remote-tracking branch 'upstream/master' into particle_explorer	2015-10-02 11:31:14 -07:00
Brad Hefta-Gaub	5a0ff4b1a2	Merge pull request #5841 from ericrius1/toybox ... Toybox master reset script	2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub	c6c430ca76	Merge pull request #5977 from jherico/marge ... Fixing 2D overlay mouse interaction	2015-10-02 11:11:04 -07:00
ericrius1	b595d916b6	fixed spacing issue	2015-10-02 11:10:08 -07:00
ericrius1	4dd2cf9cf5	Moved master reset script into new directory called unpublished scripts and changed relative pathing	2015-10-02 11:09:43 -07:00
Howard Stearns	639be1eef6	Merge pull request #5978 from AndrewMeadows/cleanup-sixense-calibration ... improved sixense/hydra calibration	2015-10-02 10:50:05 -07:00
Anthony J. Thibault	a1b54945d6	Compute the model offset in the rig, using the bind pose of the hips.	2015-10-02 10:34:34 -07:00
James Pollack	d1cbcf5554	roll back to full width window and set a min for emitRate so interface doesnt crash	2015-10-02 10:32:08 -07:00
ericrius1	f6c888599e	Fixed a bug where particles weren't moving with can.	2015-10-02 10:22:48 -07:00
James Pollack	ea20fc9786	hack for it to work as a tool window	2015-10-02 10:08:10 -07:00
ericrius1	9f5a3066b8	changed masterResetEntity back to masterReset	2015-10-02 10:07:43 -07:00
ericrius1	71fe9b216c	Removed extraneous masterReset script, and extra call to lightSwitches in correct script	2015-10-02 10:02:28 -07:00
Andrew Meadows	e9c71f3867	cleanup comments	2015-10-02 10:02:12 -07:00
ericrius1	a6df6c53f1	fixed more syntax errors	2015-10-02 09:55:41 -07:00
ericrius1	36f7bba87e	Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing	2015-10-02 09:53:30 -07:00
Andrew Meadows	50b2c8ae37	remove warnings in linux	2015-10-02 09:39:34 -07:00
Andrew Meadows	940b8eb529	improve some variable names	2015-10-02 09:39:13 -07:00
Andrew Meadows	98fe06be57	cleanup sixense/hydra calibration	2015-10-02 09:30:18 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
James B. Pollack	7c9d7ffefd	single sysytem particle explorer with one way bindings is feature complete	2015-10-01 23:49:33 -07:00
James B. Pollack	d1432c51d5	Merge branch 'master' into particle_explorer	2015-10-01 21:21:52 -07:00
James B. Pollack	679fc1b5ad	Merge branch 'master' of https://github.com/imgntn/hifi	2015-10-01 21:21:32 -07:00