Commit graph

1541 commits

Author SHA1 Message Date
Seth Alves
84385e6061 work around fb-21767 with a timer 2019-03-26 09:40:22 -07:00
Seth Alves
4303dd589f make sure equip attachment-points pulled from settings are reasonable before using them 2019-03-26 09:40:22 -07:00
Seth Alves
195472bd43 make equipping of clonables more reliable 2019-03-26 09:40:22 -07:00
Wayne Chen
84b177996b removing dead code 2019-03-11 16:43:26 -07:00
r3tk0n
ec0cf3ee3a Fix typo. 2019-03-11 09:58:20 -07:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104 Fix typo. 2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d Fix activation / deactivation criteria for PTT controller module. 2019-03-08 16:07:47 -08:00
r3tk0n
3b274c2b6e Enable pushToTalk.js controller module. 2019-03-08 16:02:16 -08:00
r3tk0n
f6add9cafd Add pushToTalk.js controllerModule. 2019-03-08 16:02:15 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
2019-03-07 16:04:57 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
r3tk0n
12ffa41984 Prevent HUD and Web Surface lasers from interrupting FarGrab. 2019-03-02 13:55:06 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation
FarGrab Entity Rotation with Off-Hand
2019-03-01 14:42:59 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
r3tk0n
ca740c6254 Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab. 2019-02-26 18:44:00 -08:00
r3tk0n
52d80476a8 Fix activation criteria. 2019-02-26 17:55:16 -08:00
r3tk0n
9559f9ffd3 Add off-hand controller manipulation to fargrab. 2019-02-26 17:52:18 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
2019-02-19 14:20:56 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
cases 20709 and 20715: wear and see mexico hats
2019-01-22 12:58:56 -08:00
Seth Alves
c8e9bff03a fix releaseGrab call on grabbed entity when a nearGrab ends 2019-01-17 13:34:36 -08:00
Seth Alves
b5326936d8 grab.js will now ignore click-to-equip entities 2019-01-15 14:17:51 -08:00
Seth Alves
e8676f63c6 release grab if scripts are reloaded before grab is released 2019-01-15 13:44:03 -08:00
Seth Alves
2515c7f73e remove old-style grabbing scripts 2019-01-15 13:43:52 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
Seth Alves
b2f25629eb don't allow scaling of others' equipped entities 2019-01-03 08:19:18 -08:00
Seth Alves
bf46960dc3 fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557 get grabbing and scaling to get along better 2019-01-03 08:17:52 -08:00
Seth Alves
905af34564 disable traits-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c port over PR-14276 2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b port over PR-14429 2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece enable trait-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff port over PR-14464 2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c turn-off nearEntityGrab when scaleEntity is active 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus
Keyboard interaction menus
2018-12-12 17:53:59 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345
Make create apps not grab tablet if editing an entity with hand
2018-12-09 17:21:10 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
2018-11-30 09:44:09 +13:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting
Remove entity highlighting
2018-11-29 09:04:56 -08:00