37382 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	ff9eb7f20d	Update masterReset.js	2016-01-21 09:33:21 -08:00
James B. Pollack	b91e5c27e1	Update createPistol.js	2016-01-20 10:45:40 -08:00
James B. Pollack	8d3468265f	make pistol collision sound quieter, other adjustments	2016-01-20 10:44:02 -08:00
Brad Hefta-Gaub	4ea5c11b73	Merge pull request #6862 from ctrlaltdavid/20783 ... Make running scripts list scrollable with scroll bar	2016-01-19 23:29:37 -08:00
Brad Hefta-Gaub	11c30302b2	Merge pull request #6868 from jherico/update_dialog ... Prevent update dialog from becoming locked	2016-01-19 23:08:40 -08:00
Brad Davis	d97f930dc9	Prevent update dialog from becoming locked	2016-01-19 22:33:00 -08:00
Howard Stearns	730640068c	Merge pull request #6865 from ZappoMan/fixPrematureQuery ... fix premature octree query before preferences are loaded	2016-01-19 19:32:34 -08:00
Anthony Thibault	42ac96607a	Merge pull request #6864 from sethalves/js-list-entity-joint-names ... expose getJointNames for entities to js	2016-01-19 18:59:47 -08:00
Seth Alves	28d673cb97	try again to make this thread safe	2016-01-19 16:00:02 -08:00
Seth Alves	0064ee6ab2	try again to make this thread safe	2016-01-19 15:55:56 -08:00
Seth Alves	edea0320e6	try again to make this thread safe	2016-01-19 15:44:22 -08:00
Seth Alves	a515d6debe	call into correct thread to getJointNames on entity	2016-01-19 15:16:58 -08:00
Brad Hefta-Gaub	55093aafea	Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix ... Fixed entity script loading functionality for the jsstreamplayer.	2016-01-19 13:14:43 -08:00
Brad Hefta-Gaub	bcdff7ba4a	fix premature octree query before preferences are loaded	2016-01-19 13:11:11 -08:00
Seth Alves	f265656e74	expose getJointNames for entities to js	2016-01-19 12:55:17 -08:00
Andrew Meadows	feb2a82d93	Merge pull request #6856 from hyperlogic/tony/hand-grab-one-frame-lag-fix ... Avatar: Fix for one frame lag in hold action	2016-01-19 11:43:27 -08:00
Seth Alves	a2bec2a5bf	Merge pull request #6857 from ctrlaltdavid/20779 ... Fix crash in Running Scripts when edit filter after highlighting script	2016-01-19 11:40:47 -08:00
Seth Alves	8ba800fda8	Merge pull request #6851 from AndrewMeadows/collisionless2 ... namechange "ignoreForCollisions" to "collisionless"	2016-01-19 11:33:55 -08:00
Anthony J. Thibault	b750128c94	Avatar: centeralized palm rotation/position to world space calculation.	2016-01-19 11:03:00 -08:00
James B. Pollack	347293a6a4	Merge pull request #6858 from ctrlaltdavid/20780 ... Make filter in Running Scripts window be case-insensitive	2016-01-19 10:51:42 -08:00
Brad Hefta-Gaub	e15c7f089e	Merge pull request #6850 from sethalves/various-fixes ... Various fixes	2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub	15899558aa	Merge pull request #6842 from AlessandroSigna/vrShop ... Vr shop	2016-01-19 09:39:28 -08:00
Andrew Meadows	48374ef5bc	more ignoreForCollisions to collisionless	2016-01-19 09:06:17 -08:00
Andrew Meadows	7fb145e819	namechange ignoreForCollisions --> collisionless	2016-01-19 09:06:17 -08:00
Brad Hefta-Gaub	fca5b29e6f	Merge pull request #6786 from AlessandroSigna/overlays ... Thread-safe access to EntityTree in OverlayPanel	2016-01-19 09:02:45 -08:00
David Rowe	9393735478	Make running scripts list scrollable with scroll bar	2016-01-19 20:25:16 +13:00
Anthony J. Thibault	ec2f8db83a	Avatar: Fix for one frame lag in hold action ... AvatarActionHold now uses the most recent un-cached palm positions/orientations instead of the cached version from the previous frame.	2016-01-18 17:37:28 -08:00
samcake	29945bba92	Merge pull request #6837 from zzmp/feat/render-shadow ... Add RenderShadowTask	2016-01-18 15:45:51 -08:00
Howard Stearns	6f84a67453	Merge pull request #6840 from jherico/qml_cleanup ... File dialogs and modal message boxes in QML	2016-01-18 15:04:37 -08:00
Seth Alves	7b63e5b286	Merge pull request #6853 from sethalves/fix-typo-in-edit-js-code ... fix property name typo	2016-01-18 14:53:41 -08:00
Seth Alves	9428da61cf	fix property name typo	2016-01-18 14:31:55 -08:00
Howard Stearns	5caf10beed	Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck ... Include checking the angular size of entities on the server side for LOD support	2016-01-18 14:13:34 -08:00
Seth Alves	823428290d	Merge branch 'master' of github.com:highfidelity/hifi into various-fixes	2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub	b8747709ef	CR feedback, dead code cleanup	2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub	d10e1cc39d	CR feedback, dead code cleanup	2016-01-18 12:09:21 -08:00
Seth Alves	94bafb4a1e	Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove ... namechange collisionsWillMove --> dynamic	2016-01-18 11:51:59 -08:00
Seth Alves	3b3720781f	fix a place where parent's scale wasn't properly squashed	2016-01-18 11:15:53 -08:00
Seth Alves	d6e3b85237	fix javascript access via localPosition and localRotation	2016-01-18 11:15:32 -08:00
Seth Alves	4232e400cc	add getJointIndex call	2016-01-18 11:15:03 -08:00
Seth Alves	8b6e89a5c4	fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening	2016-01-18 11:13:33 -08:00
Zach Pomerantz	6434d98365	Separate directional shaders with(out) shadowmaps	2016-01-18 11:11:28 -08:00
Seth Alves	d8dceade2e	Merge pull request #6833 from PhilipRosedale/searchChoice ... Choice of hand ray pick or head pick	2016-01-18 11:03:30 -08:00
Brad Hefta-Gaub	88af387214	cleanup	2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub	2774df38bc	check for entity size before including it for LOD	2016-01-18 09:06:57 -08:00
AlessandroSigna	737a00a2cb	Typo fixed	2016-01-18 16:20:32 +01:00
Brad Davis	5aa8398adb	Working on keyboard focus issues	2016-01-17 20:56:07 -08:00
Philip Rosedale	9b3155188d	Squeeze a little to search, a lot to grab	2016-01-17 19:10:40 -08:00
Philip Rosedale	23a8d57ca2	Always show search ray	2016-01-17 14:14:00 -08:00
Philip Rosedale	588719a4c2	merge conflict fix	2016-01-17 13:07:55 -08:00
James B. Pollack	8c4abd2a2d	Merge pull request #6847 from howard-stearns/tribbles ... tribbles	2016-01-16 18:28:58 -08:00