Commit graph

74 commits

Author SHA1 Message Date
Rob Kayson
49858d3ec5 Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick. 2017-04-07 19:16:29 -07:00
Rob Kayson
6763ca9b27 added tetherball create and entity scripts 2017-04-03 11:55:47 -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
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Atlante45
eab2c314d8 Preload sitting animation 2017-03-17 17:17:05 -07:00
Atlante45
893a5b1b18 Only override inAir and flying animation roles 2017-03-17 17:16:58 -07:00
Atlante45
1ce4dcc6e5 Fix attempt for avatar stuck in geometry. 2017-03-17 16:11:47 -07:00
Atlante45
eccc9ff47c Prevent 2 avatars from staying seated in the same chair 2017-03-17 16:11:17 -07:00
Atlante45
c1466c2dec Fix a couple sitting bugs 2017-03-17 10:45:13 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
35dd45ddf9 Capture drive keys while avatar is seated 2017-03-16 15:44:18 -07:00
Atlante45
b14a4faf61 Guard against script loading before avatar 2017-03-14 10:54:22 -08:00
Atlante45
9e6312ba0e Make sit script more stable. 2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f Put avatar in front of chair on situp to avoid infinite collisions 2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
Menithal
01ba44c572 Fixed print 2017-03-06 21:32:27 +02:00
Menithal
d50a0e33a9 CR. Run through Lint ECMAScript 5 standard
Meaning all const are out, non-variable definitions are out, etc
2017-03-06 21:07:16 +02:00
Menithal
04d3bf0c38 Cleanup and safeguards
- RegistrationPoint can no longer be set for magnetic blocks, will set it to
0.5 on snap.
- Simplified axis lock logic
2017-03-06 10:55:47 +02:00
Menithal
fe19b5511c Fixed up blocks scripts 2017-03-04 21:55:21 +02:00
Menithal
ea3f7f0274 Initial Magnetic block 2017-03-04 18:50:30 +02:00
Menithal
6d4abca0c1 Base line progress 2017-03-04 11:12:19 +02:00
ZappoMan
6400bb6319 CR feedback 2017-03-02 14:34:14 -08:00
ZappoMan
9e71801ae1 remove properties from RayToEntityIntersectionResult 2017-03-01 18:21:04 -08:00
Atlante45
38317a23c9 Keep orientation while seated 2017-02-27 17:33:26 -08:00
Atlante45
cd10b828dd Store whether avatar is sitting in a setting 2017-02-27 16:38:57 -08:00
Atlante45
40fdc4ea41 Remove extra script 2017-02-27 16:38:57 -08:00
Atlante45
b82817e54c Alternative sit script 2017-02-27 16:38:56 -08:00
Atlante45
e9316d30d0 More IK smoothing experimentation 2017-02-27 16:38:56 -08:00
Atlante45
834755588a Reset sensors and body 2017-02-27 16:38:56 -08:00
Atlante45
68e3e23bfc Remove Avatar parenting to chair 2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6 Use head orientation for sitting 2017-02-27 16:38:56 -08:00
Atlante45
0629c6dbf7 Cancel body pitch/roll when getting out of the chair. 2017-02-27 16:38:56 -08:00
Atlante45
0440e2fd60 Set higher tolerance 2017-02-27 16:38:55 -08:00
Atlante45
bf3a69a0b3 Add 2D UI when close to the seat 2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf Get IK error and stand up based on it 2017-02-27 16:38:55 -08:00
Atlante45
8e9fc83759 Fix sit anim reference 2017-02-27 16:38:55 -08:00
Atlante45
53948b8547 Check other avatar, disable movement in edit mode 2017-02-27 16:38:54 -08:00
Atlante45
1dbc133f12 Add animation state handler to the script 2017-02-27 16:38:54 -08:00
Atlante45
9033242584 More sit script work 2017-02-27 16:38:54 -08:00
Atlante45
1b2120d7e1 Sit script first draft 2017-02-27 16:38:54 -08:00
humbletim
6320d872b4 remove commented code 2017-01-18 02:57:13 -05:00
humbletim
f88b39918f switch to messaging for toggle notifications; cleanup 2017-01-18 02:54:42 -05:00
humbletim
1048c2a3bf apply default userData values; add error checking; throttle toggle clicks 2017-01-18 01:40:28 -05:00