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 |
|
Atlante45
|
66b15230e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed
|
2014-10-24 15:02:29 -07:00 |
|
Atlante45
|
12f0237dc7
|
Cleanup
|
2014-10-24 15:02:09 -07:00 |
|
Andrzej Kapolka
|
eabc08784a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-24 15:01:36 -07:00 |
|
Atlante45
|
847ef64b66
|
move audio env data over to new packet
|
2014-10-24 14:27:55 -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 |
|
Atlante45
|
a7663db8e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed
|
2014-10-24 11:40:24 -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 |
|
Atlante45
|
6072fd4066
|
Added audio env packet type
|
2014-10-24 10:41:54 -07:00 |
|
Stephen Birarda
|
3b436e04ae
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-10-24 09:43:04 -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 |
|
Atlante45
|
529a7e0369
|
CR
|
2014-10-23 22:55:40 -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 |
|
Stephen Birarda
|
8c79d19e3e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-10-23 16:07:54 -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 |
|
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 |
|
David Rowe
|
844be60f18
|
Fix CMake to find ATL on Windows build PC
|
2014-10-23 14:34:23 -07:00 |
|
Atlante45
|
5e49c08e27
|
extra space
|
2014-10-23 14:08:36 -07:00 |
|
Atlante45
|
1ae1d28e7b
|
typo
|
2014-10-23 14:07:42 -07:00 |
|
Atlante45
|
bced402a74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed
|
2014-10-23 13:43:21 -07:00 |
|
Atlante45
|
d528c47a83
|
Bump audio packet version
|
2014-10-23 13:42:17 -07:00 |
|
Atlante45
|
d4ec337cae
|
Don't send reverb data as often
|
2014-10-23 13:39:56 -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 |
|
Sam Gateau
|
ac269e16c0
|
start working on the target framerate control
|
2014-10-23 13:19: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 |
|
Atlante45
|
6df37b6d4a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed
|
2014-10-23 12:00:53 -07: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 |
|