Brad Hefta-Gaub
|
c75284ccde
|
Merge pull request #5891 from imgntn/doll_updates_1
[Scripts] Doll Updates
|
2015-09-24 15:58:57 -07:00 |
|
James Pollack
|
bc6a0c08f9
|
Fix merge conflict
|
2015-09-24 15:29:44 -07:00 |
|
James Pollack
|
49d3b7e93b
|
fix indentation
|
2015-09-24 15:26:19 -07:00 |
|
James Pollack
|
83a8636a36
|
Remove whitespace, batch entity edits
|
2015-09-24 14:49:28 -07:00 |
|
James Pollack
|
c1f8cbd1a3
|
Remove space before function calls, add spaces before functions
|
2015-09-24 14:07:15 -07:00 |
|
Brad Hefta-Gaub
|
ba73acf3b4
|
Merge pull request #5843 from ctrlaltdavid/20681
Replace point and vector particle emitter with spheroid emitter
|
2015-09-24 08:19:49 -07:00 |
|
James Pollack
|
7efd15c3a2
|
Update doll to stop screaming when released, use only one hand a a time, spatialize audio position
|
2015-09-23 18:01:18 -07:00 |
|
James Pollack
|
82f178a353
|
tweaks
|
2015-09-23 17:43:08 -07:00 |
|
Thijs Wenker
|
6bb873d327
|
createFlashlight.js - Close script after running
Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface
|
2015-09-24 00:43:50 +02:00 |
|
James Pollack
|
6b468ee87b
|
Add the doll
|
2015-09-23 13:10:25 -07:00 |
|
David Rowe
|
eb01ba9812
|
Merge branch 'master' into 20681
|
2015-09-23 09:42:56 -07:00 |
|
Brad Hefta-Gaub
|
3fe4de4511
|
Merge pull request #5751 from imgntn/bubblewand_hotfix_2
Bubble Wand
|
2015-09-22 20:35:58 -07:00 |
|
James Pollack
|
fa1d5be310
|
Reduce volume, JSLint, Coding standards
|
2015-09-22 18:20:23 -07:00 |
|
James Pollack
|
3e3d7a8bfa
|
JS Linting and Coding Standards
|
2015-09-22 18:12:51 -07:00 |
|
James Pollack
|
1e09c2501c
|
This updates the flashlight to have sounds when it turns on and off
|
2015-09-22 14:21:14 -07:00 |
|
James Pollack
|
561b4ca8e1
|
Remove update loop refs, remove unload method
|
2015-09-22 12:52:24 -07:00 |
|
James Pollack
|
e5c42c76a2
|
Remove update loop refs
|
2015-09-22 12:41:00 -07:00 |
|
James Pollack
|
0ad238a508
|
Enlarge flashlight
|
2015-09-22 12:39:48 -07:00 |
|
James B. Pollack
|
bf22d5a942
|
dont delete wand at cleanup from createWand.js
|
2015-09-21 17:43:05 -07:00 |
|
James B. Pollack
|
f8d743aff0
|
Update to use new grab methods, only specifically request properties that we are actually using
|
2015-09-21 17:38:49 -07:00 |
|
James B. Pollack
|
81358b7f14
|
wand changes
|
2015-09-21 17:01:31 -07:00 |
|
James B. Pollack
|
cd6ad306ac
|
start transitioning to new grab methods
|
2015-09-21 16:45:23 -07:00 |
|
James B. Pollack
|
d79c1bec95
|
remove query string
|
2015-09-21 16:13:24 -07:00 |
|
James B. Pollack
|
fd67a2b86f
|
Add on/off by pressure; add point bulb to end of flashlight
|
2015-09-21 16:10:08 -07:00 |
|
James B. Pollack
|
f3eef9322c
|
Remove toybox reference in spawner script
|
2015-09-21 11:10:42 -07:00 |
|
James B. Pollack
|
c2a2abe615
|
Remove nested bubble entities and related code
|
2015-09-21 11:05:51 -07:00 |
|
James B. Pollack
|
ccf125c047
|
Cleanup comments
|
2015-09-18 15:40:39 -07:00 |
|
James B. Pollack
|
c364189bc8
|
Update file header
|
2015-09-18 15:26:34 -07:00 |
|
James B. Pollack
|
dc17985e29
|
Add some logic for turning off the flashlight when squeeze trigger pressure is low, and turning it back on when squeeze pressure goes over certain amount
|
2015-09-18 15:24:44 -07:00 |
|
James B. Pollack
|
a897c17eb2
|
Remove grab-frame and reset position code
|
2015-09-18 14:31:40 -07:00 |
|
James B. Pollack
|
031761fa57
|
added some logging while things were broken
|
2015-09-18 14:27:57 -07:00 |
|
David Rowe
|
68874eed96
|
Update particle scripts
|
2015-09-18 11:34:26 -07:00 |
|
James B. Pollack
|
15ea9219d6
|
collision timeouts
|
2015-09-18 10:41:44 -07:00 |
|
James B. Pollack
|
9a3a87eedf
|
improve velocity calculations for wand
|
2015-09-18 10:03:21 -07:00 |
|
James B. Pollack
|
8a7798fcd7
|
disable bubble particle burst until i know the right for an entity to watch and see if it is deleted.
|
2015-09-17 22:00:44 -07:00 |
|
James B. Pollack
|
5ac084ad4f
|
Randomize bubble gravity, code cleanup
|
2015-09-17 20:57:07 -07:00 |
|
James B. Pollack
|
df0b9e7dbb
|
refactor bubble wand to prevent duplicate bubbles
|
2015-09-17 15:59:19 -07:00 |
|
James B. Pollack
|
75df4e96e8
|
cleanup
|
2015-09-16 18:48:06 -07:00 |
|
James B. Pollack
|
a8fe3b3edd
|
keep the bubble with the wand, make the wand smaller
|
2015-09-16 18:08:56 -07:00 |
|
James B. Pollack
|
9aa2067e3e
|
cleanup unused reset stuff
|
2015-09-16 17:26:18 -07:00 |
|
James B. Pollack
|
e1e567b1b5
|
remove mouth mode
|
2015-09-16 17:09:54 -07:00 |
|
James B. Pollack
|
3e7cc7d6eb
|
remove sounds from bubble
|
2015-09-16 17:02:52 -07:00 |
|
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
|
1cec61ebba
|
fire particles before burst sound
|
2015-09-10 17:05:24 -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 |
|
Sam Gateau
|
3bf0f388eb
|
Make the flashlight grab frame work correctly
|
2015-09-10 15:39:54 -07:00 |
|