Philip Rosedale
fdead9802e
Merge pull request #3222 from Atlante45/sit_js_fix
...
Sit js fix
2014-07-29 15:26:51 -07:00
Atlante45
0bad10b09c
Add isLoaded to Overlays
2014-07-29 13:25:42 -07:00
Atlante45
f2dbaaf65c
Clean sitting targets when changing domain
2014-07-29 13:13:16 -07:00
Atlante45
6c21c44beb
Bumped up the search radius to 50
2014-07-29 11:52:25 -07:00
Atlante45
56f335bb65
Make sure models are in range before adding them
2014-07-29 11:51:24 -07:00
Atlante45
844e5d7e47
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-07-28 10:11:39 -07:00
Brad Hefta-Gaub
f438ae2ddb
Merge pull request #3215 from Atlante45/master
...
Fix the double entries in models' browsers
2014-07-28 08:51:49 -07:00
Atlante45
1849ec8e07
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting
...
Conflicts:
examples/editVoxels.js
2014-07-25 16:39:39 -07:00
Atlante45
b5dd9141a3
Fix the double entries in models' browsers
2014-07-25 16:12:40 -07:00
Atlante45
f7c675f3e6
CR missing index++
2014-07-25 11:35:25 -07:00
Atlante45
7d64246d43
Made zFightingAdjust a ratio to the distance (currently 4%)
2014-07-25 11:00:03 -07:00
AndrewMeadows
361ec5d1ee
Merge pull request #3204 from Barnold1953/jsBlendShapes
...
Exposed Avatar Blendshape control to JS
2014-07-25 09:40:48 -07:00
Philip Rosedale
9a83be618a
Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine
...
ScriptEngine now inherit from QScriptEngine
2014-07-24 21:38:13 -07:00
barnold1953
ce1b8cdafc
Multicursor editvoxels support
2014-07-24 17:32:41 -07:00
Philip Rosedale
e272d0be75
Merge pull request #3203 from Atlante45/laser_pointer_js
...
Laser pointer js
2014-07-24 17:28:08 -07:00
Atlante45
3ffc116cc5
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
2014-07-24 13:48:23 -07:00
barnold1953
d5ea2de4ea
Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes
2014-07-24 11:32:31 -07:00
barnold1953
3d3b4572e3
Added bot_randomExpression.js to test blendshapes
2014-07-23 17:19:41 -07:00
barnold1953
ba9d896856
Revert "Added FacialAnimationData class"
...
This reverts commit fc9fb11e4f
2014-07-23 15:54:47 -07:00
barnold1953
6aa9e6b736
Revert "Ability to modify AC avatar blendshapes from JS"
...
This reverts commit 512034fd7c
2014-07-23 15:54:40 -07:00
barnold1953
512034fd7c
Ability to modify AC avatar blendshapes from JS
2014-07-23 15:23:27 -07:00
Atlante45
0d039b1cdb
Fixed invokeMethod bug + removed debug
2014-07-23 14:38:37 -07:00
Atlante45
63f0210f1e
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
2014-07-23 14:01:03 -07:00
Atlante45
d4199e6092
Edit properties tweaks
2014-07-23 13:59:21 -07:00
Thijs Wenker
e36891fdf2
removed unused variable
2014-07-23 18:56:34 +02:00
Thijs Wenker
9d5c81bd67
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Andrzej Kapolka
7faf64c54a
Tab fixes.
2014-07-22 14:24:25 -07:00
Andrzej Kapolka
be028c2b01
Fixes for local lights.
2014-07-22 14:13:51 -07:00
barnold1953
fc9fb11e4f
Added FacialAnimationData class
2014-07-22 11:56:19 -07:00
Brad Hefta-Gaub
50e9646f03
Merge pull request #3188 from palomapalmer97/master
...
new voxel scripts
2014-07-21 22:18:44 -07:00
Atlante45
029160a60a
Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js
2014-07-21 14:12:17 -07:00
palomapalmer97
9571098b8b
voxel scripts
...
voxelwall is an 8x8 wall made of voxels that transitions from a bright
red to dark blue
voxelsoundwaves was an array of voxels that was manipulated to resemble
an audio scope that responds to loudness and changes its height
depending on the loudness of the audio that the microphone picks up
2014-07-21 14:10:09 -07:00
Atlante45
91e980f96e
Added laserPointer script
2014-07-18 15:39:47 -07:00
Atlante45
c07ba9fec5
Added browser as a tool
2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843
Added S3 browser
2014-07-17 17:12:54 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
Brad Hefta-Gaub
cc7da35722
Merge pull request #3177 from Barnold1953/OculusSDK
...
Use deltaTIme to ensure sand updates are somewhat uniform
2014-07-16 12:36:52 -07:00
barnold1953
44cf662904
Use deltaTIme to ensure sand updates are somewhat uniform
2014-07-16 12:06:48 -07:00
Brad Hefta-Gaub
8a1484ce68
Merge pull request #3174 from wdings23/fix_new_avatar_light
...
Fix new avatar light
2014-07-16 12:03:21 -07:00
Brad Hefta-Gaub
3dfb5030c5
Merge pull request #3175 from Barnold1953/OculusSDK
...
Two new example scripts
2014-07-16 12:02:37 -07:00
Atlante45
60f242118e
Code cleanup
2014-07-16 11:52:12 -07:00
barnold1953
77b2dd695d
fixed header
2014-07-16 11:34:31 -07:00
Atlante45
f960b4fff3
new windows JS interface
2014-07-16 11:32:18 -07:00
barnold1953
4483c7dc6b
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-16 11:24:32 -07:00
barnold1953
8b911c3e2c
Finished up basic falling sand example script
2014-07-16 11:21:58 -07:00
barnold1953
f6a184fc2b
Bug fixes in fallingSand
2014-07-16 11:10:59 -07:00
TonyPeng
7aae85833b
Take out getter for avatar's hash key.
2014-07-16 10:08:49 -07:00
TonyPeng
90d56bc108
Use the number of local lights to update new avatars instead of checking hashes.
2014-07-15 16:10:13 -07:00
