Thijs Wenker
|
c791422fab
|
make gamepads and A (select key) and B (delete character) button function
|
2015-01-08 02:22:08 +01:00 |
|
Thijs Wenker
|
da95d413a0
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-01-07 23:25:05 +01:00 |
|
Thijs Wenker
|
40b4a17ba8
|
include globals.js from runnable scripts for now.
|
2015-01-07 23:14:31 +01:00 |
|
Chris Collins
|
d15ae92e1e
|
Guitar fix
Guitar position fix
|
2015-01-07 13:40:36 -08:00 |
|
Thijs Wenker
|
ff6cae738b
|
fixed library paths
|
2015-01-07 20:47:59 +01:00 |
|
Thijs Wenker
|
19eec81173
|
moved goTo.js and virtualKeyboardTextEntityExample.js to the right category folder
|
2015-01-07 20:46:39 +01:00 |
|
Thijs Wenker
|
2d56070eae
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20224
Conflicts:
examples/controllers/oculus/virtualKeyboard.js
examples/libraries/virtualKeyboard.js
examples/virtualKeyboard.js
|
2015-01-07 20:45:18 +01:00 |
|
Thijs Wenker
|
0ec25acc9c
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-01-07 14:39:27 +01:00 |
|
Chris Collins
|
816e369c08
|
More Script updates
More Script updates
|
2015-01-06 22:32:45 -08:00 |
|
Chris Collins
|
95f8447191
|
Incremental update to scripts cleanup
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
|
2015-01-06 15:47:25 -08:00 |
|