Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 21:46:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15135 commits 69 branches 56 tags 1.2 GiB
Commit graph

15135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
4f6a86fc6c tweak to help windows find oculus libraries 2014-07-30 16:15:28 -07:00
Stephen Birarda
d101d321da add a missing closing bracket 2014-07-30 15:32:45 -07:00
Stephen Birarda
4e27738cb1 don't apply udev and xinerama libraries to APPLE 2014-07-30 15:31:47 -07:00
Stephen Birarda
e702738694 only add udev and xinerama on UNIX 2014-07-30 15:31:05 -07:00
Stephen Birarda
f25e8b0b75 add NAMES to find_library commands 2014-07-30 15:28:45 -07:00
Stephen Birarda
4f17902c6b fix set of LIBOVR_LIBRARIES in FindLibOVR module 2014-07-30 15:08:31 -07:00
Leonardo Murillo
da7c46d8d9 Merge pull request #3224 from birarda/master 
remove explicit src dir requirement in OculusManager
 2014-07-30 15:54:16 -06:00
Stephen Birarda
7302af4fec fix bad conditional in LibOVR find module 2014-07-30 14:52:58 -07:00
Stephen Birarda
6275dd68ab Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-30 14:15:22 -07:00
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
Leonardo Murillo
2b9849875a Merge pull request #3223 from birarda/master 
patch to LibOVR find module for 0.4.0
 2014-07-30 15:13:00 -06:00
Stephen Birarda
4d3aafa5df use path suffixes instead of full path in name 2014-07-30 14:07:40 -07:00
Stephen Birarda
d6c0defd98 check in VS2010 subdir to see oculus 0.4.0 library 2014-07-30 14:05:20 -07:00
Philip Rosedale
f0b64c11bc Merge pull request #3221 from lzuwei/add_cara_face_tracker 
Add cara face tracker
 2014-07-29 20:22:21 -07:00
Philip Rosedale
743200a38c Merge pull request #3220 from Atlante45/avatar_simulate_optimisation 
Avatar simulate optimisation
 2014-07-29 20:20:32 -07:00
Zu
1e719f1a88 fixed: restyled code for better readability 2014-07-30 10:04:20 +08:00
Zu
113a173577 fix: update code style to conform to hifi convention 2014-07-30 09:30:55 +08:00
Atlante45
9b3cdacf08 Removed microthreading in favor of lazy computation 2014-07-29 18:28:33 -07:00
Zu
dcd7b81426 Merge branch 'master' into add_cara_face_tracker 2014-07-30 08:45:44 +08:00
Atlante45
8cd59ab5de Forward declaration of RotationExtractor 2014-07-29 16:08:15 -07:00
Atlante45
42ba3ea338 CR lost _transformChanged 2014-07-29 15:59:53 -07:00
Atlante45
7800ffbf2e Make _rotation extraction asynchronous by default in computeTransform 2014-07-29 15:55:47 -07:00
Atlante45
897481d557 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 15:39:35 -07:00
Philip Rosedale
fdead9802e Merge pull request #3222 from Atlante45/sit_js_fix 
Sit js fix
 2014-07-29 15:26:51 -07:00
Atlante45
75dfb87c8e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 13:47:24 -07:00
Atlante45
8354763e36 CR 2014-07-29 13:35:13 -07:00
Atlante45
0bad10b09c Add isLoaded to Overlays 2014-07-29 13:25:42 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
Atlante45
f2dbaaf65c Clean sitting targets when changing domain 2014-07-29 13:13:16 -07:00
Atlante45
6c21c44beb Bumped up the search radius to 50 2014-07-29 11:52:25 -07:00
Atlante45
56f335bb65 Make sure models are in range before adding them 2014-07-29 11:51:24 -07:00
Philip Rosedale
1ba8922f0b Merge pull request #3218 from ey6es/metavoxels 
Various metavoxel improvements relating to threading and VBO-based rendering.
 2014-07-29 09:59:55 -07:00
Zu
4016f8ca44 Merge branch 'master' into add_cara_face_tracker 2014-07-29 12:21:40 +08:00
Zu
cce962fb16 added: smile, surprise, anger to blendshapes 
fix: roll, yaw direction
added: source comments
removed: debug print outs
 2014-07-29 11:07:04 +08:00
Brad Hefta-Gaub
df629b6288 Merge pull request #3219 from anthonye2007/master 
Tweak build docs for Windows 8.1
 2014-07-28 19:44:38 -07:00
Brad Hefta-Gaub
8e1d4eb0a6 Merge pull request #3210 from Atlante45/add_start_stop_animation_for_scripted_avatar 
Add start stop animation for scripted avatar
 2014-07-28 19:43:58 -07:00
Anthony Elliott
c5b824cb4e Merge branch 'master' of https://github.com/anthonye2007/hifi 2014-07-28 19:53:17 -04:00
Anthony Elliott
d4a6556917 Tweak build docs for Win 8.1 2014-07-28 19:52:00 -04:00
Atlante45
6183c4d97e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-28 16:51:09 -07:00
Atlante45
fb670275c2 Don't recompute unchaged transform 2014-07-28 16:42:16 -07:00
Atlante45
03031c4c04 Outdated link 2014-07-28 16:36:12 -07:00
Anthony Elliott
adca04b9ce Configure build for Windows 8.1 2014-07-28 19:31:50 -04:00
Andrzej Kapolka
cc909e2286 Fixed spelling error. 2014-07-28 16:24:49 -07:00
Andrzej Kapolka
3ac4bb6ddd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-28 16:24:43 -07:00
Andrzej Kapolka
e05884d4a3 Simpler rendering. 2014-07-28 16:18:16 -07:00
Stephen Birarda
cd6a73a01c Merge pull request #3217 from ZappoMan/buildwithoutqxmpp 
fix build to work if Qxmpp is not available
 2014-07-28 15:21:12 -07:00
ZappoMan
fbfd63c429 fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00
Atlante45
3c7375daad Removed unused variable 2014-07-28 10:17:04 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
Brad Hefta-Gaub
f438ae2ddb Merge pull request #3215 from Atlante45/master 
Fix the double entries in models' browsers
 2014-07-28 08:51:49 -07:00