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
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
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
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
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
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
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
Philip Rosedale
26e5f1ca48
Merge pull request #5842 from SeijiEmery/platform-js
...
Platform.js
2015-09-21 14:28:34 -07:00
Seth Alves
cee296e70c
keep object from rotating during local grab
2015-09-21 13:50:42 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
James B. Pollack
71e668470f
Merge remote-tracking branch 'highfidelity/master' into flashlight_updates_1
2015-09-21 13:23:38 -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
David Rowe
52f6fe1d04
Clear entity list when you change domains
2015-09-21 09:59:00 -07:00
Brad Hefta-Gaub
ec87502f49
Merge pull request #5840 from jherico/bart
...
Instanced rendering for Box entities
2015-09-18 18:06:25 -07:00
Brad Hefta-Gaub
213cc25c75
Merge pull request #5856 from sethalves/hand-controller-adjustment
...
fix releaseGrab in test script
2015-09-18 17:52:12 -07:00
Seth Alves
fd1c8f6389
fix releaseGrab in test script
2015-09-18 17:39:50 -07:00
Philip Rosedale
aebadb1ab9
Merge pull request #5854 from sethalves/hand-controller-adjustment
...
tone down distance throwing
2015-09-18 17:20:22 -07:00
Seth Alves
cfde86a7ea
tone down distance throwing
2015-09-18 17:07:10 -07:00
David Rowe
60ba6e174f
Typo
2015-09-18 16:44:20 -07:00
David Rowe
812ab9b7c6
Merge branch 'master' into 20681
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-09-18 16:44:04 -07:00
Philip Rosedale
bbc1c551eb
Merge pull request #5853 from sethalves/hand-controller-adjustment
...
fix when releaseGrab is called
2015-09-18 16:30:01 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
Seth Alves
236831d385
fix when releaseGrab is called
2015-09-18 16:28:15 -07:00
Philip Rosedale
928a74a306
Merge pull request #5852 from sethalves/hand-controller-adjustment
...
Hand controller adjustment
2015-09-18 16:21:12 -07:00
Seth Alves
5db3af3f4c
formatting
2015-09-18 15:58:47 -07:00
Seth Alves
5367de35c1
fix distance-grab throwing
2015-09-18 15:45:36 -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
Eric Levin
35e38a443c
Merge pull request #5849 from sethalves/hand-controller-adjustment
...
Hand controller adjustment
2015-09-18 15:22:29 -07:00
