Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 08:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15636 commits 25 branches 0 tags 1.1 GiB
Commit graph

737 commits

Author SHA1 Message Date
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -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
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -07:00
Atlante45
91e980f96e Added laserPointer script 2014-07-18 15:39:47 -07:00
barnold1953
4410411d9d Script improvements for AC 2014-07-18 14:51:53 -07:00
barnold1953
f6936da68e Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors 2014-07-18 12:06:36 -07:00
barnold1953
814dd0fcb6 Fixed another crash relating to undo stack. Made script support the 
VoxelViewer
 2014-07-18 11:37:13 -07:00
barnold1953
592c571fcb Fixed crash bug in voxelScriptingInterface 2014-07-17 18:15:34 -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
barnold1953
9812381645 Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors 2014-07-17 16:35:17 -07:00
barnold1953
2fea3c58cd Added working rockPaperScissors.js that works for multiple ACs 2014-07-17 15:25: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
ZappoMan
5869039bf3 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 14:26:07 -07:00
barnold1953
b339e9c2af Added getVoxelEnclosingPointBlocking and improved sand script 2014-07-15 11:44:59 -07:00
TonyPeng
4cea4d2838 Resolve upstrem conflict 2014-07-15 10:33:22 -07:00
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Brad Hefta-Gaub
12f8cfbb67 Merge pull request #3167 from Atlante45/typed_arrays 
Typed arrays
 2014-07-15 08:31:02 -07:00
barnold1953
4991bf37a2 Added a brush for the voxel sand script 2014-07-14 17:54:34 -07:00
barnold1953
13960cd645 Basic falling sand script 2014-07-14 16:16:07 -07:00
TonyPeng
afc573b248 Took out debug print 2014-07-14 15:08:29 -07:00
TonyPeng
1aa20dff60 Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager. 2014-07-14 13:59:57 -07:00
Atlante45
afa43a9d7e Fix win build fail 2014-07-14 11:06:10 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) 
Conflicts:
	interface/src/Application.cpp
 2014-07-14 09:10:27 -07:00
Philip Rosedale
2d4194cae5 fixes per review, clap animation requires double-tap to start 2014-07-13 23:33:02 -07:00
Atlante45
6d4bb0f4fd Added Uint8ClampedArray 2014-07-11 18:27:26 -07:00
Atlante45
5a8569fcd5 Handling NaN values for floats 2014-07-11 17:46:07 -07:00
barnold1953
829918e6c0 Added grenadeLauncher.js to examples. Sorry in advance for any damage 2014-07-11 17:23:13 -07:00
Atlante45
75573a4c06 Added exception checking to unit tests 2014-07-11 16:23:50 -07:00
Atlante45
d456adff1d Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-11 12:44:53 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments 
Sitting improvments
 2014-07-11 11:48:42 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
Atlante45
a9ceec4627 Switched sit.js spheres to billboards 2014-07-11 10:50:46 -07:00
Atlante45
2347bd7eed Sitting position persists between sessions 2014-07-11 10:47:48 -07:00
Atlante45
02c951fba5 Added bunch of Typed arrays unit tests 2014-07-10 18:34:17 -07:00
Atlante45
ff378b60ac Added functionnalities to JS UnitTests 2014-07-10 18:33:24 -07:00
ZappoMan
780532bfd8 more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe 2014-07-10 13:42:49 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2014-07-09 16:32:02 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
Stephen Birarda
33e42ae272 Merge pull request #3149 from birarda/master 
add two new concert cameras to examples
 2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008 add two new concert cameras to examples 2014-07-09 15:51:37 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
Atlante45
a76ebae771 Added typed array unit test 2014-07-09 10:28:50 -07:00
Atlante45
49302b2340 Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-09 09:49:34 -07:00
Ryan Huffman
874b542c0c Add import/export/paste model functionality to editModels.js 2014-07-09 04:13:53 -07:00
samcake
3ecaaa5a85 After HIfi visit, Fix skinning from javascript 
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);

- This is not available from the javascript MyAvatar interface yet

- now require LeapMOtion SDK2.0.3 to support arms
 2014-07-08 23:57:37 -07:00
Philip Rosedale
b2912552f6 switched to better sounds for clapping 2014-07-08 21:00:02 -07:00
barnold1953
b5a9f50ae7 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-08 17:15:35 -07:00
Philip Rosedale
40ad03dbf5 Another improvement to clapping to match animation pace with keystrokes 2014-07-08 14:53:41 -07:00
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -07:00
Philip Rosedale
e75b9dc832 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 11:43:45 -07:00
Philip Rosedale
0e117966f7 better clapping 2014-07-08 11:43:06 -07:00
samcake
4302accafd Improve the LeapMotion support 
- fixed a bug on indexing the bones of the hand in the update of the
LEapmotion

- Still struggling with the correct joint assignment in the javascript,
visiting HIFI later today
 2014-07-08 11:37:11 -07:00
TonyPeng
34e973c516 Merge branch 'master' of https://github.com/highfidelity/hifi into light_and_haze 
Merge in from highfidelity.
 2014-07-08 10:37:46 -07:00
TonyPeng
1baa187a66 add javascript example for changing avatar's local lights. 2014-07-08 10:37:42 -07:00
Clément Brisset
4f756c31f2 Merge pull request #3133 from huffman/19819 
Code Review for Job #19819
 2014-07-08 10:07:26 -07:00
Atlante45
05d74e2bb1 Added ArrayBuffer unit tests 2014-07-07 18:59:57 -07:00
samcake
d56ab21192 Clean file formating 
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion

- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
 2014-07-07 09:24:23 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
barnold1953
ba997334ff Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f First pass at laser oculus UI pointer 2014-07-03 16:09:54 -07:00