46329 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	045042a9c6	don't disable grabbing when teleporting	2016-09-01 14:15:49 -07:00
Seth Alves	1a9f43cb67	fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled	2016-09-01 12:17:34 -07:00
Seth Alves	a35e527128	try to fix far-trigger	2016-09-01 11:46:08 -07:00
Seth Alves	53ba190ca6	don't do auto-release test unless the hand is equipping	2016-09-01 09:57:46 -07:00
Seth Alves	2b2d320659	Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions	2016-08-31 16:53:13 -07:00
Seth Alves	47259ee053	find equip-points with controller position rather than hand	2016-08-31 16:52:46 -07:00
Seth Alves	dc31525794	remove some left-over code	2016-08-31 16:39:57 -07:00
Seth Alves	280b603747	remove some leftover code	2016-08-31 16:30:51 -07:00
Seth Alves	74dc2ce493	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 16:26:21 -07:00
Chris Collins	02afa460ff	Merge pull request #8557 from jherico/location_bar ... Don't show address bar when starting up in a connected state	2016-08-31 16:03:37 -07:00
Chris Collins	76a7226bba	Merge pull request #8550 from zzmp/fix/ambient-skybox ... fix washed out white ambient (by restoring tex)	2016-08-31 15:36:55 -07:00
Brad Davis	b9a97712d5	Don't show address bar when starting up in a connected state	2016-08-31 15:17:57 -07:00
Zach Pomerantz	c8ff6ee4cc	Merge branch 'master' of github.com:highfidelity/hifi into fix/ambient-skybox	2016-08-31 14:33:57 -07:00
Andrew Meadows	8c520afd1e	Merge pull request #8530 from zzmp/fix/skybox-nesting ... fix skybox nesting	2016-08-31 14:21:09 -07:00
Seth Alves	7c831f2434	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 10:50:31 -07:00
Seth Alves	21b4759b6d	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 10:27:44 -07:00
Zach Pomerantz	441005bba0	use existing defaults for zoneless keylight	2016-08-31 09:47:53 -07:00
Ryan Downe Karpf	6c853ec77d	Merge pull request #8538 from AndrewMeadows/workaround-resolvePath ... workaround for Script.resolvePath() bug	2016-08-31 08:59:14 -07:00
Andrew Meadows	12e6920a8d	fix syntax error	2016-08-31 08:15:00 -07:00
Zach Pomerantz	372c52fea5	restore default ambient skybox	2016-08-30 17:07:34 -07:00
Zach Pomerantz	0e9ff04c4c	fix layered zone applications	2016-08-30 17:00:02 -07:00
Zach Pomerantz	bb39cdafda	fix applyPartial for last zone	2016-08-30 17:00:02 -07:00
Zach Pomerantz	abde84b068	fix async skybox tex loading	2016-08-30 17:00:02 -07:00
Seth Alves	c6804ba721	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 16:23:22 -07:00
Seth Alves	3d436d4c26	bump entity protocol version	2016-08-30 16:23:11 -07:00
Brad Davis	3ca01a1e4b	Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler ... restore onNewViewRequested	2016-08-30 15:21:27 -07:00
Seth Alves	cdd08bd38e	more anti-jitter changes	2016-08-30 14:59:30 -07:00
Seth Alves	78f54a7f33	get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away	2016-08-30 14:39:11 -07:00
howard-stearns	8824507523	new smaller WebView.qml	2016-08-30 14:37:08 -07:00
howard-stearns	564769f7d3	move WebView.qml to baseWebView.qml	2016-08-30 14:07:34 -07:00
howard-stearns	232ac74b26	back to master version	2016-08-30 14:06:20 -07:00
Seth Alves	53ff6a239d	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 12:39:35 -07:00
Seth Alves	5bda94b2ba	use same data as used for drawing show-hand-targets for controller joints in MyAvatar	2016-08-30 12:39:30 -07:00
howard-stearns	c5b998a2a8	use new hook in marketplace code	2016-08-30 12:18:03 -07:00
Chris Collins	188f5d5ace	Merge pull request #8545 from ZappoMan/fbx2016 ... support for fbx2016 format	2016-08-30 11:36:25 -07:00
Seth Alves	617880479a	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 11:19:40 -07:00
Seth Alves	3a5f92d7a2	ignoreIK for equipping. change how auto-unequip searches	2016-08-30 11:16:13 -07:00
Brad Davis	eb0a8db0af	Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam ... When trigger is pulled, snap search beam to correct length instead of animating	2016-08-30 11:13:58 -07:00
Seth Alves	2a9ffc1529	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 10:26:14 -07:00
Seth Alves	7d13f9220c	fix math, renamed a couple variables	2016-08-30 09:55:42 -07:00
Seth Alves	01ee6e9e98	Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions	2016-08-30 09:42:57 -07:00
Stephen Birarda	74fac8c7c9	Merge pull request #8512 from birarda/shareable-address ... add shareable address from default name, leverage for steam join/invite	2016-08-30 09:35:24 -07:00
Seth Alves	a9400119ab	Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions	2016-08-30 09:13:16 -07:00
Seth Alves	f4eee8d480	Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers	2016-08-30 09:12:53 -07:00
Brad Hefta-Gaub	7397b884e7	support for fbx2016 format	2016-08-30 09:07:39 -07:00
Seth Alves	314b7617ac	Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events ... Bug fix for click events received by entity scripts	2016-08-29 17:57:56 -07:00
Seth Alves	c022c2e705	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-29 17:43:53 -07:00
Seth Alves	87fbbd68ae	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-29 17:37:58 -07:00
Andrew Meadows	2d8bb54b93	fix typo	2016-08-29 17:37:24 -07:00
James B. Pollack	ed2ebd122b	Merge pull request #8542 from imgntn/nobackspace ... No more delete with backspace in edit.js	2016-08-29 17:31:44 -07:00