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

18097 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
9e086a8d08 Merge pull request #3672 from ey6es/metavoxels 
Fix for metavoxel stream crash/crash on exit.
 2014-10-27 15:11:53 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Andrzej Kapolka
15f8b3006b Remove debugging, fix streaming bug. 2014-10-27 14:45:34 -07:00
Andrzej Kapolka
5af52df558 Put some debugging in to track down a streaming crash. 2014-10-27 12:11:07 -07:00
AndrewMeadows
fecf7ba5ed Merge pull request #3667 from PhilipRosedale/master 
HeadMove:  Double click on spacebar turns around
 2014-10-27 11:00:34 -07:00
AndrewMeadows
9d93ec5a5a Merge pull request #3656 from huffman/separate-camera-tool 
Add camera move tool for editing
 2014-10-27 10:54:02 -07:00
Philip Rosedale
4b7eb682b3 Easier to get out of body and move from there with target 2014-10-27 08:44:45 -07:00
Philip Rosedale
fde85bb4d2 don't spam 2014-10-26 21:18:54 -07:00
Philip Rosedale
d0bb6e70ce Merge branch 'master' of https://github.com/worklist/hifi 2014-10-25 09:14:24 -07:00
Philip Rosedale
8158733a27 double click to turn around 2014-10-24 20:21:57 -07:00
Philip Rosedale
2dff75dac1 Merge pull request #3665 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-24 19:45:26 -07:00
Philip Rosedale
87f688a299 Merge pull request #3666 from samcake/temp1 
Unlock the framerate limitation by default and more settings
 2014-10-24 18:36:21 -07:00
Sam Gateau
334e032c17 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 17:58:54 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
Stephen Birarda
57e7fa233f Merge pull request #3664 from PhilipRosedale/master 
Tour Guide script to let you follow people, better hair
 2014-10-24 17:10:57 -07:00
Philip Rosedale
54197b2c23 fix for spacing 2014-10-24 17:10:46 -07:00
Philip Rosedale
33204b0d27 Merge pull request #3660 from birarda/xbox-controller 
add a guard in case SDL misreports number of axes
 2014-10-24 17:06:51 -07:00
Philip Rosedale
05e9d614e1 Merge pull request #3663 from ey6es/metavoxels 
Disconnect metavoxel LOD from avatar LOD.
 2014-10-24 17:06:20 -07:00
Philip Rosedale
7e17290281 Merge pull request #3662 from birarda/autorepeat 
bubble up auto repeat key event state to scripts
 2014-10-24 16:43:40 -07:00
Andrzej Kapolka
8684384316 Disconnect metavoxel LOD from avatar LOD. 2014-10-24 16:38:57 -07:00
Philip Rosedale
1e832e7bbb Tour guide script 2014-10-24 16:38:24 -07:00
Stephen Birarda
8ae1f980f5 don't make headMove changes if key is auto repeating 2014-10-24 16:13:01 -07:00
Stephen Birarda
f8b423ced6 bubble up isAutoRepeat state for KeyEvent 2014-10-24 16:12:15 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
Stephen Birarda
c57fc314f0 just resize axis vector is sdl decides to lie about the number of axes 2014-10-24 15:13:54 -07:00
Stephen Birarda
9289249df5 add a guard in case SDL somehow forgets about axes 2014-10-24 15:06:18 -07:00
Andrzej Kapolka
eabc08784a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-24 15:01:36 -07:00
Philip Rosedale
da531ac25e Merge pull request #3659 from PhilipRosedale/master 
fix uninitialized mouth blending variables
 2014-10-24 14:00:56 -07:00
Philip Rosedale
ab557447f2 fix uninitialized mouth blending variables 2014-10-24 12:51:54 -07:00
Andrzej Kapolka
1c50a49b55 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-24 11:41:44 -07:00
Leonardo Murillo
b81461bb0e Merge pull request #3658 from birarda/find-atl 
bubble up ATL_INCLUDE_DIRS from FindATL module
 2014-10-24 12:24:30 -06:00
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
Sam Gateau
5b0fd99115 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 09:28:13 -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
aaa79958c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 17:54:58 -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
Ryan Huffman
e556886c72 Add entity copying and axis constraining to entity tools 2014-10-23 15:28:16 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
d92c03364a Improve comment regarding the replacement of the QGLProgram->bind() 2014-10-23 14:53:43 -07:00
Ryan Huffman
fde7b30501 Add Camera::modeUpdated() 2014-10-23 14:47:41 -07:00
Ryan Huffman
28095e9972 Remove print statements in edit entities 2014-10-23 14:47:07 -07:00
Ryan Huffman
5b5a1745fd Add camera move tool 2014-10-23 14:46:39 -07:00