James B. Pollack
b254353b38
Update collectHifiStats.js
...
Clears the current batch after we send it to the endpoint.
2015-09-26 07:09:41 -07:00
James Pollack
2c0c2a0979
Merge remote-tracking branch 'upstream/master' into thoys-20672
2015-09-25 14:49:31 -07:00
James Pollack
1051416ed7
Change stat collection to batch stats together to make fewer network calls
2015-09-25 10:33:16 -07:00
James Pollack
54419301f3
Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672
2015-09-25 10:01:33 -07:00
James B. Pollack
b2bbaf4e7b
Merge pull request #5899 from ericrius1/grabAPI
...
Fixed a one line bug
2015-09-24 16:52:43 -07:00
James Pollack
fd43956502
re add allTouchedIDs object
2015-09-24 16:35:59 -07:00
Brad Hefta-Gaub
c75284ccde
Merge pull request #5891 from imgntn/doll_updates_1
...
[Scripts] Doll Updates
2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub
8fef47a488
Merge pull request #5873 from ericrius1/grabAPI
...
[Scripts] handControllerGrab.js now handles touches. Also handles grabs on non-colliding objects
2015-09-24 15:58:14 -07:00
James Pollack
bc6a0c08f9
Fix merge conflict
2015-09-24 15:29:44 -07:00
James Pollack
8dacd736df
fix weird multi line thing
2015-09-24 15:27:26 -07:00
James Pollack
49d3b7e93b
fix indentation
2015-09-24 15:26:19 -07:00
James Pollack
9eb3b56e5d
Remove space before and after function calls, add spaces btw functions
2015-09-24 15:03:02 -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
Thijs Wenker
6d4e4af0a5
ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer
2015-09-24 22:02:22 +02: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
Brad Hefta-Gaub
d14820d3ef
Merge pull request #5880 from thoys/20668
...
Worklist job #20668 - JS: Add option to listen audio from camera
2015-09-23 20:40:32 -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
37ecd18054
put distant grab inside of conditional
2015-09-23 17:44:28 -07:00
James Pollack
82f178a353
tweaks
2015-09-23 17:43:08 -07:00
James Pollack
381a24951e
Update grab script to handle touching, better naming for non colliding grab functions
2015-09-23 16:56:46 -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
ba44390f79
Rename touch to grab non colliding
2015-09-23 13:20:21 -07:00
James Pollack
9736dee2d7
Merge branch 'grabAPI' of https://github.com/ericrius1/hifi into ericrius1-grabAPI
2015-09-23 13:12:45 -07: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
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -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
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -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
ericrius1
42a2125336
Only asking for needed props
2015-09-22 13:29:54 -07:00
Eric Levin
00e0523872
Merge pull request #5851 from imgntn/flashlight_updates_1
...
Flashlight updates
2015-09-22 13:01:26 -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
ericrius1
b9db495ebf
Modified handControllerGrab script to trigger entity touch events for non-physical entities
2015-09-22 09:38:06 -07:00
Thijs Wenker
4d26eb5258
- added some comments
...
- replaced repetitious code with loop
- fixed the audioListenerModeChanged signal (forgot connect call)
2015-09-22 16:20:58 +02:00
Thijs Wenker
dfb9034b4e
- delete new AudioListenerMode menu on script ending
...
- style fix (function naming)
2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7
- added MyAvatar.audioListenerModeChanged signal , for registering changes.
...
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
2015-09-22 15:38:53 +02:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -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
92152b250a
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 17:37:23 -07:00
James B. Pollack
81358b7f14
wand changes
2015-09-21 17:01:31 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
James B. Pollack
2cb875e40d
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac
start transitioning to new grab methods
2015-09-21 16:45:23 -07:00
