Seth Alves
47259ee053
find equip-points with controller position rather than hand
2016-08-31 16:52:46 -07:00
Seth Alves
21b4759b6d
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-31 10:27:44 -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
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
Andrew Meadows
99acc9045d
disable defaultScripts.js debugging by default
2016-08-29 17:15:01 -07:00
Andrew Meadows
b50d24fb00
don't use Script.resolvePath() in local functions
2016-08-29 17:11:29 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
howard-stearns
a48aced7bd
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-WebView-tab-handler
2016-08-29 15:43:42 -07:00
howard-stearns
11f00ed46c
add a hook so that clients can gain access to the new component, window,
...
and request
2016-08-29 14:44:48 -07:00
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -07:00
howard-stearns
6272db42da
restore onNewViewRequested
2016-08-29 13:53:08 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Brad Davis
3890197efe
Merge pull request #8535 from zzmp/fix/skybox-black
...
allow black skybox
2016-08-29 13:11:46 -07:00
Andrew Meadows
b1d472c9ba
workaround for Script.resolvePath() bug
2016-08-29 12:28:59 -07:00
Howard Stearns
a1ae9eebf2
Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning
...
Silence address bar log warning
2016-08-29 11:48:43 -07:00
Brad Davis
179e3565ef
More render-perf tweaks
2016-08-29 11:22:56 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Zach Pomerantz
5f699072d9
allow black skybox
2016-08-29 10:58:09 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Seth Alves
55b68ad4b1
fix warning
2016-08-29 10:21:58 -07:00
Seth Alves
178a68c967
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 10:21:07 -07:00
Brad Davis
c3e345150b
Merge pull request #8531 from jherico/gl_fixes
...
(AMD) OpenGL Fixes
2016-08-29 09:59:22 -07:00
