Seth Alves
722dc46f60
Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop
2017-06-27 06:44:31 -07:00
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
Sam Gateau
76dae279cf
Removing the default case from the renderer
2017-06-27 14:24:34 +02:00
Anthony J. Thibault
2814c94582
Hips should no longer waggle when feet are active
2017-06-26 17:43:51 -07:00
Seth Alves
4f672f93d2
avoid cast that isn't always available
2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-26 15:07:22 -07:00
Anthony J. Thibault
8602d57a57
Eliminated to wiggle while pucks are enabled.
...
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -07:00
Ryan Huffman
209a4f33b5
Merge pull request #10784 from huffman/feat/pal-replicated
...
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Seth Alves
2f2a13ec27
Merge pull request #10799 from jherico/object_parent_warnings
...
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Sam Gateau
7687bdc060
less comments & constant
2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980
less comments & constant
2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38
less comments & constant
2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29
less comments & constant
2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d
One less constant
2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c
CLeaning up comments
2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d
Removing commented objects from deferredlighting effect
2017-06-26 14:34:09 +02:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02:00
Sam Gateau
619b357ad0
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-26 10:03:53 +02:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Seth Alves
9ae390853c
Merge pull request #10814 from jherico/linux_fix_static_plugins
...
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
Seth Alves
a09986a865
Merge pull request #10815 from jherico/fix_toolbar_buttons
...
Fix toolbar button mouse click when they were added via the tablet scripting interface
2017-06-25 08:16:41 -07:00
Brad Davis
6b47981c6e
Merge pull request #10813 from sethalves/fix-initialization-order-fiasco
...
fix an initialization order fiasco
2017-06-25 02:57:26 -07:00
Brad Davis
08784ff30c
Fix toolbar button mouse click when they were added via the tablet scripting interface
2017-06-25 02:34:58 -07:00
anshuman64
8d5bdd2d84
Merge pull request #10730 from hyperlogic/feature/pole-vector
...
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07:00
Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
Seth Alves
05f0ec267e
fix an initialization order fiasco
2017-06-24 18:53:00 -07:00
David Rowe
3de1c0a312
Make and save recording
2017-06-24 15:57:57 +12:00
Anthony J. Thibault
b8c638b2b7
warning fixes
2017-06-23 14:36:59 -07:00
Ryan Huffman
86ed61a15d
Push avatar packet version for isReplicated
2017-06-23 14:26:13 -07:00
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
samcake
c0e8b6c8bc
clean up
2017-06-23 14:18:56 -07:00
Anthony J. Thibault
f320610681
opened up shoulder constraint + other fixes
...
* bent elbows will be away from the body a bit more.
* sped up smoothing of pole vectors
2017-06-23 14:06:00 -07:00
samcake
b7b520a6e8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-23 13:50:31 -07:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc
Merge pull request #10804 from jherico/fix_deps_3
...
Remove dependency between codec plugins and UI
2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23
Remove dependency between codec plugins and UI
2017-06-23 12:25:18 -07:00
Anthony J. Thibault
54af6af651
Fix for pole vector stability and knee pole vector computation
2017-06-23 10:38:21 -07:00
Brad Davis
416852c0cd
Fix warnings about creating QObjects with parents in different thread
2017-06-23 10:19:16 -07:00
Brad Davis
341646c780
Fix bad invocation, cleanup signatures
2017-06-23 09:58:27 -07:00
David Kelly
63279f4525
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
...
Command line switch to override default scripts location
2017-06-23 08:53:40 -07:00
David Kelly
7ef50042ba
remove turd
2017-06-23 08:00:18 -07:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
samcake
c24e254257
Add support for profiling from scripts
2017-06-22 18:10:20 -07:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
samcake
bda52c33e6
Adding the function source when profiling, to explore perf issues
2017-06-22 15:35:00 -07:00
Clément Brisset
c47645e075
Merge pull request #10778 from birarda/feat/upstream-in-nodelist
...
add upstream nodes to NL and verify replicated packet sender
2017-06-22 15:16:23 -07:00
David Kelly
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Anthony J. Thibault
79d9bbe6c5
Merge branch 'master' into feature/pole-vector
2017-06-22 13:37:55 -07:00
Brad Hefta-Gaub
7668fbb7a0
Merge pull request #10755 from seefo/fb5278
...
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-22 13:35:05 -07:00
Brad Hefta-Gaub
197006e3d3
Merge pull request #10780 from kencooke/audio-hrtf-avx512
...
HRTF optimizations
2017-06-22 13:34:05 -07:00
Stephen Birarda
8b7eaaa23a
activate the public socket always for upstream/downstream servers
2017-06-22 13:33:57 -07:00
Stephen Birarda
0e0f216aed
cleanup indentation in packet filter
2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d
fix upstream filter check, audio interest set
2017-06-22 13:33:57 -07:00
Stephen Birarda
6da5a63152
verify replicated packets in packet filter
2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee
send upstream nodes down to avatar/audio
2017-06-22 13:33:57 -07:00
seefo
48b5989b60
add upstream nodes to domain nodelist
2017-06-22 13:33:57 -07:00
Stephen Birarda
86b2382f7c
Merge pull request #10785 from birarda/bug/manage-avatar-identity
...
push AvatarData sequence number when managing identity data for agent
2017-06-22 12:02:42 -07:00
Stephen Birarda
ccbae07170
rename _sequenceNumber to _lastSequenceNumber
2017-06-22 11:23:58 -07:00
Stephen Birarda
42cceb02a4
push sequence number when managing identity data for agent
2017-06-22 11:10:43 -07:00
Clément Brisset
48aadb2899
Merge pull request #10775 from 1P-Cusack/21401
...
Adding support for loading obj.gz files in ModelCache.
2017-06-22 11:03:23 -07:00
samcake
96a10d2e95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-22 09:32:49 -07:00
Andrew Meadows
e5602aa7d3
Merge pull request #10773 from Atlante45/fix/refresh-content
...
Fix reload content for baked skyboxes
2017-06-22 08:40:42 -07:00
1P-Cusack
f8c30c70e8
Addressing some feedback. Making the .obj.gz checks more specific and adding an exception if gunzip fails.
2017-06-22 11:21:19 -04:00
Ken Cooke
af0f460659
Fix extra whitespace
2017-06-22 06:38:13 -07:00
Ken Cooke
5d235f8c52
Fix typo
2017-06-22 06:32:32 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900
Implement fingers control
2017-06-22 23:32:06 +12:00
Sam Cake
07e18eb3a8
Keep cleaning up the DeferredLightingEffect , removing stage s from there...
2017-06-22 01:12:32 -07:00
samcake
9ae2861ee6
Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements
2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a
Merge pull request #10729 from druiz17/hand-pucks
...
Hand pucks and Calibration UI
2017-06-21 18:10:15 -07:00
Stephen Birarda
c516dd06e4
Merge pull request #10714 from highfidelity/replicants
...
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
samcake
2919607f86
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 17:20:44 -07:00
Stephen Birarda
aeb3f443f8
address code review comments
2017-06-21 16:14:14 -07:00
1P-Cusack
781e2f409f
Adding support for loading obj.gz files in ModelCache.
2017-06-21 18:50:39 -04:00
Anthony J. Thibault
2dcca2125b
Merge branch 'master' into feature/pole-vector
2017-06-21 15:50:03 -07:00
Atlante45
4a552affe6
Fix reload content for baked skyboxes
2017-06-21 15:19:03 -07:00
Anthony J. Thibault
0f51236fb0
Rig.cpp: take avatar scale into account when computing elbow pole vector
2017-06-21 14:36:42 -07:00
Clément Brisset
4929939501
Merge pull request #10768 from Atlante45/fix/skyboxes
...
Fix skyboxes sometimes not showing
2017-06-21 13:56:42 -07:00
Ken Cooke
38c87b0f08
Fallback code to allow compiling with VS2013
2017-06-21 13:19:46 -07:00
Atlante45
49623fefd8
Fix Skyboxes sometimes not showing
2017-06-21 11:40:32 -07:00
Ken Cooke
afb26df2de
Runtime dispatch for AVX512 optimized HRTF
2017-06-21 11:26:53 -07:00
samcake
56d5f4ec5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 11:25:07 -07:00
Brad Hefta-Gaub
f7d42c782d
Merge pull request #10764 from thoys/feat/ac-location-jsapi
...
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Brad Hefta-Gaub
04d74a715a
Merge pull request #10765 from samcake/brown
...
Adding Profiling for script engine timer callback
2017-06-21 10:13:20 -07:00
Dante Ruiz
f369303bfe
removed warning
2017-06-21 18:12:31 +01:00
Brad Hefta-Gaub
c5845787da
Merge pull request #10759 from jherico/file_cache_shutdown
...
Fix crash when cache entry lifetime exceeds cache lifetime
2017-06-21 10:06:48 -07:00
Ryan Huffman
0e7ddfd29f
Disable silence/ban buttons in PAL if avatar is replicated
2017-06-21 09:49:16 -07:00
Ryan Huffman
8ce1474d9a
Add isReplicated to avatar identity data
2017-06-21 09:48:34 -07:00
Ken Cooke
00c904c927
Detect compiler support for SIMD intrinsics in conditional compilation
2017-06-21 09:34:02 -07:00
Sam Cake
09529f6592
One more refinemnt of the comment
2017-06-21 00:54:04 -07:00
Sam Cake
484aeed589
More comments on the getCOnfig call
2017-06-21 00:36:03 -07:00
Sam Cake
c35be446e6
adding profiling on the script engine call back to timer event
2017-06-21 00:06:45 -07:00
Sam Cake
189ad9c706
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 22:42:40 -07:00
Thijs Wenker
2a4e9cb603
fix local include / headers
2017-06-21 06:38:16 +02:00
Thijs Wenker
47643e1efe
Expose location API to Agent scripts (side-effect, agents now can teleport)
2017-06-21 06:31:36 +02:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
Dante Ruiz
b7286db523
fixed merge conflict
2017-06-21 01:10:54 +01:00
Ken Cooke
1688ad5f0a
HRTF optimized for AVX512
2017-06-20 17:09:38 -07:00
Dante Ruiz
2c3db0fb91
finished calibration-ui
2017-06-21 01:07:12 +01:00
Ken Cooke
b27b09ebc6
Detect support for AVX512 instructions
2017-06-20 16:09:52 -07:00
Ken Cooke
bbfdb0f7eb
Refactor CPU detection to use common subfunctions
2017-06-20 16:06:05 -07:00
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391
Merge pull request #10744 from zzmp/audio/output-sample
...
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
David Kelly
06b59fe13e
still broken, but added initial cut of GLsync stuff
2017-06-20 15:02:05 -07:00
Brad Davis
e3fb42eefd
Fix crash when cache File lifetime exceeds cache lifetime
2017-06-20 14:38:51 -07:00
Zach Pomerantz
c826858458
revamp tablet MicBar
2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
samcake
3727b2af7e
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 10:53:25 -07:00
Seth Alves
428dc81083
Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race
...
ignore remote update younger than recent ownership bid
2017-06-20 10:42:54 -07:00
Sam Cake
5b6f6ab84f
Trying to fix the getCOnfig from QML...
2017-06-20 00:25:51 -07:00
Thijs Wenker
07fefdcb2f
Merge pull request #10748 from samcake/brown
...
Fix the local lights issue
2017-06-20 05:17:18 +02:00
samcake
ba9dbbb4d4
Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...
2017-06-19 17:34:50 -07:00
Zach Pomerantz
497ee3a522
add Audio.inputLevel
2017-06-19 17:07:43 -07:00
Anthony J. Thibault
1979ed7f3a
Disable elbow pole vector if arm/shoulder pucks are enabled
2017-06-19 16:58:11 -07:00
Anthony J. Thibault
c236afe68c
Simplify passing data from MySkeletonModel to Rig
2017-06-19 16:54:39 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
Stephen Birarda
cf9a97cf10
use length sent by AssetServer to verify asset size
2017-06-19 15:15:45 -07:00
Howard Stearns
ddce665613
Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619
...
Spectator Camera - Mergeable Rendering Components
2017-06-19 14:55:43 -07:00
Brad Davis
8aeeab30e7
Merge pull request #10689 from Atlante45/fix/ktx
...
Fix KTX performance problems
2017-06-19 14:44:52 -07:00
David Kelly
b4c75c3f87
working, except tablet issue
2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909
stopgap with MyAvatar.qmlPosition
2017-06-19 14:41:01 -07:00
Zach Fox
cbdffce88e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
2017-06-19 13:53:29 -07:00
Anthony J. Thibault
6bbc5bfbea
formatting on initializers
2017-06-19 13:42:39 -07:00
Dante Ruiz
cfffb74a29
Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks
2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51
Merge pull request #10718 from jherico/frame_thread
...
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
Anthony J. Thibault
3f5aba2655
improved elbow pole vector calculation
...
Also, pole vectors are blended spherical linearly, this might help fast moving
pole vectors from rotating too quickly.
2017-06-19 13:21:12 -07:00
Atlante45
c4c6142935
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx
2017-06-19 11:06:51 -07:00
Atlante45
8d45c4da7c
Fix comments
2017-06-19 11:02:31 -07:00
Stephen Birarda
2933a20a0c
some cleanup for audio/avatar replicated packet checking
2017-06-19 10:45:33 -07:00
Zach Fox
08eb07242d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-19 10:31:31 -07:00
Brad Davis
1d4b443113
Prevent cache ejection of textures in use
2017-06-19 09:51:11 -07:00
samcake
ebc4745df0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 09:27:35 -07:00
Clément Brisset
3262e10d76
Merge pull request #10727 from jherico/file_cache_locking
...
Prevent deadlocks from different locking orders in FileCache
2017-06-17 15:13:47 -07:00
Brad Davis
1632e3b35a
PR feedback
2017-06-16 20:04:23 -07:00
Anthony J. Thibault
81852cd91c
warning fixes
2017-06-16 18:15:41 -07:00
Anthony J. Thibault
323dc62ef2
Merge branch 'master' into feature/pole-vector
2017-06-16 17:37:11 -07:00
Anthony J. Thibault
e7991579ef
Enabled elbow pole vectors
...
There are still some issues with rotations of the elbow pole vectors.
* When the (hand - shoulder) vector approaches the normal vector used in Rig::calculateElbowPoleVector() unexpected twists can occur.
* Also, when the (hand - shoulder) vector approaches zero, the IK system starts to flutter between two states.
* The shoulder twist constraint probably needs to be opened up for more natural range of motion.
2017-06-16 17:29:56 -07:00
Atlante45
d090ac4396
CR
2017-06-16 17:04:57 -07:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Andrew Meadows
b105ad8338
measure linear velocity of tractor position
2017-06-16 16:55:00 -07:00
Dante Ruiz
da29157a3c
fixed merge conflict'
2017-06-17 00:40:50 +01:00
David Kelly
6dd1e6e069
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-16 16:24:30 -07:00
Brad Davis
a675dfe7d2
Prevent deadlocks from different locking orders in FileCache
2017-06-16 15:30:50 -07:00
David Kelly
0f799e52f4
blit entire texture. Only issue is that it is upside down
2017-06-16 15:30:36 -07:00
Zach Fox
7a76c9cf7f
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-16 14:59:23 -07:00
Atlante45
097e75285a
Remove extra profiling
2017-06-16 14:31:56 -07:00
Atlante45
c2650c2b71
Declare KTXDescriptor* metatype
2017-06-16 14:31:56 -07:00
Atlante45
54fc8085f3
Remove pointer to file in NetworkTexture
2017-06-16 14:31:56 -07:00
Atlante45
4d3fc39ab6
Make KTX async tasks thread safe
2017-06-16 14:31:56 -07:00
Atlante45
fb8aa96a57
Add resource processing tracking to KTX
2017-06-16 14:31:56 -07:00
Atlante45
306b55e45d
Synchronous mip loading
2017-06-16 14:31:56 -07:00
Atlante45
57e8d8e1fd
Fix download retries
2017-06-16 14:31:56 -07:00
Atlante45
31d2592e7d
Handle header and high mips in the same callback
2017-06-16 14:31:56 -07:00
Atlante45
d2251bb840
Offload ktx processing to threadpool
2017-06-16 14:31:56 -07:00
Atlante45
3110dd72bf
More ktx work
2017-06-16 14:31:56 -07:00
Atlante45
35a0c41cf5
Move Ktx processing to thread pool.
2017-06-16 14:31:56 -07:00
NeetBhagat
2909aa9ac8
Resolve comments of @zappoman.
...
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
2017-06-17 01:00:32 +05:30
Chris Collins
f160034bf0
Merge pull request #10681 from zzmp/audio/parity
...
Revamp audio device selection
2017-06-16 10:31:55 -07:00
Zach Fox
416ebaa2e8
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-16 10:08:10 -07:00
David Kelly
6d64261e94
working but often the spectator camera texture is not right.
2017-06-16 08:40:18 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Stephen Birarda
c332244f4f
fix race for isUpstream and node hole punch
2017-06-15 17:34:20 -07:00
David Kelly
f75cbfa087
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-15 15:45:03 -07:00
Stephen Birarda
e6ef153148
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants
2017-06-15 15:43:13 -07:00
Zach Fox
130d98fcfc
Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay
...
Ensure monitor never shows frozen SpectatorCamera preview
2017-06-15 15:35:31 -07:00
Anthony J. Thibault
cdfba52488
precondition initial solution before solving to reduce limb locking.
2017-06-15 15:02:42 -07:00
Stephen Birarda
8f154321a4
never process null avatar ID in avatar manager
2017-06-15 14:25:10 -07:00
David Kelly
3d922f5db6
works, sorta, but blinks like crazy, cursor gets f-ed up...
2017-06-15 14:17:43 -07:00
Stephen Birarda
6cf4ff1daf
remove debug and fix peek of session ID
2017-06-15 13:44:44 -07:00
Zach Fox
d7a9354b37
More CR comments; rename function
2017-06-15 13:25:16 -07:00
Andrew Meadows
5e0be1a823
Merge pull request #10662 from ctrlaltdavid/21394
...
Smoothly ease hands from uncontrolled to controlled positions
2017-06-15 13:17:26 -07:00
Zach Fox
1088d248e3
Howard's CR comments
2017-06-15 13:13:58 -07:00
Zach Fox
834a2a5c3b
Ensure monitor never shows frozen SpectatorCamera preview
2017-06-15 12:49:09 -07:00
Zach Pomerantz
3093a73ce1
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-15 15:04:06 -04:00
Zach Fox
47e5fb56d3
Show MyAvatar's head in the SpectatorCamera view!
2017-06-15 11:31:20 -07:00
Zach Fox
60549075dd
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-15 10:09:07 -07:00
ZappoMan
d352163d77
fix no audio device from previously removed audio device
2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f
Merge pull request #10684 from howard-stearns/avatar-whitelist
...
avatar whitelist
2017-06-15 08:45:16 -07:00
Dante Ruiz
d65c0dfbac
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-15 16:24:59 +01:00
Sam Cake
df340a5b55
COmpiling
2017-06-14 22:39:47 -07:00
NeetBhagat
a6b1b17d45
Merge branch 'master' into 21369
2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6
Remove old Leap Motion code
2017-06-15 14:45:40 +12:00
samcake
d8380923f0
Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages
2017-06-14 18:06:42 -07:00
Stephen Birarda
10649c8f6e
change new Node flag to isForcedNeverSilent
2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602
keep downstream nodes around in domain, alive in upstream
2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f
Move downstram server adding to DS
2017-06-14 16:54:04 -07:00
Clément Brisset
72bf879eb2
Merge pull request #10677 from birarda/feat/avatar-mixer-downstream
...
add replication to avatar mixers, fixes for audio
2017-06-14 16:44:56 -07:00
Andrew Meadows
8d19395b0a
ignore remote update younger than recent bid
2017-06-14 16:04:52 -07:00
Atlante45
3f1dfc346d
Merge branch 'fix/node-leak' of github.com:Atlante45/hifi into feat/replicants
2017-06-14 15:12:13 -07:00
Stephen Birarda
ca196f6141
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream
2017-06-14 15:03:26 -07:00
Clément Brisset
44117ac001
Merge pull request #10694 from highfidelity/master
...
Update replicants branch with master
2017-06-14 15:01:22 -07:00
Stephen Birarda
bfa5df778d
remove avatar entity data debug
2017-06-14 14:59:49 -07:00
Stephen Birarda
e3c3831efa
only output sequence number information if debug is requested
2017-06-14 14:56:15 -07:00
Stephen Birarda
5b45beaa39
cleanup some debug from identity packet changes
2017-06-14 14:51:28 -07:00
Stephen Birarda
f2a61fa59d
change incoming/outgoing seq num handling
2017-06-14 14:41:25 -07:00
Zach Fox
f214712b33
Merge pull request #10678 from zfox23/spectatorCamera_improvements1
...
Secondary camera and rendering improvements
2017-06-14 14:39:38 -07:00
Stephen Birarda
ddb6db9f6a
fix repeated pushing of avatar identity seq nums
2017-06-14 14:31:22 -07:00
Stephen Birarda
50b56ec761
don't unpack avatar identity that is old
2017-06-14 14:02:22 -07:00
Zach Fox
6b6b6026a4
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-14 13:44:13 -07:00
howard-stearns
2deb26551f
typos in comments/help-strings
2017-06-14 11:56:47 -07:00
Anthony J. Thibault
fac21033e7
Fixed matthew sitting pose by opening up UpLeg twist constraint to +- 90 degrees.
2017-06-14 11:53:54 -07:00
Atlante45
5777b5e805
Create one packet per node
2017-06-14 11:42:25 -07:00
Atlante45
3cc2396021
CR
2017-06-14 11:42:25 -07:00
Atlante45
a15660993d
Fix comment
2017-06-14 11:42:25 -07:00
Atlante45
61eb93af35
Fix SharedNodePointer leak
2017-06-14 11:42:25 -07:00
Stephen Birarda
c132e29b06
remove conditional seek from InboundAudioStream
2017-06-14 11:42:19 -07:00
Anthony J. Thibault
10f94c2d60
Fixed pole vectors on straight limbs by using reference vector
2017-06-14 11:35:53 -07:00
Stephen Birarda
57cd819307
Merge pull request #10690 from Atlante45/fix/node-leak
...
Fix for Jurisdiction listener
2017-06-14 11:15:17 -07:00
Atlante45
7b62e8854c
Create one packet per node
2017-06-14 10:53:36 -07:00
Zach Fox
ec3b488897
Remove SECONDARY_CAMERA_RENDER_MODE for now
2017-06-14 10:27:08 -07:00
Stephen Birarda
29842c67cc
use received message faking for cleaner replication in audio
2017-06-13 18:04:59 -07:00
Stephen Birarda
9085a0896a
manually activate sockets for downstream servers
2017-06-13 17:19:58 -07:00
Stephen Birarda
76f1a7445e
handle replicated bulk avatar data packets
2017-06-13 17:19:57 -07:00
Ryan Huffman
da3cd59a96
Fix avatar mixer not setting last broadcast time for downstream nodes
2017-06-13 17:19:57 -07:00
Ryan Huffman
52150ad971
Add node data to downstream avatar mixers
2017-06-13 17:19:57 -07:00
Stephen Birarda
dc94f83591
build out bulk avatar data replication
2017-06-13 17:19:57 -07:00
Stephen Birarda
8ce6590f0b
remove ReplicatedAvatarData and immediate replication of identity
2017-06-13 17:19:57 -07:00
Stephen Birarda
44a63ca27e
handle node killed and remove double IDs in kill packets
2017-06-13 17:19:57 -07:00
Atlante45
d0e8612a65
First pass at AvatarMixer replication
2017-06-13 17:19:57 -07:00
Zach Fox
bae27ec209
Merge pull request #10680 from zfox23/ZachRenderingImprovements1
...
Small rendering improvements based on spectator-camera changes
2017-06-13 17:18:43 -07:00
Ryan Huffman
ea56c568a7
Add support for replicating by username
2017-06-13 17:18:28 -07:00
howard-stearns
6271b8ee7c
avatar whitelist
2017-06-13 16:56:18 -07:00
David Rowe
570ec8457d
Refactor
2017-06-14 10:45:30 +12:00
Anthony J. Thibault
03a6f7082e
Merge branch 'master' into feature/pole-vector
2017-06-13 15:37:59 -07:00
Anthony J. Thibault
f20c03fa6e
Pole vectors can be controlled via anim vars.
2017-06-13 15:36:05 -07:00
Zach Fox
79b6dc3f78
Remove one more instance of FramebufferCache
2017-06-13 15:26:07 -07:00
Zach Fox
52ea7e7994
Rendering improvements based on spectator-camera changes
2017-06-13 15:19:29 -07:00
Zach Pomerantz
b24681125d
rm debugging
2017-06-13 18:16:16 -04:00
Zach Pomerantz
9017738a8d
start device check timer
2017-06-13 18:00:41 -04:00
Zach Pomerantz
0e2976620d
start device check timer
2017-06-13 18:00:09 -04:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Fox
0d86d4f0cb
It's working!
2017-06-13 14:30:32 -07:00
Zach Pomerantz
20c0dac8e8
update QML with Audio.muted
2017-06-13 16:10:16 -04:00
Zach Pomerantz
4a39798a97
sticky audio selection
2017-06-13 14:38:52 -04:00
Zach Fox
7b6033f7bc
Getting closer to a solution
2017-06-13 11:37:27 -07:00
Atlante45
a877bf44fb
CR
2017-06-13 11:26:40 -07:00
Chris Collins
90c4d7d666
Merge pull request #10674 from samcake/brown
...
Fix bug in clearFramebuffer with Stencil Buffer
2017-06-13 11:25:06 -07:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Chris Collins
33bf8cc20e
Merge pull request #10672 from howard-stearns/fix-teleport-vs-stuck-in-floor
...
fix teleport vs stuck-in-floor work
2017-06-13 11:13:35 -07:00
Zach Fox
4acbb81413
Checkpoint
2017-06-13 10:22:48 -07:00
Zach Fox
ec162327a2
Merge branch 'spectator-camera' into flash
2017-06-13 10:22:02 -07:00
Zach Fox
7d1a7f4c0b
Merge branch 'master' of https://github.com/highfidelity/hifi into
...
spectator-camera - INCLUDING MERGE CONFLICT FIXES
2017-06-13 09:42:14 -07:00
NeetBhagat
5c324264a2
Complete the functionality of console.trace().
2017-06-13 14:12:29 +05:30
Sam Cake
f4ed635725
Fix bug in clearFramebuffer with Stencil Buffer
2017-06-12 22:59:42 -07:00
