Commit graph

20865 commits

Author SHA1 Message Date
Zach Fox
0f9c917965 Merge pull request #10853 from samcake/brown
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
2017-06-30 10:05:54 -07:00
Seth Alves
c4667aa1a7 Merge pull request #10839 from vladest/file_dialog_crash_qt59
File dialog crash qt59
2017-06-29 10:34:26 -07:00
Sam Gateau
b766c256db Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-29 10:29:05 +02:00
Thijs Wenker
e781f97ddc Merge pull request #10846 from sethalves/fix-server-scripts-more
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Howard Stearns
3606418a22 Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
minor fix for --scripts switch
2017-06-28 16:11:18 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
David Kelly
48de8011b2 cr feedback 2017-06-28 14:15:29 -07:00
Clément Brisset
a2c15c9794 Merge pull request #10770 from jherico/fix_deps_1
Cleanup entity dependencies
2017-06-28 10:48:58 -07:00
Andrew Meadows
1e23fa7baa Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Vladyslav Stelmakhovskyi
51b44d9021 Implement same for HMD mode 2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0 Cleanup 2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
0d4328fa51 Merge branch 'master' into file_dialog_crash_qt59 2017-06-28 15:54:53 +02:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1 make scripts tree show scripts in directory passed in with --scripts 2017-06-27 18:10:54 -07:00
Vladyslav Stelmakhovskyi
241231c00c file lists works, but not initial yet 2017-06-27 22:14:58 +02:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -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
David Kelly
564d935065 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch 2017-06-26 13:32:02 -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
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Brad Hefta-Gaub
6314a8d273 Merge pull request #10782 from vladest/fix_browse_black
Make background with default color. Fix few warnings
2017-06-26 09:50:09 -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
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
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
Brad Davis
9c99b9d4c5 Merge pull request #10783 from sethalves/fix-linux-asan
Fix linux asan
2017-06-23 22:43:24 -07:00
Seth Alves
43ba5f3772 Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
Fix for eye direction when no look at targets are present.
2017-06-23 14:32:21 -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
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
David Kelly
bda50af780 this uses qt's test location for AppData/Local, but leaves Roaming alone 2017-06-23 11:06:48 -07:00
Anthony J. Thibault
8f89ef0931 Fix for eye direction when no look at targets are present. 2017-06-23 10:52:23 -07:00
Brad Davis
416852c0cd Fix warnings about creating QObjects with parents in different thread 2017-06-23 10:19:16 -07:00
Seth Alves
5e2aeb96d3 Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-23 10:18:33 -07:00
David Kelly
04160f2ca1 switch to change ktx_cache directory (only) 2017-06-23 09:19:41 -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
Seth Alves
5af07dfb62 more memory-debugger 2017-06-23 08:16:48 -07:00
druiz17
91ce9235ea Merge pull request #10747 from zzmp/audio/select-log
Log audio selections
2017-06-23 07:54:03 -07:00
Zach Pomerantz
a82cc0ec09 retab 2017-06-23 09:35:48 -04:00
Brad Davis
d50c448151 Fix heap corruption coming out of running scripts dialog 2017-06-22 19:15:58 -07:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -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
Seth Alves
d290f03edb Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-22 13:53:23 -07:00
Andrew Meadows
62e862fef0 Merge pull request #10733 from Menithal/21384
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
Anthony J. Thibault
79d9bbe6c5 Merge branch 'master' into feature/pole-vector 2017-06-22 13:37:55 -07:00
Seth Alves
517bf0af0f Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan 2017-06-22 10:07:44 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00