Commit graph

23437 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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