Seth Alves
00fd7208b5
Merge branch 'master' of github.com:highfidelity/hifi into box-stacking-1
2015-05-01 10:22:19 -07:00
Seth Alves
ef4e271732
Merge pull request #4739 from ericrius1/mouseGrab
...
refactored grab script using velocity and spring force, and added lotsoblocks.js to quickly generate lots of physical blocks
2015-05-01 10:07:25 -07:00
Eric Levin
3ee111d757
added script to generate a lot of physical blocks within a specified range
2015-05-01 09:56:21 -07:00
Eric Levin
cac5fa1371
refactored grab script using velocity and spring force
2015-05-01 09:39:39 -07:00
Seth Alves
7ad6cf5c8f
Merge branch 'master' of github.com:highfidelity/hifi into box-stacking
2015-05-01 09:19:37 -07:00
Philip Rosedale
dc9e5cad24
Merge pull request #4729 from ericrius1/mouseGrab
...
can now fling up and down as well as in xz plane
2015-04-30 20:15:11 -07:00
Philip Rosedale
0322e64a79
Merge pull request #4718 from ctrlaltdavid/20513
...
CR for 20513 - Adapt DDE control of eyes to be predominantly open or closed
2015-04-30 20:13:59 -07:00
Brad Hefta-Gaub
3477bc5323
Merge pull request #4732 from sethalves/json-skip-default-values
...
Json skip default values
2015-04-30 17:56:24 -07:00
David Rowe
e45ecbe2c8
Merge branch 'master' into 20513
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
interface/src/devices/DdeFaceTracker.h
2015-04-30 17:22:35 -07:00
Eric Levin
4c80633a41
fixed bug where non-script related content would be deleted on script ending
2015-04-30 16:42:32 -07:00
Seth Alves
3c24d42d93
improve display of box and model entities when in simulator-id debug mode
2015-04-30 14:17:20 -07:00
Philip Rosedale
d16b9ebc7a
Merge pull request #4730 from ctrlaltdavid/20520
...
CR for 20520 - Velocity filter DDE eyebrows
2015-04-30 13:45:33 -07:00
Seth Alves
5d5624053f
drow boxes as aabox when we are the simulator
2015-04-30 13:15:55 -07:00
David Rowe
807eab9fc4
Fix typo
2015-04-30 12:59:09 -07:00
Eric Levin
a9c5f044c8
changed grab script so user can only grab with left mouse click and we update velocityof grabbed object every frame instead of flinging it onb release
2015-04-30 11:39:27 -07:00
Seth Alves
a0ad7a22a6
Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values
2015-04-30 11:28:33 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
David Rowe
b6890be73d
Adjust eyebrow filter strength
2015-04-30 08:06:46 -07:00
David Rowe
42a4fd8884
Add velocity filtering of DDE eyebrows
2015-04-30 07:55:02 -07:00
Eric Levin
45ba678686
can now fling up and down as well as in xz plane
2015-04-29 23:40:53 -07:00
Philip Rosedale
5458ccd445
Merge pull request #4728 from ericrius1/mouseGrab
...
fixed bug in grab.js where drop line overlay was not showing in correct ...
2015-04-29 22:24:36 -07:00
David Rowe
81e23eab28
Coding standard
2015-04-29 22:15:49 -07:00
Eric Levin
2b9ec8b6bf
fixed bug in grab.js where drop line overlay was not showing in correct position on first grab
2015-04-29 22:13:26 -07:00
Brad Hefta-Gaub
40d2e97d44
Merge pull request #4673 from ctrlaltdavid/20496
...
CR for 20496 - Modify lobby.js to work as avatar selector
2015-04-29 21:51:08 -07:00
Brad Hefta-Gaub
f093c9e535
Merge pull request #4727 from huffman/edit-speedup
...
Update edit.js to buffer mouseMove events
2015-04-29 21:46:27 -07:00
Brad Hefta-Gaub
74c569ec10
Merge pull request #4726 from sethalves/assignment-client-exits
...
assignment-clients exit cleanly when they receive sigterm
2015-04-29 21:46:11 -07:00
Seth Alves
09eea83461
don't give timers owners while also keeping track of them in as class instance variables
2015-04-29 19:18:58 -07:00
Ryan Huffman
0d2991b9b0
Update edit.js to buffer mouseMove events
...
This helps keep events from getting backed up on the event queue by
handling move events in the update() loop and dropping extra move events
that might come before an update.
2015-04-29 16:24:36 -07:00
Seth Alves
3c2894adb3
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 15:59:53 -07:00
Seth Alves
b041fd1b7f
AssignmentClientMonitor now waits() on children
2015-04-29 15:58:56 -07:00
Seth Alves
69766f6e59
cleanups
2015-04-29 15:34:31 -07:00
Seth Alves
e985f56b12
cleanups
2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71
all 4 types of assignment-client appear to exit cleanly, now
2015-04-29 15:16:00 -07:00
Philip Rosedale
5e76e01b20
Merge pull request #4723 from ericrius1/mouseGrab
...
added grab.js script, which allows users to grab and fling physical obje...
2015-04-29 15:10:43 -07:00
Seth Alves
e7d8bccd5d
cleanups
2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405
types 0 and 1 exit cleanly, type 6 crashes
2015-04-29 11:56:45 -07:00
Andrew Meadows
5a388a0c14
Merge pull request #4722 from birarda/avatar-mixer-debug
...
add option to display AvatarData receive stats with display name
2015-04-29 10:00:24 -07:00
Stephen Birarda
e933ab2e84
update win required version of OpenSSL
2015-04-29 09:59:20 -07:00
Stephen Birarda
36a26ad416
update BUILD.md for new OpenSSL req
2015-04-29 09:58:54 -07:00
Eric Levin
489fbaac57
added grab.js to defaultScripts.js
2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d
added grab.js script, which allows users to grab and fling physical objects
2015-04-29 09:44:22 -07:00
Stephen Birarda
61b4025526
remove the uneeded curly braces for default ctor
2015-04-29 09:33:23 -07:00
Seth Alves
b2e99b754f
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 08:23:27 -07:00
Brad Hefta-Gaub
7414201845
Merge pull request #4721 from ctrlaltdavid/20514
...
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
Brad Hefta-Gaub
b422ffe528
Merge pull request #4719 from ericrius1/avatarRange
...
Added ability to check if an avatar is within specified range of a posit...
2015-04-28 20:39:03 -07:00
Seth Alves
02fd9987c7
rework audio mixer so it can exit cleanly
2015-04-28 18:38:41 -07:00
Stephen Birarda
1995fa6a5e
fix return value comment in SimpleMovingAverage
2015-04-28 18:28:12 -07:00
Stephen Birarda
c52426385d
code review comments for #4713
2015-04-28 18:28:05 -07:00
Stephen Birarda
f9a25d7089
add Menu option to toggle Avatar receive stats
2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0
show avatar data receive rate by default with display name
2015-04-28 18:27:42 -07:00
