Patterntrick 6f19e9f507 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 21210		2017-04-12 10:24:14 -07:00
..
boppo	CR Changes - remove double constructor, use creation function instead	2017-03-22 17:28:10 +01:00
bow	Fix utils.js mergeObjects not checking hasOwnProperty	2016-12-05 08:22:15 -08:00
shortbow	Update shortbow spawning to use precise picking to find the ground	2017-02-24 14:48:22 -08:00
stopwatch	Update stopwatch to use relative paths to models + sounds	2017-02-08 14:27:06 -08:00
teaLight	Add tealight.js entity server script	2017-01-27 11:23:17 -08:00
xylophone	Added copyright header, expanded tabs to spaces	2017-03-28 18:22:22 -07:00