SamGondelman
e3288a9004
fix flicker, scissor warning, and handControllerGrab sphere size
2017-07-27 11:17:30 -07:00
Sam Gondelman
fcaa39b245
Merge branch 'master' into sharks
2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9
defaultRenderStates, handControllerGrab.js, fix teleport.js a little
2017-07-26 17:58:39 -07:00
Dante Ruiz
3805228b70
fixed grab the tablet in third person
2017-07-20 16:26:51 +01:00
Dante Ruiz
b3ec306063
better version
2017-07-18 23:48:21 +01:00
Dante Ruiz
8cbe63f296
removed search laser in edit mode for 2d mode
2017-07-18 22:45:54 +01:00
Zach Fox
a37f0137e7
Destroy overlays when trigger released
2017-07-17 14:29:43 -07:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
NeetBhagat
2ce72d554b
Resolve 2 issues:
...
1) Entity can grow/shrink if it is grabbed by first right hand then left hand.
2) Stop unwanted grow/shrink of an entity.
2017-06-05 14:13:51 +05:30
NeetBhagat
580c2548e9
Initial Commit :
...
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
2017-06-02 23:04:58 +05:30
Seth Alves
de40604042
whitespace
2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4
fix code that was using old raypickInfo.properties field
2017-05-25 09:47:02 -07:00
Anthony J. Thibault
b276970258
Hand controller lasers work better in thirdPerson camera mode.
2017-05-08 14:32:50 -07:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
900fae30fd
avoid calling editEntity on overlays
2017-05-04 19:05:52 -07:00
Seth Alves
70efe4aa4f
avoid calling editEntity on overlays
2017-05-04 18:52:17 -07:00
Anthony Thibault
7006fa6da4
Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
...
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
Seth Alves
0cd0e46ca5
make clone work again
2017-05-02 16:20:59 -07:00
Seth Alves
f1170dc17d
AvatarList not AvatarManager
2017-05-02 15:48:12 -07:00
Seth Alves
eed4da3570
some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero
2017-05-02 15:36:38 -07:00
Seth Alves
dc569051f9
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-05-02 09:50:13 -07:00
Seth Alves
4b0e7ceef5
show hand lasers when edit is enabled, but not if there are not hand-controllers
2017-04-28 10:24:04 -07:00
Seth Alves
467505e421
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-04-27 10:33:04 -07:00
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
volansystech
87ceebca82
Merge branch 'master' of https://github.com/highfidelity/hifi into 21200
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-04-27 12:58:18 +05:30
Zach Fox
9ace7a7488
Merge pull request #10279 from andrewd440/21174
...
21174 Make the Particle Emitter Easier to Use
2017-04-26 15:35:29 -07:00
Seth Alves
aeaa95b7a0
Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update
2017-04-26 10:23:27 -07:00
Andrew Lowry
ecf3826050
Always show hand lasers when in edit mode.
2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2
Adds laser selection of particle systems while in edit mode in HMD.
2017-04-24 13:35:37 -04:00
volansystech
1abbca6737
Merge branch 'master' into 21200
2017-04-24 19:09:02 +05:30
Seth Alves
ec687bdb4b
cleanups
2017-04-21 11:03:43 -07:00
Seth Alves
1e6b2682c9
use timers rather than relying on update calls
2017-04-21 10:17:57 -07:00
volansystech
9e2899678a
Resolving conflicts of #21206
2017-04-20 23:54:41 +05:30
volansystech
abc87c0338
Increased accuracy for converting far-grab to near-grab for every object
...
Near-grab radius reduced to its default = 0.3
2017-04-20 23:37:16 +05:30
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Brad Hefta-Gaub
a555846d5d
Merge pull request #10235 from volansystech/21206
...
21206 Far grab improvement to draw held entity toward yourself
2017-04-19 14:33:09 -07:00
volansystech
b194ddeb66
Resolve Comments of @sethalves
2017-04-19 16:39:23 +05:30
volansystech
e5c7587ad8
Improve far grabbing based on timescale.
2017-04-18 20:01:02 +05:30
volansystech
7e0efed062
Improve speed of grabbing.
2017-04-18 00:54:01 +05:30
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Seth Alves
110cfb47d1
turn off handControllerGrab debug prints
2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038
grab script checks for touch devices continually, rather than just when the script starts
2017-04-14 14:20:04 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Seth Alves
1009182c06
grab and handControllerGrab use new far-grab action
2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02
turn on handControllerGrab debug prints
2017-04-14 08:10:31 -07:00
volansystech
70855b1c53
Improve the accuracy of Far to near Equip State.
2017-04-13 19:24:47 +05:30
volansystech
7bc3435cfa
Initial Commit..
...
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
2017-04-13 02:51:30 +05:30
Seth Alves
026dde2e68
allow kinematic near-grab to be turned on or off for a given entity
2017-04-12 10:14:16 -07:00
volansystech
5639a3f92a
Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state.
2017-04-12 20:08:26 +05:30
