Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 17:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18710 commits 25 branches 0 tags 1.1 GiB
Commit graph

1259 commits

Author SHA1 Message Date
Atlante45
11a5358a6e Adapted radio.js to new funciton calls 2014-09-25 18:12:30 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
DaveDubUK
80aa5e45f8 Update to walk.js 1.006b 
Update to walk.js 1.006b
 2014-09-25 11:51:11 +07:00
Atlante45
2766b6a4d7 Make radio show up in front of you 2014-09-24 17:12:49 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Atlante45
af341247af Recorder.js UI + pause and slider bar implementation 2014-09-23 14:29:00 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Atlante45
fb982870c6 Added passive play bar to Recorder.js 2014-09-23 11:51:19 -07:00
Atlante45
33236b6c40 Removed extra space 2014-09-23 11:02:25 -07:00
Andrew Meadows
57dd9fba28 adding move.js, removing swissArmyJetpack.js 2014-09-19 16:55:04 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master 
final tweaks to movement script
 2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00
AndrewMeadows
2a5ec89e3b Merge pull request #3460 from PhilipRosedale/master 
Added JS support for neck position for headMove script
 2014-09-19 09:04:12 -07:00
Philip Rosedale
c6d6c347cd head move using neck measurement for movement rather than head. 2014-09-19 08:48:55 -07:00
Craig Hansen-Sturm
255d9346bb Merge pull request #3459 from Atlante45/JS_hook_for_recordings 
Added JS hooks for new Player options
 2014-09-18 17:13:07 -07:00
Atlante45
3ba178022e Added new options to ControlledAC.js 2014-09-18 17:02:11 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Atlante45
b58c5f75dd Fixes 0 makes a voxel when tool off 2014-09-18 16:24:23 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
881ca61a09 Modified recordings namefilter 2014-09-18 00:30:07 -07:00
Andrew Meadows
b311333ac3 initial tuning of headMove.js for avatar motor 2014-09-17 22:35:39 -07:00
Andrew Meadows
613b270d24 headMove.js using experimental avatar motor 2014-09-17 17:57:50 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Craig Hansen-Sturm
896cb70ff6 Merge pull request #3424 from PhilipRosedale/master 
Fixes to audio attenuation jumps and better sample loop script
 2014-09-16 12:00:36 -07:00
David Rowe
ed2216d100 Apply right hand roll work-around only if Windows 2014-09-16 11:13:42 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
Philip Rosedale
62b21f52af fix for sharp change in attenuation when too near a source 2014-09-16 01:18:42 -07:00
David Rowe
f890ea744b Add calibration of physical hand height 2014-09-15 23:09:00 -07:00
David Rowe
f1d7ab149f Add calibration of "zero" position according to avatar body 2014-09-15 21:25:50 -07:00
Philip Rosedale
af638a9963 Use dimensions, not radius 2014-09-15 20:55:25 -07:00
David Rowe
543e9e3eb5 Access wrist controller rotation only once per frame 2014-09-15 20:22:53 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Philip Rosedale
ca556d7eb3 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-15 20:00:49 -07:00
Philip Rosedale
4dc929eddb Simpler script with sphere to indicate emission point 2014-09-15 19:50:38 -07:00
Brad Hefta-Gaub
cb1c8a9bb2 Merge pull request #3417 from thoys/load-script-from-message-example-js 
load a javascript from a message when the user agrees
 2014-09-15 18:33:14 -07:00
Atlante45
9bed37c86c Update position of audio 2014-09-15 16:05:26 -07:00
Atlante45
f3e2507ed3 Merge branch 'master' of https://github.com/highfidelity/hifi into radio_js 2014-09-15 15:54:31 -07:00
Thijs Wenker
6feb732467 load a javascript from a message when the user agrees 2014-09-15 21:30:19 +02:00
David Rowe
1527c40e1d Add hand roll, pitch, and yaw 2014-09-14 15:25:02 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
David Rowe
4382b62613 Add TODO for reviewing Leap Motion right hand roll calculation 2014-09-14 14:02:03 -07:00
David Rowe
1b48d5c040 Add hand pitch, roll, and yaw from Leap Motion 2014-09-14 13:47:15 -07:00
David Rowe
1f159a5ce5 Refactor w.r.t. hands 2014-09-14 13:47:13 -07:00
David Rowe
c7b34b4f54 Lower left and right hands independently when no longer being tracked 2014-09-14 13:47:13 -07:00
David Rowe
b4592aceb6 Add interim work-around and TODOs for Leap Motion controller issues 2014-09-14 13:47:12 -07:00
David Rowe
16eca79cfa Add leapHands.js that makes avatar fingers mirror real finger movements 2014-09-14 13:47:11 -07:00
Thijs Wenker
df0cbd54fc Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 23:04:05 +02:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities 
New Entities Features
 2014-09-12 13:57:45 -07:00
