32364 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	c27766facb	move string startswith to utils.js	2015-09-30 14:07:23 -07:00
Seth Alves	f746a970de	don't grab something if someone else is already grabbing it	2015-09-30 14:03:10 -07:00
Seth Alves	b34ea6ded4	store action lifetime as an expires integer	2015-09-30 13:46:23 -07:00
Seth Alves	06f7f92951	Merge branch 'master' of github.com:highfidelity/hifi into debug-grab	2015-09-30 13:09:47 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub	88f0c7017e	Merge pull request #5953 from hyperlogic/tony/avatar-mixer-crash-fix ... Prevent taking a reference to a QUrl rvalue.	2015-09-30 12:36:45 -07:00
Brad Hefta-Gaub	46e1a298c8	Merge pull request #5951 from huffman/cc-rng-fix ... Fix infinite recursion error with CC rng	2015-09-30 12:36:35 -07:00
Brad Hefta-Gaub	4480b60321	Merge pull request #5950 from birarda/guard-sph ... guard for insert/get in SentPacketHistory	2015-09-30 12:33:29 -07:00
Anthony J. Thibault	83c3f65b1f	Prevent taking a reference to a QUrl rvalue.	2015-09-30 11:34:38 -07:00
Ryan Huffman	1e9593029c	Fix infinite recursion error with CC rng ... On some std::random implementations tryin get a range [low, high) where high < low will cause infinite recursion.	2015-09-30 11:34:11 -07:00
Stephen Birarda	82ac0b1a27	use a mutable mutex to keep const-ness	2015-09-30 14:23:18 -04:00
Stephen Birarda	f7e7b07441	fix constness of SentPacketHistory in OEPS	2015-09-30 14:15:22 -04:00
Stephen Birarda	cc6b0adb7d	guard insert/get in SentPacketHistory	2015-09-30 14:15:04 -04:00
Brad Hefta-Gaub	1f1eb00c63	Merge pull request #5949 from sethalves/debug-grab ... improve actionInspector.js	2015-09-30 11:01:09 -07:00
Seth Alves	ba317a0511	Merge branch 'debug-grab' of github.com:sethalves/hifi into debug-grab	2015-09-30 10:58:05 -07:00
Seth Alves	898e3917e3	improve actionInspector.js	2015-09-30 10:57:52 -07:00
Brad Hefta-Gaub	94b0e36f0e	Merge pull request #5948 from sethalves/debug-grab ... script to display entity-action details in an overlay	2015-09-30 10:43:05 -07:00
Seth Alves	96d0df49e4	script to display entity-action details in an overlay	2015-09-30 10:41:39 -07:00
Brad Davis	9453e5cb1b	Merge pull request #5947 from ZappoMan/hideHandCursors ... only show hand cursors when menu is enabled	2015-09-30 09:43:40 -07:00
Brad Hefta-Gaub	76825c2be7	only show hand cursors when menu is enabled	2015-09-30 09:06:45 -07:00
Leonardo Murillo	054a3728de	Merge pull request #5945 from kencooke/master ... Create symbol files on Windows release builds	2015-09-30 09:46:16 -06:00
Ken Cooke	de8848f7bc	Fix to only pass --release to windeployqt on release builds	2015-09-30 08:11:16 -07:00
Ken Cooke	4dc2c9a58f	Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release.	2015-09-29 18:42:52 -07:00
Ryan Huffman	b4ca03ac3f	Merge pull request #5940 from ericrius1/polyLineFix ... Made polyline painting experience smoother- no more flickering	2015-09-29 18:22:01 -07:00
ericrius1	1760720b2b	added check for normals and vertices	2015-09-29 17:42:20 -07:00
ericrius1	5ce3b13a4c	Fixed spacing issues	2015-09-29 17:31:02 -07:00
ericrius1	5c6f8198f3	Merge remote-tracking branch 'origin/polyLineFix' into polyLineFix ... Conflicts: libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp	2015-09-29 16:39:21 -07:00
ericrius1	d1b016b483	untabbified lines	2015-09-29 16:38:21 -07:00
Eric Levin	c901a749c2	Update RenderablePolyLineEntityItem.cpp	2015-09-29 16:33:18 -07:00
Eric Levin	614312f04f	Update PolyLineEntityItem.cpp	2015-09-29 16:32:07 -07:00
Eric Levin	36be35a836	Update RenderablePolyLineEntityItem.cpp	2015-09-29 16:30:42 -07:00
Brad Davis	166d267022	Merge pull request #5942 from ZappoMan/flickeringLightScript ... Change the update rate of the flickering light to 30hz	2015-09-29 16:20:24 -07:00
Seth Alves	58d98d3ce4	Merge pull request #5932 from howard-stearns/default-animation-and-quieter ... Set default animation and quiet state logging	2015-09-29 16:12:28 -07:00
Andrew Meadows	ddbdf2be86	Merge pull request #5943 from sethalves/no-avatar-collision-with-held ... rearrange when grab script changes avatar collisions	2015-09-29 15:56:11 -07:00
Seth Alves	472ff89f48	rearrange when avatar collisions are adjusted	2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub	67823b79d5	change additional lifetime to 60 seconds to avoid processing hiccups	2015-09-29 15:48:46 -07:00
Andrew Meadows	d7dee2abe8	Merge pull request #5939 from sethalves/no-avatar-collision-with-held ... Do Not Merge -- No avatar collision with held entites	2015-09-29 15:48:34 -07:00
Brad Hefta-Gaub	90afeb4ce1	more debugging	2015-09-29 15:45:29 -07:00
ericrius1	e7834365f5	Made polyline painting experience smoother- no more flickering	2015-09-29 15:33:39 -07:00
Seth Alves	8f2f14c9e5	keep track of state of avatar-collisions menu-item with global variables rather than per object ones	2015-09-29 15:30:24 -07:00
Seth Alves	2ba686ed89	cleanups	2015-09-29 15:11:52 -07:00
Seth Alves	d554eb8db9	avatar collisions are off during a grab	2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub	04115052b3	Merge pull request #5938 from samcake/calvin ... Fixing the lighting view matrix for stereo again	2015-09-29 15:08:41 -07:00
Brad Hefta-Gaub	f83eae4d42	more debugging	2015-09-29 14:45:24 -07:00
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -07:00
Seth Alves	b1a133e55c	working on disabling avatar collisions during grab	2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub	07515ce710	Merge pull request #5918 from PhilipRosedale/master ... Throw held objects with velocity from fingertip	2015-09-29 14:37:44 -07:00
unknown	006650f23b	Fix for PR comments	2015-09-29 14:34:23 -07:00
James B. Pollack	bbc32cdd1e	Merge pull request #5937 from ericrius1/grabFix ... releaseGrab event now triggered for non physical entities	2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge ... Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00