Seth Alves
3d436d4c26
bump entity protocol version
2016-08-30 16:23:11 -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
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
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
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
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
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -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
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
howard-stearns
3aa387ddb9
Merge branch 'master' of https://github.com/highfidelity/hifi
2016-08-29 09:44:06 -07:00
Seth Alves
b31bb7bc06
Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions
2016-08-29 08:22:44 -07:00
Seth Alves
3c90413ebb
don't render stray/invalid hand-lasers in HMD mode
2016-08-29 04:06:53 -07:00
Seth Alves
be1332532f
disable debugging prints
2016-08-29 03:39:52 -07:00
Seth Alves
a729a95378
fix math
2016-08-28 21:03:32 -07:00
Seth Alves
670e85994d
fix arrow action
2016-08-28 20:05:29 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -07:00
Seth Alves
5daf334a0e
avoid extra grab-point spheres when resetting scripts
2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef
keep near-grab radius small but still allow large equip hotspots
2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76
don't show grab-point sphere when near grabbing or equipping
2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0
handle another type of abandoned grab
2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7
don't leave stray blue search sphere when near-grabbing
2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e
fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand
2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4
fix code that notices and fixes an abandoned grab
2016-08-27 16:00:27 -07:00
Brad Davis
92fa1d5776
Use stream draw for object position updates
2016-08-27 15:08:38 -07:00
Seth Alves
e4b2b7158f
hotspots with large radius work correctly, again
2016-08-27 09:30:26 -07:00
Seth Alves
76b72e32f0
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-27 09:06:45 -07:00