Thijs Wenker
1838272d73 moved back butterflies.js , did I do it right? 2014-09-12 22:53:53 +02:00
Brad Hefta-Gaub
fc33de28a0 Merge pull request #3399 from huffman/19831 
Code Review for Job #19831
 2014-09-12 13:45:20 -07:00
Ryan Huffman
113e9cf43b Remove use of Quat::rotate 2014-09-12 13:31:07 -07:00
Thijs Wenker
dd47b7afc6 Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
 2014-09-12 22:04:21 +02:00
Brad Hefta-Gaub
16d4563af0 Merge pull request #3383 from Adrianl3d/19977 
Code Review for Job #19977
 2014-09-12 12:53:28 -07:00
ZappoMan
16f9d60df7 upgrade butterflies to use dimensions 2014-09-12 08:34:02 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
Thijs Wenker
e62380a171 globalServicesExample.js 2014-09-12 02:23:25 +02:00
Ryan Huffman
ffa47b1923 Add header comment to gracefulControls.js 2014-09-11 15:22:04 -07:00
Ryan Huffman
50090c62f2 Update MAX_SPEED and ACCELERATION in gracefulControls.js 2014-09-11 15:16:42 -07:00
Philip Rosedale
5c77040235 remove debug print 2014-09-11 12:15:02 -07:00
Ryan Huffman
a733b13118 Fix vertical movement on gracefulControls.js 2014-09-11 11:34:47 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
Philip Rosedale
634bfe5e1d remove renamed script 2014-09-10 19:02:22 -07:00
Philip Rosedale
0078b45a8f update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script 2014-09-10 19:00:24 -07:00
ZappoMan
0d80c32306 editModels debug cleanup 2014-09-10 14:51:58 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
d4dad8f4d8 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-10 10:45:57 -07:00
DaveDubUK
5524270613 walk.js script for https://worklist.net/19970 
walk.js script for https://worklist.net/19970
 2014-09-10 23:57:10 +07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
ZappoMan
fd59f58989 added script property to EntityProperties setting/getting and scripting 2014-09-09 20:18:01 -07:00
ZappoMan
a7fda032d1 added reset dimensions support to editModels.js 2014-09-09 17:46:31 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
AndrewMeadows
c815ee53c9 Merge pull request #3379 from ctrlaltdavid/20018 
Code Review for Job #20018
 2014-09-09 12:01:52 -07:00
Adrianl3d
4e639fcab7 Bot script with user definable waypoints 
Worklist job to change from random roaming to definable waypoints.
 2014-09-09 11:45:12 +10:00
Atlante45
da740e8a88 First cut at radio.js 2014-09-08 15:31:53 -07:00
Philip Rosedale
0b02376594 Add head-driven movement to default scripts 2014-09-08 11:39:04 -07:00
Philip Rosedale
2b87296cde Merge branch 'master' of https://github.com/worklist/hifi 2014-09-08 11:38:02 -07:00
David Rowe
999fac785a Add and use Leap Motion controller releasing at script ending 2014-09-08 11:34:41 -07:00
Philip Rosedale
5b88e47810 Head movement and hydra/hand movement separated to headMove.js and hydraMove.js 2014-09-08 11:31:39 -07:00
Chris Collins
a824712ee6 Changed list model icon 
Changed list-model.svg icon to be consistent with the other icons
 2014-09-08 10:55:45 -07:00
ZappoMan
293fc56a66 use load instead of include for default scripts since Script.load() now works better 2014-09-06 15:38:01 -07:00
Ryan Huffman
50c8b964e7 Update gracefulControls.js braking behavior 2014-09-05 11:55:31 -07:00
Ryan Huffman
5bde350ca6 Update gracefulControls.js to work correctly with multiple monitors 2014-09-05 11:51:05 -07:00
Ryan Huffman
9f977ecebd Fix gracefulControls not resetting movement when enabled 2014-09-05 11:42:38 -07:00
Ryan Huffman
4aecb4b5eb Reenable disabling of update in gracefulControls.js 2014-09-05 11:37:57 -07:00
Ryan Huffman
6d29ef0f41 Add brake to gracefulMovement.js 2014-09-05 10:45:22 -07:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
Brad Hefta-Gaub
c4baf86f9d Merge pull request #3351 from Atlante45/rec_file_format_tweaks 
New Recorder/ControlACs UI
 2014-09-04 23:09:42 -07:00
