Andrew Meadows
8fa7bf4fa0
rename: ParentFrame --> ConstrainedFrame
2014-07-09 16:43:46 -07:00
Andrzej Kapolka
af6704a83c
Merge pull request #3134 from wdings23/light_and_haze
...
Added local lights to avatar. Added haze to voxel.
2014-07-09 16:07:20 -07:00
Andrew Meadows
f463099d16
add "simulate" stat name to Avatar::simulate()
2014-07-09 14:31:47 -07:00
Andrew Meadows
6ffa09f9e6
modified scope of devices stats
2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0
Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays.
2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-07-09 12:52:00 -07:00
TonyPeng
56eadcb0dc
Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays.
2014-07-09 12:05:34 -07:00
Andrew Meadows
d26585728b
Improved stat accumulation and context names
2014-07-09 11:53:53 -07:00
Philip Rosedale
7bcd7e03a4
Merge pull request #3147 from Barnold1953/master
...
Fixed full screen mirror mode for non oculus
2014-07-09 11:41:56 -07:00
David Rowe
527f6b2a3f
Fix User Interface menu item string
2014-07-09 11:32:38 -07:00
barnold1953
862f311306
Fixed full screen mirror mode for non oculus
2014-07-09 11:29:33 -07:00
David Rowe
603ca02ef9
Default UI to "on"
2014-07-09 11:21:16 -07:00
Clément Brisset
3f24feeb1d
Merge pull request #3143 from PhilipRosedale/master
...
Add Low Velocity Filter for hand movement as menu option
2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df
Merge pull request #3138 from ctrlaltdavid/19836
...
Code Review for Job #19836
2014-07-08 23:16:32 -07:00
Philip Rosedale
f8185dec75
removed some debug logs
2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4
Hand low velocity filter as a menu option
2014-07-08 22:22:27 -07:00
David Rowe
51f7e8904d
Integrate UI toggling menu item and Hydra UI toggling
...
They work together and both fade the UI in / out.
2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625
Guard _framebufferObject deletion
2014-07-08 21:02:32 -07:00
Andrzej Kapolka
e579be82a2
Merge pull request #3137 from PhilipRosedale/master
...
Better clapping and hand squeezing scripts, started new hair class to hold vertlet hair
2014-07-08 14:20:03 -07:00
wangyix
df1b4107fd
moved qAudioOutput buffer overflow debug option to existing audio menu
2014-07-08 13:01:05 -07:00
TonyPeng
e212f9f42e
Change fog start to use default value.
2014-07-08 12:48:01 -07:00
TonyPeng
4e04cecd8c
Use glFog for haze (better performance).
2014-07-08 12:28:44 -07:00
wangyix
6ee52e97c8
added dev menu option to disable _audioOutput overflow check
2014-07-08 12:23:43 -07:00
Philip Rosedale
e75b9dc832
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-08 11:43:45 -07:00
wangyix
2e73ac8bc1
changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things
...
added _consecutiveNotMixedCount to prevent premature injector stream
deletion; made silent-frame drop only occur in dynamic jitter buffer
mode
2014-07-08 11:16:39 -07:00
TonyPeng
34e973c516
Merge branch 'master' of https://github.com/highfidelity/hifi into light_and_haze
...
Merge in from highfidelity.
2014-07-08 10:37:46 -07:00
AndrewMeadows
e34f592a83
Merge pull request #3132 from birarda/master
...
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
2014-07-08 10:36:05 -07:00
Stephen Birarda
e33b07819c
wrap a missed midi method
2014-07-08 10:24:21 -07:00
Clément Brisset
4f756c31f2
Merge pull request #3133 from huffman/19819
...
Code Review for Job #19819
2014-07-08 10:07:26 -07:00
Stephen Birarda
286d50f4f2
fix if/endif in MIDIManager header
2014-07-08 09:55:03 -07:00
Stephen Birarda
171660ded7
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
2014-07-08 09:52:50 -07:00
TonyPeng
94e81da557
Added local lights to avatar. Added haze to voxel.
2014-07-08 09:44:28 -07:00
Ryan Huffman
c509ae9ffd
Merge branch 'master' of git://github.com/highfidelity/hifi into 19828
2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944
Fix goTo* dialog bug with chat on Mac OSX
...
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window. There seems to be a deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
2014-07-07 13:47:31 -07:00
Andrzej Kapolka
f7f9dfd26e
Merge pull request #3128 from Atlante45/replace_qnetworkaccessmanager
...
Downgrade of NetworkAccessManager
2014-07-07 12:21:45 -07:00
Atlante45
a225df63f6
Removed deprecated moveToThread()
2014-07-07 11:40:03 -07:00
Andrzej Kapolka
21ba9bf410
Because attempting to compile the new voxel texture shader causes my system
...
(Ubuntu LTS, Intel graphics) to hang, change it to compile lazily when
activated.
2014-07-07 11:22:17 -07:00
David Rowe
2ad2b6cd1c
Resize the overlay framebuffer when the application window is resized
2014-07-03 18:23:37 -07:00
David Rowe
97ca6d70fa
Fixed performance timer scope
2014-07-03 17:15:46 -07:00
David Rowe
8b04a9c8b6
Add toggle for user interface display
...
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
2014-07-03 16:19:05 -07:00
Philip Rosedale
3280691491
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-03 15:54:29 -07:00
Brad Hefta-Gaub
db5abbc363
Merge pull request #3124 from Atlante45/replace_qnetworkaccessmanager
...
Fixed invokeMethod unable to find method + fixed children in different t...
2014-07-03 14:54:11 -07:00
Clément Brisset
a7be28b547
Merge pull request #3123 from AndrewMeadows/ragdoll
...
return to default pose after hydra disconnect
2014-07-03 14:49:26 -07:00
Atlante45
8e1b8334a1
Fixed invokeMethod unable to find method + fixed children in different thread
2014-07-03 14:46:17 -07:00
Andrew Meadows
662136f01c
reset timer as optimization
2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83
fix return to default pose after hydra disconnect
2014-07-03 14:09:14 -07:00
Philip Rosedale
a25c08a1b7
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-03 14:08:19 -07:00
Andrew Meadows
843a4db650
rotation offset for hydra controllers
2014-07-03 13:50:27 -07:00
Clément Brisset
4798cad1e5
Merge pull request #3121 from ZappoMan/animationFrameIndex
...
adds JavaScript API for getting the current animationDetails (state) for avatar animations
2014-07-03 13:45:27 -07:00
Brad Hefta-Gaub
b8071d8050
Merge pull request #3113 from birarda/master
...
initial pass at MIDI input for scripting
2014-07-03 13:40:25 -07:00
