Commit graph

126 commits

Author SHA1 Message Date
James B. Pollack
f0fbd67e93 merge 2015-11-03 13:00:25 -08:00
James B. Pollack
ad9cfbab50 end of day 2015-10-29 17:24:43 -07:00
James B. Pollack
342760de56 Merge branch 'master' into bow 2015-10-29 15:58:57 -07:00
James B. Pollack
48a295f4bc werk 2015-10-29 15:24:04 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
James B. Pollack
7166c6ddd2 through arrow in notch with rotation 2015-10-29 12:23:32 -07:00
James B. Pollack
028ea584b8 updating bow 2015-10-29 11:23:03 -07:00
James B. Pollack
8695963dd1 end of day 2015-10-28 19:10:16 -07:00
James B. Pollack
24a5cdc19e through notching the arrow 2015-10-28 14:00:37 -07:00
James B. Pollack
68a4365fa5 changes for arrow entity reload 2015-10-28 13:27:31 -07:00
James B. Pollack
4e6234741a reenable both hands to pick up arrow 2015-10-28 10:24:09 -07:00
James B. Pollack
369cf8e454 update model paths 2015-10-28 10:22:51 -07:00
James B. Pollack
0003eecf08 remove reload feature to prep for arrow netity 2015-10-28 10:20:35 -07:00
James B. Pollack
8b78278a79 end of day 2015-10-27 18:26:12 -07:00
James B. Pollack
da5db326e8 make cat quieter 2015-10-26 16:03:10 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
James B. Pollack
fc8184ffed add arcade sound 2015-10-26 12:25:51 -07:00
James B. Pollack
fb5b600211 bow work 2015-10-26 12:25:01 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
James B. Pollack
c0cb8b542e add notching system, add fire 2015-10-25 22:47:02 -07:00
James B. Pollack
29de3581dd end of day 2015-10-23 17:39:03 -07:00
James B. Pollack
6e8d505726 updates 2015-10-23 14:38:17 -07:00
James B. Pollack
63d18acf91 bow updates 2015-10-23 14:12:56 -07:00
James B. Pollack
ca0aad7d3b update after updating models 2015-10-22 17:25:15 -07:00
James B. Pollack
b8f0972228 move bow into toybox 2015-10-21 14:00:51 -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