ZappoMan
e4deb59892 fix sphere colors 2014-09-04 15:00:52 -07:00
Atlante45
d7e135c831 Changed 2 icons 2014-09-04 14:58:30 -07:00
Atlante45
d2ba1ea769 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-04 14:36:14 -07:00
ZappoMan
ac45a56bf9 tweaks to butterflies, animation, plus reformatting to match coding standard 2014-09-04 11:40:32 -07:00
Atlante45
c0a7334010 Fixed flipped icons 2014-09-04 11:34:02 -07:00
Atlante45
ef51782f92 New ControlACs UI 2014-09-03 20:32:18 -07:00
Atlante45
417393c22e New Recorder UI 2014-09-03 20:31:57 -07:00
Atlante45
18fdb340c1 extended toolBars.js 2014-09-03 20:30:15 -07:00
ZappoMan
68d2be97f7 formatting fixes 2014-09-03 19:46:33 -07:00
ZappoMan
be7a03b97e flock of butterflies as entities 2014-09-03 19:41:53 -07:00
ZappoMan
31716697c0 new example script 2014-09-03 18:35:09 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
5b8be780a7 add color to sphere property editor 2014-09-03 18:03:00 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Atlante45
5c88485eb9 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-02 13:58:05 -07:00
Clément Brisset
54315e26a8 Merge pull request #3334 from ctrlaltdavid/19992 
Code Review for Job #19992
 2014-09-02 13:11:53 -07:00
Atlante45
049e0d763d Added ControlACs script 2014-09-02 12:57:19 -07:00
Atlante45
61467f7f3d Added ControlledAC script 2014-09-02 12:56:51 -07:00
Atlante45
872ec21822 Added removeLastTool() to toolBar.js 2014-09-02 12:55:15 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
Thijs Wenker
1c41734569 Avatar.setLoop is now Avatar.setPlayerLoop 2014-08-30 15:50:20 +02:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
ZappoMan
ad9ce2edd3 delete moving entities that travel outside of domain 2014-08-28 21:34:12 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
David Rowe
518fa7936c Increase model uploader menu width to accommodate large fonts 2014-08-28 17:25:35 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
Atlante45
1a131b0e29 Removed some debug + fixed some checks 2014-08-28 11:50:18 -07:00
Atlante45
a6bf9d7b90 Handle URL recordings + some safety checks 2014-08-28 11:42:39 -07:00
Atlante45
691ace7cc6 Looping option 2014-08-27 19:05:39 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
Atlante45
b1ca1e9840 Script to play recording on ACs 2014-08-26 18:24:09 -07:00
Atlante45
41461cd322 Added option to playback from current location 2014-08-26 17:23:50 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
ZappoMan
d5fa23bcdf fix bug in editModels.js related to newly named rotation property 2014-08-26 13:07:33 -07:00
Brad Hefta-Gaub
a51cace167 Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain 
fix sitting points on domain switch
 2014-08-25 18:42:19 -07:00
Atlante45
1acce5c725 fix sitting points on domain switch 2014-08-25 18:02:30 -07:00
Clément Brisset
91946e048f Merge pull request #3318 from ctrlaltdavid/19915 
Code Review for Job #19915
 2014-08-25 16:49:02 -07:00
Craig Hansen-Sturm
4f346bfe62 addresses more coding-standard spacing issues 2014-08-25 13:07:52 -07:00
ZappoMan
314e299ba5 get sit points working 2014-08-25 13:03:38 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Craig Hansen-Sturm
fd5e3d61dc minor cleanup of playSoundOrbit.js + playSound.js 2014-08-25 10:55:11 -07:00
Craig Hansen-Sturm
848144d98c Merge remote-tracking branch 'upstream/master' 2014-08-24 22:17:30 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
David Rowe
761387854d Extrude per mouse movement in voxel space instead of screen space 2014-08-22 10:09:10 -07:00
David Rowe
c8ac5f584a Convert to vector maths 2014-08-22 09:29:08 -07:00
AndrewMeadows
ff9f079704 Merge pull request #3308 from Atlante45/record_feature 
Record feature Scripted UI
 2014-08-21 09:56:02 -07:00
