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
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
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
Seth Alves
0eb9507a10
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:25:50 -07:00
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
Thijs Wenker
695c55bc3d
fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes
2017-04-12 03:44:24 +02:00
volansystech
99af493ac8
Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically.
...
Successfully converted far grab into near grab when entity is closer to the Avatar.
When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.
2017-04-11 21:57:01 +05:30
Anthony Thibault
746b7aadbd
Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped
...
Fix teleport when something equipped
2017-04-09 19:00:21 -07:00
volansystech
e0b08a5e4e
Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand.
2017-04-07 21:55:26 +05:30
Seth Alves
2e4e10759f
teleport raypick now ignores equipped or grabbed entities
2017-04-05 13:17:03 -07:00
Anthony J. Thibault
c33f10ca1b
Recenter body on teleport, also it works more consistently.
...
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
2017-04-04 18:05:46 -07:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc
fix initial finger/stylus setting
2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab
Merge pull request #9940 from Atlante45/fix/sit
...
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Anthony J. Thibault
5796cbc898
Bug-fix for touching deleted entities or overlays.
2017-03-27 10:26:33 -07:00
ZappoMan
52335e20a2
fix typo
2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59
Merge pull request #9970 from Triplelexx/21223
...
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Seth Alves
bd32104bc1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb
Merge pull request #9937 from thoys/boppo
...
El Boppo the Clown punching bag game
2017-03-22 09:30:54 -07:00
Triplelexx
a964edee91
change all references of Quat.getFront to Quat.getForward in scripts directory
2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e
fix error from using a misspelled function
2017-03-21 22:25:45 +01:00
Dante Ruiz
bf3c5dbf0e
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7
fixed third eye laser
2017-03-21 19:45:00 +01:00
