Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 19:42:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18055 commits 21 branches 28 tags 1.2 GiB
Commit graph

18055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c172f628fc repairs to FindATL indenting 2014-10-24 11:12:55 -07:00
Stephen Birarda
30aa23e5cd message include dir for ATL when found 2014-10-24 10:45:06 -07:00
Stephen Birarda
fd23fb66ab bubble up ATL_INCLUDE_DIRS from FindATL module 2014-10-24 10:42:29 -07:00
AndrewMeadows
64892a6b27 Merge pull request #3655 from Atlante45/fix_playback_loop 
Fix player loop
 2014-10-24 08:47:57 -07:00
AndrewMeadows
31a1b8bb06 Merge pull request #3651 from PhilipRosedale/master 
Better animation for audio-only mouth movement
 2014-10-24 08:46:32 -07:00
Philip Rosedale
e5d64a0d5d Merge pull request #3644 from birarda/data-web-page 
fix for DataWeb hifi link handling
 2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d Merge pull request #3657 from ey6es/metavoxels 
Further incremental improvements to heightfield voxelization.
 2014-10-23 21:10:21 -07:00
Andrzej Kapolka
3d6d418548 Merge pull request #3642 from samcake/temp0 
Bring back the GL batching for model rendering and fixed the bug on MAC
 2014-10-23 17:54:45 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
Andrzej Kapolka
27d9de0cba More gradual improvements to heightfield voxelization. 2014-10-23 16:01:51 -07:00
Sam Gateau
d92c03364a Improve comment regarding the replacement of the QGLProgram->bind() 2014-10-23 14:53:43 -07:00
Sam Gateau
d7fca1fd27 FIxing the merge 2014-10-23 14:39:22 -07:00
Atlante45
20c862d199 Fix player loop 2014-10-23 14:35:24 -07:00
Andrzej Kapolka
ef0a400dcb Fix for clearing empty nodes. 2014-10-23 13:37:11 -07:00
Stephen Birarda
829774dae4 Merge pull request #3653 from murillodigital/master 
No need for https when downloading assets
 2014-10-23 13:25:34 -07:00
Andrzej Kapolka
34cba5c031 Added options to selectively toggle heightfield/dual contour surface 
rendering.
 2014-10-23 13:16:43 -07:00
AndrewMeadows
38c1132725 Merge pull request #3649 from Atlante45/reverb_fixed 
bump audio version number
 2014-10-23 13:08:05 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Stephen Birarda
397bda586e Merge pull request #3650 from birarda/domain-tunnel 
fix for delete of last row in array table
 2014-10-23 11:55:07 -07:00
Philip Rosedale
9394f72b18 clarify fake blendshape array size 2014-10-23 11:55:06 -07:00
Stephen Birarda
9364c3b342 fix for delete of last row in array table 2014-10-23 11:54:30 -07:00
Andrzej Kapolka
9c43748d35 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 11:50:46 -07:00
Philip Rosedale
1d68413b66 Audio-only mouth uses multiple blend shapes 2014-10-23 11:43:13 -07:00
Atlante45
06d528fce5 bump audio version number 2014-10-23 09:28:48 -07:00
Philip Rosedale
da75073357 Merge pull request #3648 from RyanDowne/master 
changed gravity setting on hair
 2014-10-23 08:43:40 -07:00
Ryan
9495c2c87a Merge remote-tracking branch 'hifi/master' 2014-10-23 08:01:43 -07:00
Philip Rosedale
6ce1049c32 Merge pull request #3647 from Atlante45/reverb_fixed 
Reverb fixed
 2014-10-23 07:47:26 -07:00
Atlante45
2ec5ddbfbc Merge branch 'revert-3646-revert-3636-reverb' of https://github.com/highfidelity/hifi into test 2014-10-22 23:43:38 -07:00
Clément Brisset
9debef6128 Revert "Revert "Reverb"" 2014-10-22 23:40:50 -07:00
Atlante45
9c45055aeb Fixed for no/multiple reverb zones 2014-10-22 23:32:07 -07:00
Clément Brisset
1e8fbf2012 Merge pull request #3646 from highfidelity/revert-3636-reverb 
Revert "Reverb"
 2014-10-22 23:06:43 -07:00
Clément Brisset
b1b7114e66 Revert "Reverb" 2014-10-22 22:46:37 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Andrzej Kapolka
7d1e0a2b82 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-22 18:24:13 -07:00
Andrzej Kapolka
631419d23c Tweaks to heightfield conversion. 2014-10-22 18:22:21 -07:00
Philip Rosedale
a97b6f1422 Merge pull request #3639 from ey6es/metavoxels 
Fix for streaming crash.
 2014-10-22 18:14:17 -07:00
Andrzej Kapolka
9af1516c79 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-22 17:45:20 -07:00
Andrzej Kapolka
271c01ad03 Fix for digging into converted heightfields. 2014-10-22 17:44:56 -07:00
Philip Rosedale
246ff1614f Merge pull request #3645 from birarda/avatar-by-name 
fix for AvatarHashMap crash when erasing avatars
 2014-10-22 17:43:44 -07:00
Clément Brisset
0525c562b0 Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown 
Rift calibration countdown
 2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
8e67c5f534 don't erase from the AvatarHashMap on the wrong thread 2014-10-22 17:35:28 -07:00
Stephen Birarda
04416ff40c fix for DataWebPage hifi link handling 2014-10-22 17:27:42 -07:00
David Rowe
0e3495986d Add countdown to HMD calibration billboard 2014-10-22 16:58:10 -07:00
Atlante45
93a0eb18bd Added readme 2014-10-22 16:50:02 -07:00
David Rowe
38d50a76eb Add IsFacingAvatar getter and setter to Text3DOverlay 2014-10-22 16:47:40 -07:00
Ryan
883bb5aa68 Merge remote-tracking branch 'hifi/master' 2014-10-22 16:44:37 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Philip Rosedale
4c060dd6a7 Merge pull request #3641 from birarda/avatar-by-name 
return an avatar to script by their display name
 2014-10-22 16:41:19 -07:00
Philip Rosedale
d3fa3fbbac Merge pull request #3640 from PhilipRosedale/master 
can warp at any yaw angle
 2014-10-22 15:43:12 -07:00