Atlante45
022109a249 Added timestamps to the scripted UI 2014-08-20 19:36:56 -07:00
Atlante45
56f7f88d75 Changed icon URLs to the right ones 2014-08-20 18:17:38 -07:00
Atlante45
8f9a322318 Recording UI 2014-08-20 18:04:17 -07:00
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
Atlante45
e3ab6476ca Recorder.js first draft 2014-08-20 15:21:18 -07:00
Clément Brisset
c76afe7d4a Merge pull request #3298 from PhilipRosedale/master 
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
 2014-08-20 10:16:25 -07:00
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864 
Code Review for Job #19864
 2014-08-19 20:48:30 -07:00
Thijs Wenker
415e58c8bd Frisbee script 2014-08-20 02:19:53 +02:00
Philip Rosedale
95e0d5928e Merge branch 'master' of https://github.com/worklist/hifi 2014-08-19 16:40:04 -07:00
Philip Rosedale
d685e5c8b9 Added roll strafe, pitch ascend, more tuning movement 2014-08-19 16:05:01 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 
Conflicts:
	interface/CMakeLists.txt
 2014-08-19 11:59:53 -07:00
Clément Brisset
8de49c9a87 Merge pull request #3299 from ctrlaltdavid/19840 
Ignore empty "embedded" textures
 2014-08-19 10:36:17 -07:00
David Rowe
1a80bd98f0 Ignore empty "embedded" textures 
Blender 2.71 exporter "embeds" external textures as empty binary blobs
 2014-08-19 10:25:18 -07:00
Philip Rosedale
51922d68ab dead zones 2014-08-18 23:42:42 -07:00
Philip Rosedale
7b86f668a6 Add SPACE to scripting JS, change reset to apostrophe 2014-08-18 23:22:55 -07:00
Philip Rosedale
8d2433382a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-18 21:32:48 -07:00
Philip Rosedale
39b370979c JS calls for head motion/rotation that allow avatar flying with head movement 2014-08-18 21:32:40 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
AndrewMeadows
86aa9a1dcf Merge pull request #3289 from ctrlaltdavid/19840 
Code Review for Job #19840
 2014-08-18 15:05:26 -07:00
Ryan Huffman
02b3d130b0 Clean up gracefulControls.js 2014-08-14 23:08:21 -07:00
Ryan Huffman
3b60621e78 Fix vertical drag in gracefulControls.js 2014-08-14 23:08:07 -07:00
Ryan Huffman
a685bbe541 Fix bug with gracefulControls.js not enabling 2014-08-14 22:56:36 -07:00
Ryan Huffman
b03c984296 Update keys for gracefulControls.js and a few other minor changes 2014-08-14 22:38:04 -07:00
Ryan Huffman
7d11994cce Add cursor hiding to gracefulControls.js 2014-08-14 22:37:23 -07:00
David Rowe
f7addad5ac Update progress background image to use copy on S3 2014-08-14 17:20:00 -07:00
David Rowe
29f4f5b21a Support FBX files with embedded textures 2014-08-14 11:18:10 -07:00
David Rowe
8c913fe8c1 Add progress dialog and ability to cancel during the model upload 2014-08-13 10:23:59 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840 
Resolved conflicts in editModels.js
 2014-08-11 20:59:37 -07:00
Ryan Huffman
6437ca1b50 Update commands for speechControl.js 2014-08-11 16:52:06 -07:00
ZappoMan
779d846f1e add gravity to the editModels property 2014-08-11 13:27:19 -07:00
David Rowe
53602c2ef2 Miscellaneous tidying 2014-08-11 10:55:31 -07:00
David Rowe
0b979d2e1e Disabled SVO model uploading: server doesn't support SVO file uploads 2014-08-11 10:54:46 -07:00
David Rowe
f12973d5d0 Cater for multiple mapping values 2014-08-11 10:12:47 -07:00
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
Ryan Huffman
c5f672e4af Add gracefulControls.js 2014-08-09 23:31:28 -07:00
David Rowe
9a21f1c355 Fix FST file reading and writing 2014-08-08 21:51:14 -07:00
David Rowe
54ea86d6be Fix texture directory display and validation 2014-08-08 20:40:15 -07:00
David Rowe
35bc1a03af Simplify model scale to be that specified in FST or 1.0 
No UI
 2014-08-08 17:35:36 -07:00
