Commit graph

94 commits

Author SHA1 Message Date
Ryan Downe Karpf
950d020d77 Merge pull request #6553 from ericrius1/noBlockCollisions
Blocks dont collide when held
2015-12-04 11:59:39 -08:00
ericrius1
3bb1dedaf9 fixed syntax error 2015-12-04 11:41:23 -08:00
ericrius1
786e241a29 blocks dont collide when held 2015-12-04 10:14:40 -08:00
ericrius1
dec4cd012e made ping pong gun have restitution of 0 2015-12-02 18:26:09 -08:00
ericrius1
6d953a65dd changed restitution to 0 2015-12-02 12:09:21 -08:00
ericrius1
0180503447 removed collision sound url 2015-12-02 12:07:38 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes
Toybox Tweaking
2015-12-01 13:07:10 -08:00
James B. Pollack
77d66de7f3 Update masterReset.js
add 0 before numbers
2015-12-01 11:19:42 -08:00
James B. Pollack
0e4aaaceeb Update hiddenEntityReset.js
add 0 before numbers
2015-12-01 11:19:15 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
ericrius1
d80bfc0af6 more gravity for spraycan 2015-12-01 09:41:04 -08:00
ericrius1
880aed0e6b fixed missing brace 2015-11-30 18:29:20 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
ericrius1
90595949f1 moved exterminator game out of dry lake 2015-11-30 18:14:57 -08:00
James B. Pollack
ea831238e6 Merge pull request #6504 from imgntn/bubblemaster
Update master reset scripts for Toybox to have parity with bubble wand
2015-11-30 17:36:40 -08:00
ericrius1
706a67b9a1 lowered restitution to 0 to avoid too many collision sounds playing 2015-11-30 15:10:32 -08:00
James B. Pollack
9b90c19781 cleanup 2015-11-30 13:24:33 -08:00
James B. Pollack
171ae02b03 update to parity with createWand.js 2015-11-30 13:12:39 -08:00
ericrius1
22efcb1854 Added sounds to pistol 2015-11-30 11:42:34 -08:00
ericrius1
125c32b8fc tweak 2015-11-24 16:18:09 -08:00
ericrius1
c720c97e70 tweak 2015-11-24 16:14:26 -08:00
ericrius1
3a9dcf56df tweak 2015-11-24 16:11:07 -08:00
ericrius1
224dea45e2 tweaked gun position in hand 2015-11-24 16:06:09 -08:00
James B. Pollack
914805ef41 added 2015-11-24 15:31:14 -08:00
James B. Pollack
a10d00f34d add bow to master reset 2015-11-24 15:25:15 -08:00
ericrius1
d202ccb29c entity reset switch can be triggered again with hand controller 2015-11-23 15:52:21 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
ericrius1
8c5abd05c8 added gun to toybox 2015-11-19 10:13:00 -08:00
James B. Pollack
36dfe81fde fix link 2015-11-09 12:19:23 -08:00
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -08:00
James B. Pollack
d8f169bd4e add collision sounds to bballs 2015-11-06 17:04:55 -08:00
James B. Pollack
1d41ef868b update bubblewand model refs 2015-11-06 13:11:06 -08:00
Seth Alves
4a3b434fd4 change grabbing-non-colliding to trigger. fix whiteboard and some other scripts 2015-11-05 10:35:02 -08:00
ericrius1
3019886344 Removing basketball hoop from reset scripts
Hoop will be saved in SVO instead
2015-11-02 11:08:06 -08:00
ericrius1
b067abe2d9 Added name to basketball hoop in reset scripts 2015-11-02 09:58:23 -08:00
James B. Pollack
c8e1aca4b6 fix box dimensions 2015-10-26 18:10:45 -07:00
James B. Pollack
7a7f649bf7 change from far grab to near grab 2015-10-26 17:55:13 -07:00
James B. Pollack
2d873012a3 make reset buttons invisible entities instead of text 2015-10-26 17:51:55 -07:00
James B. Pollack
90131f1291 make target reset wider 2015-10-26 16:00:14 -07:00
James B. Pollack
f436857a62 add reset buttons for basketballs and targets 2015-10-26 15:28:35 -07:00
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
ericrius1
1c5dc0374a Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes 2015-10-21 10:16:31 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
James B. Pollack
c84d2fc36a fix target script url 2015-10-13 10:44:43 -07:00
James B. Pollack
309cde7f28 invert solidity of most toybox objects while held 2015-10-13 10:31:36 -07:00
James B. Pollack
0f998e81af add min reset distance 2015-10-12 17:03:32 -07:00
James B. Pollack
fc8a4f4f2d cleanup 2015-10-12 17:00:49 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00