33055 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	a737b4024d	Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes	2015-10-02 13:57:24 -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
Seth Alves	67cc944afc	fix double free problem	2015-10-02 13:27:45 -07:00
Brad Hefta-Gaub	e6fb587a8c	Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings	2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub	98e8b3083d	comment	2015-10-02 13:04:02 -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
ericrius1	0497de47ea	No longer removing non-existent entities from spray paint can; color tweaks to paint stream	2015-10-02 12:40:14 -07:00
Brad Hefta-Gaub	b27396606b	fix first run	2015-10-02 12:34:46 -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
Seth Alves	c0e8b02a2f	fix what happens when a distance grab is blocked because someone else already has it	2015-10-02 12:25:34 -07:00
samcake	a22ee03732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-02 12:25:09 -07:00
samcake	edb485cb0f	working on getting the Model payload to use model::Mesh	2015-10-02 12:24:41 -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
ericrius1	4b62048fb1	more light changes	2015-10-02 12:12:36 -07:00
Brad Davis	83c9ebf06c	Fixing Linux build failure	2015-10-02 11:57:14 -07:00
Brad Davis	7d4b680255	PR comments	2015-10-02 11:57:13 -07:00
Brad Davis	de5e95f7dc	Improved procedural surfaces, textures and more standard uniforms	2015-10-02 11:57:13 -07:00
Seth Alves	880d92ee64	try to fix double-distance-grabbing lockout	2015-10-02 11:46:48 -07:00
Seth Alves	5b970e6b1a	try to fix double-distance-grabbing lockout	2015-10-02 11:43:19 -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
ericrius1	0d599458e6	Merged from toybox	2015-10-02 11:34:07 -07:00
James Pollack	55178cdc91	Merge remote-tracking branch 'upstream/master' into particle_explorer	2015-10-02 11:31:14 -07:00
James Pollack	2533bfd2ad	initial	2015-10-02 11:30:56 -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
James Pollack	97c4aa85dc	Merge remote-tracking branch 'upstream/master'	2015-10-02 11:17:53 -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
ericrius1	51887a76e1	refactoring lights to fix problem with piling up	2015-10-02 11:02:19 -07:00
Seth Alves	bb5abeeabb	Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes	2015-10-02 10:57:56 -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
James Pollack	c6fa132dc2	cleanup	2015-10-02 10:44:26 -07:00
James Pollack	82828fdd14	reduce gravity and gun force so ball goes through less objects	2015-10-02 10:41:49 -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 Hefta-Gaub	cf2693e712	working fistFrame lastFrame	2015-10-02 08:31:22 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00