David Rowe
0f9da8e13f Make mapping writing more robust 2014-08-08 17:34:08 -07:00
David Rowe
198fa47409 Get "naked" FBX model content uploading working 
Include an automatically created FST file in the upload
 2014-08-08 16:38:27 -07:00
ZappoMan
b509eed59a more property work 2014-08-08 16:20:03 -07:00
ZappoMan
8219e6c4af add dampling and velocity to editModels.js 2014-08-08 16:01:15 -07:00
Bennett Goble
46007e2c56 Merge branch 'master' into 19616 2014-08-08 17:38:53 -04:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
David Rowe
c50be5a872 Miscellaneous fixes 2014-08-08 13:43:25 -07:00
David Rowe
5b77274969 Remove animation, pitch, yaw, and roll from Set Model Properties dialog 2014-08-08 13:39:11 -07:00
David Rowe
d1701c12ca Rewrite FST content so that it includes changed and new properties 2014-08-08 13:36:01 -07:00
David Rowe
c82a2003a2 Add prompt asking user whether they want to rez their uploaded model 
A user updating an existing model may not want to rez a new copy.
 2014-08-08 11:14:36 -07:00
David Rowe
7f2d33c4e4 Add in model uploading via API 2014-08-07 15:31:44 -07:00
David Rowe
eaf0b366d0 Update model reading in preparation for API upload 2014-08-07 15:30:27 -07:00
David Rowe
70548976db Fix boundary string format to not include curly braces 2014-08-07 15:27:30 -07:00
ZappoMan
cd4ea4b34f more animation work 2014-08-07 13:13:37 -07:00
ZappoMan
f1d2017a9e getting animation working again 2014-08-07 12:50:02 -07:00
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -07:00
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
Atlante45
a8999d7db7 fix voxel bug 2014-08-06 11:23:48 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
ZappoMan
e9db4fd120 registration of multiple entity types: Model and Box 2014-08-05 12:10:17 -07:00
ZappoMan
273853ef24 more work on virtual entities 2014-08-04 16:18:24 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
Atlante45
74edf6557f turn off editModels by default 2014-08-04 12:05:31 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
wangyix
ad3bbc59f2 added bot_procedural back in 2014-08-04 11:15:42 -07:00
wangyix
d394c203b6 improved re-sync handling of SequenceNumberStats 
removed "duplicate" category since it's not 100% accurate
 2014-08-04 11:09:20 -07:00
Philip Rosedale
321b8de898 Merge pull request #3230 from Barnold1953/rockPaperScissors 
Rock Paper Scissors CA script
 2014-08-03 13:03:11 -07:00
Bennett Goble
b634f8d8c0 Merge branch 'master' into 19616 2014-08-03 14:08:09 -04:00
Bennett Goble
925270e727 clipboardExample.js - Replace voxel feature 2014-08-03 14:06:51 -04:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Ryan Huffman
3e572cdf76 Add SpeechRecognizer to js and speechControl.js 2014-08-01 13:44:40 -07:00
David Rowe
573ce7261b Add proper sending of ArrayBuffers via JavaScript XMLHttpRequest 2014-07-31 19:24:46 -07:00
Ryan Huffman
054e832cf8 Fix misspelled variable names 2014-07-31 11:32:17 -07:00
barnold1953
ab52f384b7 Improvements on RPS script 2014-07-31 11:15:20 -07:00
Ryan Huffman
a670889ffb Remove TODO comment 2014-07-31 10:44:36 -07:00
Ryan Huffman
85ed18fd41 Cleanup editModels.js 2014-07-31 10:43:44 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
barnold1953
2c04963242 Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors 2014-07-31 10:16:35 -07:00
Ryan Huffman
6ecc12cdea Fix export models not cancelling correctly 2014-07-31 01:11:05 -07:00
David Rowe
0c589b73c4 Tidy model data handling 2014-07-30 22:12:11 -07:00
Ryan Huffman
6a53765a47 Rename buttons in editModels.js 2014-07-30 19:06:23 -07:00
Ryan Huffman
06e6505584 Update and add localModels overlay to editModels.js import/export 2014-07-30 18:39:44 -07:00
barnold1953
a65f81c71a Random start position for bot 2014-07-30 18:25:58 -07:00
barnold1953
b6c0b4fd21 Random mood in procedural bot 2014-07-30 17:39:24 -07:00
barnold1953
8bb5c2b84c Small improvements to script, renamed to bot_procedural 2014-07-30 16:59:15 -07:00
barnold1953
66c1aba7f7 Animation improvements, exposed roll/yaw head control. 2014-07-30 15:23:03 -07:00
barnold1953
c4a7c2783c Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-30 15:21:49 -07:00
barnold1953
055a97fc2d Added facial animation to the procedural bot 2014-07-30 14:18:38 -07:00
barnold1953
303f4bf4f1 Improved API, added footstep sounds 2014-07-30 12:08:07 -07:00
barnold1953
1c6834cdd6 Improved the API and cleaned up the code 2014-07-29 17:49:33 -07:00
David Rowe
f39aed37b6 Recode and rescale texture file data before uploading 
A recodeImage() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 17:26:42 -07:00
barnold1953
9be9f1417a Made some API changes for procedural animation 2014-07-29 16:51:57 -07:00
barnold1953
6be62842e3 Added walkWheel for syncinc animation speed, plus other improvements. 2014-07-29 15:45:12 -07:00
Philip Rosedale
fdead9802e Merge pull request #3222 from Atlante45/sit_js_fix 
Sit js fix
 2014-07-29 15:26:51 -07:00
