Stephen Birarda
3744632122
allow SDK fallback if 10.9 not present
2015-09-28 14:37:59 -04:00
Stephen Birarda
06ca4dfbde
fix polyvox double name change command
2015-09-28 14:26:53 -04:00
James B. Pollack
2d477ad3b9
Merge pull request #5908 from highfidelity/imgntn-patch-1
...
[Scripts] Update collectHifiStats.js
2015-09-28 10:21:53 -07:00
Philip Rosedale
0b450e0bee
Merge pull request #5905 from thoys/20694
...
CR for Job #20694 - Add audio packet loss to the stats collection capability
2015-09-28 10:20:15 -07:00
James B. Pollack
b254353b38
Update collectHifiStats.js
...
Clears the current batch after we send it to the endpoint.
2015-09-26 07:09:41 -07:00
Thijs Wenker
14fc39ffa3
Added JS access to the variables
...
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816
Merge pull request #5901 from hyperlogic/tony/gangsta-lean
...
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Howard Stearns
9e001f0b4b
Merge pull request #5903 from AndrewMeadows/ik-repairs-006
...
enforce target rotation during IK calculations
2015-09-25 15:50:59 -07:00
James B. Pollack
a6c3a601ae
Merge pull request #5896 from thoys/20672
...
Worklist job #20672 - Create a script to record a users stats
2015-09-25 15:30:55 -07:00
Andrew Meadows
a97f556958
enforce IK target rotation
2015-09-25 15:13:57 -07:00
Thijs Wenker
5fc053cf97
Merge pull request #1 from imgntn/thoys-20672
...
Update stat collection to occur in batches
2015-09-26 00:04:25 +02:00
James Pollack
2c0c2a0979
Merge remote-tracking branch 'upstream/master' into thoys-20672
2015-09-25 14:49:31 -07:00
Anthony J. Thibault
402573dbf1
Remove unused local
2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63
Merge branch 'master' of https://github.com/worklist/hifi into 20672
2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
Eric Levin
135e2683a6
Merge pull request #5902 from ctrlaltdavid/particles-fixes
...
Particles fixes
2015-09-25 10:56:18 -07:00
James Pollack
1051416ed7
Change stat collection to batch stats together to make fewer network calls
2015-09-25 10:33:16 -07:00
James Pollack
54419301f3
Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672
2015-09-25 10:01:33 -07:00
Andrew Meadows
4f0bd08b62
Merge pull request #5900 from ZappoMan/batchOptimizations
...
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Andrew Meadows
7822d58164
Merge pull request #5870 from howard-stearns/apostrophe
...
Apostrophe key resets animation state.
2015-09-25 08:50:19 -07:00
David Rowe
d233d3f81b
Fix particle emitter corner cases
2015-09-24 19:17:02 -07:00
David Rowe
629128c17f
Fix particle emit directions for point emitter
2015-09-24 19:16:28 -07:00
David Rowe
d063f3488d
Back out fromSpherical code addition
2015-09-24 19:14:26 -07:00
Anthony J. Thibault
474c847ef1
Updated constants and units.
2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39
Threshold based walking while in HMD.
...
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.
While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
James B. Pollack
b2bbaf4e7b
Merge pull request #5899 from ericrius1/grabAPI
...
Fixed a one line bug
2015-09-24 16:52:43 -07:00
Eric Levin
6ea07f1e41
Merge pull request #6 from imgntn/ericrius1-grabAPI
...
re add allTouchedIDs object
2015-09-24 16:39:13 -07:00
James Pollack
fd43956502
re add allTouchedIDs object
2015-09-24 16:35:59 -07:00
Brad Hefta-Gaub
8a8da58dfd
Merge pull request #5898 from kencooke/audio-src
...
Completely remove SOXR from cmake
2015-09-24 15:59:23 -07:00
Brad Hefta-Gaub
c75284ccde
Merge pull request #5891 from imgntn/doll_updates_1
...
[Scripts] Doll Updates
2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub
8fef47a488
Merge pull request #5873 from ericrius1/grabAPI
...
[Scripts] handControllerGrab.js now handles touches. Also handles grabs on non-colliding objects
2015-09-24 15:58:14 -07:00
Brad Hefta-Gaub
be4fda3493
Merge pull request #5882 from imgntn/flashlight_updates_2
...
[Scripts] Flashlight Updates
2015-09-24 15:56:22 -07:00
Eric Levin
a453b7f7cd
Merge pull request #5 from imgntn/ericrius1-grabAPI
...
fix weird multi line thing
2015-09-24 15:36:26 -07:00
Howard Stearns
266c69fc70
Disable the old-school Rig::inverseKinematics during reset.
2015-09-24 15:33:52 -07:00
James Pollack
bc6a0c08f9
Fix merge conflict
2015-09-24 15:29:44 -07:00
James Pollack
8dacd736df
fix weird multi line thing
2015-09-24 15:27:26 -07:00
James Pollack
49d3b7e93b
fix indentation
2015-09-24 15:26:19 -07:00
Ken Cooke
629ee7b0c1
Completely remove SOXR from cmake
2015-09-24 15:12:10 -07:00
Eric Levin
a2dce17683
Merge pull request #3 from imgntn/ericrius1-grabAPI
...
put distant grab inside of conditional
2015-09-24 15:10:49 -07:00
James Pollack
9eb3b56e5d
Remove space before and after function calls, add spaces btw functions
2015-09-24 15:03:02 -07:00
James Pollack
83a8636a36
Remove whitespace, batch entity edits
2015-09-24 14:49:28 -07:00
Howard Stearns
426ccabba7
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-24 14:19:58 -07:00
Howard Stearns
bdbd9ab69e
Merge pull request #5895 from AndrewMeadows/ik-repairs-005
...
allow head translation when using hand IK in 3rd person screenie mode
2015-09-24 14:12:05 -07:00
James Pollack
c1f8cbd1a3
Remove space before function calls, add spaces before functions
2015-09-24 14:07:15 -07:00
James Pollack
b44d090be6
Merge remote-tracking branch 'upstream/master'
2015-09-24 13:34:51 -07:00
Andrew Meadows
59da684eb9
make IKTarget::setType() a one-liner
2015-09-24 13:15:03 -07:00
Thijs Wenker
6d4e4af0a5
ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer
2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
19d30bb08b
Merge pull request #5890 from ctrlaltdavid/20691
...
Orient particles to face camera but not roll with it
2015-09-24 12:49:13 -07:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
