Ryan Huffman
|
7f4a8e9d7d
|
Merge branch 'master' of github.com:Atlante45/hifi into baseball
|
2015-11-02 12:25:51 -08:00 |
|
Atlante45
|
bc552c772b
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-10-30 14:05:40 -07:00 |
|
Clément Brisset
|
e818028043
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-10-29 15:53:44 -07:00 |
|
Clément Brisset
|
0ea2ca589b
|
Merge branch 'physics-ccd' of https://github.com/huffman/hifi
Conflicts:
examples/libraries/walkApi.js
examples/toybox/flashlight/flashlight.js
examples/walk.js
|
2015-10-29 15:47:14 -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
|
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 |
|
Brad Davis
|
34b5178393
|
Fixing ping-ping entity script
|
2015-10-26 11:55:23 -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 |
|