David Rowe
287e3d6800 Compress model and texture file data in multipart/form-data 
A compress() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 13:52:52 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -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
David Rowe
5a5bbfd612 Tidying 2014-07-29 09:46:54 -07:00
David Rowe
edf96b749e Add texture files to multipart/form-data 2014-07-28 23:01:12 -07:00
David Rowe
00abf43fae Add LOD files to multipart/form-data 2014-07-28 22:10:25 -07:00
David Rowe
c7c2f31192 Fix display of scale read from model file 2014-07-28 21:59:44 -07:00
David Rowe
0bb42ba5f2 Fix call stack overflow when preparing large multipart/form-data 2014-07-28 21:55:05 -07:00
David Rowe
63d7ff0bde Tidying 2014-07-28 20:00:23 -07:00
David Rowe
f46c064e88 Speed up model reading 2014-07-28 19:58:53 -07:00
barnold1953
5c47e9013c Working procedural walk animation with two keyframes 2014-07-28 18:36:25 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -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
David Rowe
61bb21cc00 Prepare multipart/form-date message with model file and attributes 2014-07-27 22:05:18 -07:00
David Rowe
f602f42189 Add Cancel button to model editing dialog 2014-07-26 09:22:44 -07:00
David Rowe
fcfaf6a9be Add Set Model Properties dialog for model uploading 2014-07-26 08:49:42 -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
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
David Rowe
7c6f1ff414 Handle FBX file name not found in FST file more gracefully 2014-07-23 17:09:40 -07:00
David Rowe
401326ddd7 Fix FST file processing after ArrayBuffer change 2014-07-23 16:59:52 -07:00
David Rowe
6b72274d21 Read author and texture filenames from text FBX files 2014-07-23 16:05:34 -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
David Rowe
ec8b82bf6e Read author and texture filenames from binary FBX files 2014-07-23 12:27:52 -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
David Rowe
04ddc92de1 Merge branch 'master' into 19840 2014-07-22 20:09:05 -07: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
David Rowe
ef8ce8ad7d Remember location of model file last selected 2014-07-21 21:39:52 -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
David Rowe
f87a83f79e Read mappings from FST file 2014-07-21 12:55:25 -07:00
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -07:00
David Rowe
ab0ec9f474 Read raw data of different model file types 2014-07-20 22:55:07 -07:00
David Rowe
3f24f61180 Provide Content-Type and -Length headers when reading local files 2014-07-20 22:45:19 -07:00
David Rowe
2be03ada9c Prepare for reading and processing model file content 2014-07-20 15:14:48 -07:00
David Rowe
ed1b058cb1 Upload selected model file directly to public folder for starters 2014-07-20 13:55:26 -07:00
David Rowe
33ffed7135 Add GET of local files to JavaScript XMLHttpRequest 2014-07-19 15:47:06 -07:00
David Rowe
6027f4dad1 Add model file selection dialog box 2014-07-19 15:33:54 -07:00
David Rowe
c5faeadd81 Add button menu options for loading model from URL or file 2014-07-19 15:27:41 -07:00
David Rowe
f16eb0fd89 Encapsulate and lint "new model" toolbar 2014-07-19 14:33:48 -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