Sam Gateau
|
88eaeaee7d
|
Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api
|
2014-10-28 14:42:22 -07:00 |
|
Sam Gateau
|
6101c3b758
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-10-27 14:55:42 -07:00 |
|
Sam Gateau
|
fd514ccfc9
|
Fixed the cmake so if NSIGHT is not available then no problem
|
2014-10-27 14:47:31 -07:00 |
|
Sam Gateau
|
89f9e5b01b
|
try to get more coherent names
|
2014-10-27 11:49:51 -07:00 |
|
Sam Gateau
|
ff44a460d6
|
Add NSIGHT Profiliing capability
|
2014-10-27 11:40:52 -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
|
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 |
|
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
|
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 |
|
Andrzej Kapolka
|
8684384316
|
Disconnect metavoxel LOD from avatar LOD.
|
2014-10-24 16:38:57 -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 |
|
Philip Rosedale
|
ab557447f2
|
fix uninitialized mouth blending variables
|
2014-10-24 12:51:54 -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
|
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
|
003d2f031a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-23 16:15:11 -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 |
|
Sam Gateau
|
d7fca1fd27
|
FIxing the merge
|
2014-10-23 14:39:22 -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 |
|
Leonardo Murillo
|
a4965e7f60
|
No need for https when downloading assets
|
2014-10-23 13:59:08 -06:00 |
|
Philip Rosedale
|
9394f72b18
|
clarify fake blendshape array size
|
2014-10-23 11:55:06 -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 |
|
Ryan
|
9495c2c87a
|
Merge remote-tracking branch 'hifi/master'
|
2014-10-23 08:01:43 -07:00 |
|
stojce
|
4e75837a64
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
|
2014-10-23 14:26:13 +02: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
|
631419d23c
|
Tweaks to heightfield conversion.
|
2014-10-22 18:22:21 -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
|
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 |
|
Stephen Birarda
|
7b0f1477a1
|
expose AvatarList to Interface SE, add avatarWithDisplayName method
|
2014-10-22 15:28:04 -07:00 |
|
Ryan Huffman
|
14555c4534
|
Add UndoStackScriptingInterface and support when editing entities
|
2014-10-22 14:54:04 -07:00 |
|
Atlante45
|
86c965a922
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
|
2014-10-22 14:20:22 -07:00 |
|
Sam Gateau
|
d13283192f
|
Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code
|
2014-10-22 14:07:15 -07:00 |
|
Atlante45
|
ad2eb08964
|
Correctly link in cmake
|
2014-10-22 13:11:45 -07:00 |
|
Atlante45
|
ccc8e0d876
|
Statically link gverb
|
2014-10-22 12:56:44 -07:00 |
|