Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 03:30:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14871 commits 71 branches 56 tags 1.2 GiB
Commit graph

14871 commits

This branch
This branch
All branches
Author SHA1 Message Date
barnold1953
f3ae228030 Moved some FaceShift stuff to FacialAnimationData. Made use of 
FacialAnimationData
 2014-07-22 13:46:29 -07:00
barnold1953
fc9fb11e4f Added FacialAnimationData class 2014-07-22 11:56:19 -07:00
barnold1953
8a75a4ccd3 Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-21 14:26:41 -07:00
barnold1953
192fe71ac4 removed faceShiftScriptingInterface 2014-07-21 14:24:05 -07:00
Andrzej Kapolka
e2265ff59a Merge pull request #3187 from AndrewMeadows/inertia 
bug fix for broken seams in models
 2014-07-21 14:09:03 -07:00
AndrewMeadows
854ca4bc66 Merge pull request #3185 from Barnold1953/OculusOverlay 
Add hydra lasers for menu picking.
 2014-07-21 13:54:07 -07:00
Andrew Meadows
b21bac25a1 bug fix for broken seams in models 
don't hijack the "weight" variable because it's used elsewhere
 2014-07-21 13:41:41 -07:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
barnold1953
98babe1751 Working hydra lazers when not in oculus 2014-07-21 12:17:13 -07:00
Brad Hefta-Gaub
c3bbdbc176 Merge pull request #3184 from ZappoMan/audiobuffersize 
revert back the largest capacity of the client ring buffer back to the smaller default value
 2014-07-21 10:37:27 -07:00
ZappoMan
7c5a77ddfe revert back the largest capacity of the client ring buffer back to the smaller default value 2014-07-21 10:29:51 -07:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
barnold1953
c6bda4bf16 Moved sixense laser stuff to MyAvatar 2014-07-18 15:26:18 -07:00
Philip Rosedale
2cee5992a0 Merge pull request #3183 from Atlante45/js_s3_browse 
Js s3 browse
 2014-07-17 18:31:30 -07:00
Atlante45
c07ba9fec5 Added browser as a tool 2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843 Added S3 browser 2014-07-17 17:12:54 -07:00
Philip Rosedale
e8539d0006 Merge pull request #3181 from birarda/master 
foundation of support for signed transactions from interface
 2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb Merge pull request #3180 from AndrewMeadows/ragdoll 
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
 2014-07-17 16:00:02 -07:00
Stephen Birarda
cebd379b68 don't pass OpenSSL libraries as string 2014-07-17 14:47:45 -07:00
Stephen Birarda
b88761a8a3 add a debug to catch optimized lib 2014-07-17 14:42:12 -07:00
Andrew Meadows
58e31abf60 improved collision shapes for fingers 2014-07-17 14:31:16 -07:00
Stephen Birarda
d5baab278a add hifi_lib_dir hint to win32 section of FindOpenSSL 2014-07-17 14:28:09 -07:00
Stephen Birarda
05defb7c28 fix for select_library_configurations in OpenSSL find module 2014-07-17 14:27:01 -07:00
Stephen Birarda
5cad6edb38 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 14:06:11 -07:00
Andrew Meadows
53ee5f2340 minor cleanup around measurements of joint radius 2014-07-17 12:42:18 -07:00
Stephen Birarda
3c2ed95219 more cleanup to dependencies section of cmake 2014-07-17 11:56:23 -07:00
Stephen Birarda
c1987b6372 more tweaks to sections in BUILD guide 2014-07-17 11:54:01 -07:00
Stephen Birarda
aba4dcc5a8 fix min required OpenSSL version 2014-07-17 11:50:22 -07:00
Stephen Birarda
e9ab8899b2 some updates to the BUILD guide for OpenSSL 2014-07-17 11:49:37 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR 
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
 2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441 merge upstream/master into andrew/ragdoll 2014-07-17 10:52:27 -07:00
Andrew Meadows
783cde7376 minor tweak to rate at which ragdoll shapes follow joints 2014-07-17 10:51:17 -07:00
Andrew Meadows
25840cad49 fix bug in mixVisibleRotationDelta() 
was using a non-visible rotation
 2014-07-17 10:33:11 -07:00
wangyix
cd8d52c6f8 case statement style fix 2014-07-17 09:24:54 -07:00
Andrew Meadows
66158cb8a2 fix capsule-vs-capule collision test 2014-07-17 09:19:17 -07:00
Brad Hefta-Gaub
87ff6b9012 Merge pull request #3178 from Atlante45/activity_logger_on_off_option 
Activity logger on off option
 2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958 Merge pull request #3145 from samcake/19734 
19734 - Leapmotion support
 2014-07-17 08:45:55 -07:00
barnold1953
90dc3cf5de Small changes 2014-07-16 18:24:03 -07:00
wangyix
e557ba8052 removed space 2014-07-16 18:06:55 -07:00
Atlante45
6cb5483c21 Added send data option to prefs 2014-07-16 17:56:29 -07:00
samcake
dd9327018b Merge branch '19734' of https://github.com/samcake/hifi into 19734 2014-07-16 17:55:42 -07:00
samcake
e0e7b03841 Merge pull request #1 from AndrewMeadows/thermonuclear 
merge and warnings cleanup
Thanks Andrew !
 2014-07-16 17:46:30 -07:00
wangyix
8775d22765 re-added calculated desired frames to domain page stats 2014-07-16 17:44:49 -07:00
wangyix
397e6c8b13 renamed a function 2014-07-16 17:34:48 -07:00
wangyix
8763b39393 changed format label string a bit 2014-07-16 17:30:18 -07:00
barnold1953
88de5949a4 Fleshed out FaceshiftScriptingInterface 2014-07-16 16:34:30 -07:00
samcake
d668f259f9 Merge branch 'gh-pages', commit 'refs/pull/1/head' of https://github.com/samcake/hifi; branch 'thermonuclear' of https://github.com/AndrewMeadows/hifi into 19734 2014-07-16 16:03:43 -07:00
Stephen Birarda
61beb130a1 Merge branch 'master' of github.com:birarda/hifi 
Conflicts:
	interface/CMakeLists.txt
 2014-07-16 15:45:59 -07:00