Stephen Birarda
d5a3ea77ff
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
2014-10-27 09:28:50 -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
David Rowe
5f91f583e8
Merge branch 'master' into 19976
...
Conflicts:
interface/CMakeLists.txt
2014-10-24 20:34:45 -07:00
Philip Rosedale
8158733a27
double click to turn around
2014-10-24 20:21:57 -07:00
David Rowe
f373719f02
Don't include speech recognition if building with Visual Studio Express
2014-10-24 20:12:23 -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
David Rowe
55436eba9a
Don't "fail" loading speech commands if none to load
2014-10-24 17:45:37 -07:00
David Rowe
8fb1d22646
Fix indentation in CMake file
2014-10-24 17:25:07 -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
David Rowe
b32b82207b
Add include directory for Windows ATL
2014-10-24 17:01:01 -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
David Rowe
38524b3349
Merge branch 'master' into 19976
2014-10-24 15:43:55 -07:00
Stephen Birarda
fa174029fd
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-24 15:26:39 -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
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