Atlante45
12eeb50cbe
Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays
2014-07-07 12:24:47 -07:00
Andrzej Kapolka
44befbb019
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 12:21:56 -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
8382f764cd
Got rid of unneccessary Q_DISABLE_COPY()
2014-07-07 12:15:55 -07:00
Clément Brisset
85c67fd77d
Merge pull request #3129 from birarda/master
...
update the interface icon
2014-07-07 12:01:49 -07:00
Stephen Birarda
dd8f7e81b1
update the interface icon
2014-07-07 11:46:57 -07:00
Atlante45
a225df63f6
Removed deprecated moveToThread()
2014-07-07 11:40:03 -07:00
Atlante45
982a50dbcf
Remove multithread access from NetworkAccessManager for the time being
2014-07-07 11:33:54 -07:00
Andrzej Kapolka
7adf43277f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 11:27:31 -07:00
Andrzej Kapolka
34b93670e2
Merge pull request #3127 from ey6es/master
...
Because attempting to compile the new voxel texture shader causes my sys...
2014-07-07 11:27:10 -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
Andrzej Kapolka
fb64d22171
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 11:09:17 -07:00
Andrzej Kapolka
e15f003639
Bring reliable delta streaming code over from test.
2014-07-07 11:08:43 -07:00
samcake
f5c690cc8d
Add Leapmotion support for Apple build
...
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
2014-07-07 09:32:46 -07:00
samcake
d56ab21192
Clean file formating
...
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion
- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
2014-07-07 09:24:23 -07:00
mpursley
f13c7634ad
adding "export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.2.1/lib/cmake" for qt5.2.1
2014-07-07 01:08:11 -07:00
mpursley
d1cddb4f28
adding "export QT_CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake" for qt5.2.1
2014-07-07 01:02:04 -07:00
samcake
abacefa723
Merge remote-tracking branch 'upstream/master' into 19734
...
Conflicts:
interface/CMakeLists.txt
interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13
Merge branch 'master' of https://github.com/highfidelity/hifi into 19734
2014-07-05 18:10:59 -07:00
Brad Hefta-Gaub
b7b46b0a3b
Merge pull request #3126 from Atlante45/replace_qnetworkaccessmanager
...
Hopeful fix to ACs crash
2014-07-03 21:48:15 -07:00
David Rowe
2ad2b6cd1c
Resize the overlay framebuffer when the application window is resized
2014-07-03 18:23:37 -07:00
Atlante45
b0e83c32ff
Hopeful fix to ACs crash
2014-07-03 18:17:01 -07:00
Andrzej Kapolka
da32c6e89b
Push persistent mappings into reliable delta channel before sending and pull
...
transient mappings out after sending.
2014-07-03 17:29:10 -07:00
David Rowe
97ca6d70fa
Fixed performance timer scope
2014-07-03 17:15:46 -07:00
Philip Rosedale
bc3823f1f7
Merge pull request #3125 from birarda/master
...
fix the voices inside your head
2014-07-03 16:55:50 -07:00
Stephen Birarda
ecbd62104c
cause sounds within an epsilon distance to be unattenuated
2014-07-03 16:43:12 -07:00
Stephen Birarda
7ff0648d8a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 16:32:46 -07:00
Stephen Birarda
438e0b501b
fix the voices inside your head
2014-07-03 16:32:38 -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
barnold1953
ba997334ff
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f
First pass at laser oculus UI pointer
2014-07-03 16:09:54 -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
3729428c2e
Merge pull request #3122 from birarda/audio-rolloff
...
change the audio rolloff function
2014-07-03 13:49:59 -07:00
Stephen Birarda
04e7df1a3f
change the audio rolloff function
2014-07-03 13:46:38 -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
ZappoMan
8755e2d42e
CR feedback
2014-07-03 13:38:52 -07:00
Stephen Birarda
c0d0ca5066
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff
2014-07-03 13:37:06 -07:00
Atlante45
e2949b8d60
Merge branch 'animationFrameIndex' of https://github.com/ZappoMan/hifi into typed_arrays
2014-07-03 13:33:39 -07:00
Brad Hefta-Gaub
dbdce32b68
Merge pull request #3107 from wangyix/master
...
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
2014-07-03 13:32:31 -07:00
Stephen Birarda
15619b5a98
don't require RtMidi if it isn't present
2014-07-03 13:30:14 -07:00
wangyix
94c0c15c76
fixed more small bugs with AudioRingBuffer constructor
2014-07-03 12:06:18 -07:00
ZappoMan
59e8a98412
added example script
2014-07-03 12:05:18 -07:00