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 |
|
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 |
|