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
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
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
441005bba0
use existing defaults for zoneless keylight
2016-08-31 09:47:53 -07:00
Zach Pomerantz
372c52fea5
restore default ambient skybox
2016-08-30 17:07:34 -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
5bda94b2ba
use same data as used for drawing show-hand-targets for controller joints in MyAvatar
2016-08-30 12:39:30 -07:00
Seth Alves
2a9ffc1529
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 10:26:14 -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
87fbbd68ae
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:37:58 -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
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
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Seth Alves
178a68c967
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 10:21:07 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -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
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1
Merge pull request #8527 from zzmp/fix/skybox-default-color
...
fix skybox default
2016-08-26 15:14:44 -07:00
Seth Alves
9394a25a1c
remove some anti-jitter code that was doing more harm than good
2016-08-26 12:47:19 -07:00
Seth Alves
9884426ad8
replace debugging aborts with asserts
2016-08-26 06:13:33 -07:00
Seth Alves
174a95a005
do some hokey pokey to avoid jitter of held entities while walking
2016-08-25 18:49:47 -07:00
Seth Alves
3b278adba3
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 17:28:18 -07:00
Brad Hefta-Gaub
10c465f591
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
...
Improved web entity rendering
2016-08-25 16:49:00 -07:00
Seth Alves
dfae5b64bd
attempt to avoid jitter of held entity while walking
2016-08-25 16:42:40 -07:00
Seth Alves
232917fcf8
when processing AvatarActionHold for another's avatar, use their hand-controller joint information
2016-08-25 16:02:58 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Andrew Meadows
d7bb555987
make menu wording more correct
2016-08-25 08:53:08 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
Howard Stearns
3f30b23b78
Merge pull request #8496 from huffman/fix/address-bar-popup
...
Fix address bar being opened when moving between places on same domain
2016-08-23 13:08:31 -07:00
Stephen Birarda
9461ca0cfc
use the facing shareable address for steam location
2016-08-23 11:56:18 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
Stephen Birarda
fbe784155e
add a shareable address return to address manager
2016-08-23 11:19:14 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Zach Pomerantz
cbb115bbcc
fix typo argee->agree
2016-08-22 16:34:23 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
howard-stearns
056b90c662
separate into four files
2016-08-22 15:01:55 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
