Commit graph

13223 commits

Author SHA1 Message Date
Stephen Birarda
bf859c0168 remove GnuTLS include across repo 2014-05-20 16:16:23 -07:00
Stephen Birarda
f1581ef823 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 16:16:22 -07:00
Stephen Birarda
9dde480bb2 don't look for GnuTLS from cmake 2014-05-20 16:16:22 -07:00
Stephen Birarda
8fb85110ac add a timer to initiate payment to assigned nodes 2014-05-20 15:59:00 -07:00
Stephen Birarda
072343ce79 associate assignment wallet UUID with node via DomainServerNodeData 2014-05-20 15:50:09 -07:00
Stephen Birarda
13077e48f8 handle types larger than 255 for packetVersionAndHashMatch 2014-05-20 15:45:08 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
ZappoMan
412e870f98 add support for backward compatibility in old versions of models.svo 2014-05-20 15:32:50 -07:00
Stephen Birarda
b42e005cdb add pending assignment purgatory for assignees 2014-05-20 15:28:45 -07:00
Andrzej Kapolka
dd5d3c5591 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 15:23:41 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
ZappoMan
e7425a8128 support for models in root element 2014-05-20 15:20:27 -07:00
barnold1953
2329188939 Stopped windows crash when no audio device is detected 2014-05-20 15:15:45 -07:00
Stephen Birarda
8a1fdf3486 pass wallet UUID from AC to DS, cleanup noisy timer 2014-05-20 14:38:51 -07:00
Mika Impola
061f182fab Initialise lisencing manager after we have enabled Visage. 2014-05-21 00:02:59 +03:00
ZappoMan
1278470a91 properly handle FSTs that have translations and rotations 2014-05-20 13:31:08 -07:00
Brad Hefta-Gaub
899c89eda7 Merge pull request #2885 from birarda/remove-gnutls
remove dependency on GnuTLS for later replacement with OpenSSL
2014-05-20 12:08:14 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
2ef822d19d remove more gnutls includes 2014-05-20 11:26:22 -07:00
Stephen Birarda
f22aaf21d2 remove GnuTLS include across repo 2014-05-20 10:56:34 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00
Andrzej Kapolka
e066d552a0 Added missing unlock that was causing a hang. 2014-05-19 12:48:26 -07:00
Andrzej Kapolka
4f4b4c08bb Restore specular lighting--but, per the OpenGL spec, shut off specular
contribution if the surface isn't facing the light.
2014-05-19 12:29:49 -07:00
Brad Hefta-Gaub
cefa32e445 Merge pull request #2881 from ZappoMan/lockgroundplane
Lock the ground plane model in hq
2014-05-18 20:44:49 -07:00
ZappoMan
b228da34a5 slight DRY 2014-05-18 20:43:27 -07:00
ZappoMan
31ae7ceaff added isLocked() to lock the ground plane in hq 2014-05-18 20:31:55 -07:00
Brad Hefta-Gaub
0c4727d459 Merge pull request #2879 from Atlante45/win_fix_for_included_scripts
Fixes filesystem issue between Qt and Windows
2014-05-18 20:02:45 -07:00
Leonardo Murillo
d8ff7954d5 Merge pull request #2880 from murillodigital/master
CMake find LibOVR
2014-05-18 20:59:44 -06:00
Leonardo Murillo
ee8722bc9f CMake find LibOVR 2014-05-18 20:59:41 -06:00
Brad Hefta-Gaub
c5cfca25a3 Merge pull request #2874 from Atlante45/anchers_apply_rotation_and_scale
Added rotation and scale to overlay anchers
2014-05-18 19:40:28 -07:00
Atlante45
0f19890048 Fixes filesystem issue between Qt and Windows 2014-05-18 19:27:43 -07:00
Leonardo Murillo
5e0a6f80f0 Merge pull request #2878 from murillodigital/master
CMake find LibOVR
2014-05-18 18:43:23 -06:00
Leonardo Murillo
5a7a876697 CMake find LibOVR 2014-05-18 18:43:16 -06:00
Atlante45
2839f5207b Merge branch 'master' of https://github.com/highfidelity/hifi into anchers_apply_rotation_and_scale 2014-05-17 22:08:39 -07:00
Atlante45
7d40790260 Don't compute avatar anchor specs if uneeded 2014-05-17 22:08:28 -07:00
Andrzej Kapolka
914634f73a Merge pull request #2876 from ey6es/master
Fix for stopping scripts on Windows.
2014-05-17 19:10:52 -07:00
Andrzej Kapolka
5ebb2659a4 Fixed initialization order warning. 2014-05-17 19:02:14 -07:00
Andrzej Kapolka
c8f2dae7bd Fix for stopping scripts on Windows. 2014-05-17 18:45:54 -07:00
Mika Impola
cc1bd5d63b Fixed cropping of the image. 2014-05-17 21:24:29 +03:00
Mika Impola
fd3e871242 Updating button position when window is resized. 2014-05-17 21:04:27 +03:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Andrzej Kapolka
86f020dd25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 17:23:10 -07:00
Brad Hefta-Gaub
2c8efa05b7 Merge pull request #2873 from birarda/master
assume use of a Qt build without bearer management
2014-05-16 17:22:55 -07:00
Brad Hefta-Gaub
06a0084269 Merge pull request #2862 from AndrewMeadows/inertia
improved model bounding shapes
2014-05-16 17:22:28 -07:00
Brad Hefta-Gaub
31455e6cb0 Merge pull request #2871 from ey6es/master
Better rotations with alternate IK.
2014-05-16 17:22:09 -07:00
Andrzej Kapolka
1bbd9c326a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 17:20:40 -07:00
Andrzej Kapolka
c99a60ce66 Merge pull request #2872 from ZappoMan/modelserver
Bug Fixes in Models
2014-05-16 17:20:25 -07:00