James B. Pollack
|
5ab8f19257
|
fix merge leftovers
|
2015-09-16 16:42:23 -07:00 |
|
James B. Pollack
|
c2d5483da6
|
Merge branch 'bubblewand_hotfix_2' of https://github.com/imgntn/hifi into bubblewand_hotfix_2
|
2015-09-16 16:32:23 -07:00 |
|
James B. Pollack
|
455ed27c2b
|
pre-test with eric
|
2015-09-16 16:26:09 -07:00 |
|
James Pollack
|
37f45b57ff
|
wand updates
|
2015-09-15 18:40:54 -07:00 |
|
James Pollack
|
c3ed2d9064
|
fix file paths
|
2015-09-10 17:10:55 -07:00 |
|
James Pollack
|
387e7b74a9
|
Return wand to its original position if it hasnt moved for 5 seconds, better particles, wand scaled to human size
|
2015-09-10 16:58:39 -07:00 |
|
James Pollack
|
ee7e25a137
|
remove localhost refs
|
2015-09-10 11:49:12 -07:00 |
|
James Pollack
|
5df483b35f
|
ignore 0,0,0 positions so we have accurate unload for bubbles
|
2015-09-10 11:32:21 -07:00 |
|
James Pollack
|
8f77c0b61c
|
Update wand to use relative paths, remove some unused position tracking methods, remove cache busting from model file paths
|
2015-09-10 09:58:31 -07:00 |
|
James Pollack
|
0ac4da285c
|
Update bubblewand to not use overlays by default.
|
2015-09-09 09:48:39 -07:00 |
|
James Pollack
|
66b6d5178f
|
Cleanup wand when createWand.js script ends
|
2015-09-08 17:25:39 -07:00 |
|
James Pollack
|
5684e13400
|
updates for cleaner PR
|
2015-09-04 15:49:12 -07:00 |
|
James B. Pollack
|
a9ad18ec80
|
cleanup, comments, and consolidation.
|
2015-09-03 20:42:56 -07:00 |
|
James Pollack
|
1e9bac8dee
|
add create wand script, add offset to bubble spawn point so that it is at the end of the wand
|
2015-09-03 17:42:41 -07:00 |
|