Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13058 commits 25 branches 0 tags 1.1 GiB
Commit graph

13058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mohammed Nafees
1714f7fb27 Merge branch master from upstream 2014-05-21 11:29:19 +05:30
Brad Hefta-Gaub
6bb4664611 Merge pull request #2884 from polac/19521 
Code Review for Job #19521
 2014-05-20 17:02:30 -07:00
Brad Hefta-Gaub
a29a9dad70 Merge pull request #2882 from ey6es/master 
Restore specular lighting--but, per the OpenGL spec, shut off specular
 2014-05-20 17:01:32 -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
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
Stephen Birarda
e6fa1c55db assume we are using a Qt build without bearer management 2014-05-16 17:06:17 -07:00
ZappoMan
bb204154a1 tweak 2014-05-16 16:59:58 -07:00
ZappoMan
51ad8194de fix two bugs in models not rendering 2014-05-16 16:55:37 -07:00
ZappoMan
0e446d0fc5 fix two bugs in models not rendering 2014-05-16 16:53:14 -07:00
Andrzej Kapolka
6eaa549f65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 16:26:47 -07:00
Andrzej Kapolka
4a23c0cfd9 Fix for arms' getting twisted up with new IK. 2014-05-16 16:25:24 -07:00
Philip Rosedale
d54ff7a2cf Merge pull request #2869 from huffman/19630 
Code Review for Job #19630
 2014-05-16 16:00:05 -07:00
Stephen Birarda
e5c0d712c4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 15:07:00 -07:00
Philip Rosedale
18251d7251 Merge pull request #2870 from ey6es/priority 
Basic support for joysticks using SDL, shoehorn PrioVR position/joysticks into palm data.
 2014-05-16 14:58:09 -07:00
Andrzej Kapolka
956c5d2eb6 More joystick fixes. 2014-05-16 14:24:49 -07:00
Ryan Huffman
cc952f9cee Reset node bounds overlay text when no nodes are selected 2014-05-16 13:56:28 -07:00
Ryan Huffman
4100e5c64a Merge branch '19630' of github.com:huffman/hifi into 19630 2014-05-16 13:21:44 -07:00
Ryan Huffman
e5d6a66ca9 Use char array instead of QString in NodeBounds 2014-05-16 13:21:10 -07:00
ZappoMan
b7cc97534f Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-16 12:53:41 -07:00
Mohammed Nafees
f23dd0fecf Fix scrolling of log data when Extra Debugging is enabled 2014-05-17 01:17:55 +05:30