Stojce
9be107c9c1
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
2014-10-28 08:24:23 +01:00
Brad Hefta-Gaub
b506a99200
Merge pull request #3671 from ctrlaltdavid/20107
...
CR for Job #20107 - Keys p and h and some control keys wont override
2014-10-27 20:30:15 -07:00
Brad Hefta-Gaub
cfe26ead6e
Merge pull request #3669 from lycanthus/20074
...
Worklist #20074
2014-10-27 20:29:23 -07:00
Andrzej Kapolka
fc3f27b70a
Merge pull request #3670 from samcake/temp0
...
Add NSIGHT profiling information to the Build
2014-10-27 17:03:19 -07:00
Andrzej Kapolka
2db893c23c
Merge pull request #3668 from AndrewMeadows/experimental
...
Experimental feature: skeleton offset
2014-10-27 17:02:01 -07:00
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
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
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
Sam Gateau
89f9e5b01b
try to get more coherent names
2014-10-27 11:49:51 -07:00
Sam Gateau
541e528e57
Add NSIGHT Profiliing capability
2014-10-27 11:41:39 -07:00
Sam Gateau
ff44a460d6
Add NSIGHT Profiliing capability
2014-10-27 11:40:52 -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
Andrew Meadows
f25cfc0c7f
remove debug code
2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296
Merge upstream/master into andrew/experimental
2014-10-27 10:08:48 -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
Pete
8d97a20bd9
Worklist #20074
...
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
2014-10-26 21:14:20 -07:00
Stojce
61c80183ad
fix for mirror size on different scale resloutions
2014-10-26 08:12:07 +01:00
David Rowe
0fdcf381fa
Code tidy
2014-10-25 09:23:37 -07:00
David Rowe
c6463abfb8
Prevent keys captured by script from being used as menu shortcuts
2014-10-25 09:22:30 -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
