barnold1953
b5a9f50ae7
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-08 17:15:35 -07:00
barnold1953
f8fdd2d11f
Minor adjustments
2014-07-08 17:15:11 -07:00
barnold1953
87ad87e10f
Actual stereoscopic 3D UI. Looks better now.
2014-07-08 16:25:21 -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
Andrzej Kapolka
7163db7586
Merge pull request #3136 from birarda/master
...
use compiler default C++ standard library on OS X, tweak RtMidi find module
2014-07-08 14:16:22 -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
barnold1953
0ce7b178b0
Made Oculus UI framebuffer resize when window resizes
2014-07-08 12:47:41 -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
Stephen Birarda
8c5979813f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-08 12:17:15 -07:00
Stephen Birarda
d1afe127c3
updates to RtMidi find module to look for static or dynamic lib
2014-07-08 12:06:43 -07:00
Philip Rosedale
e75b9dc832
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-08 11:43:45 -07:00
barnold1953
cc63f706a7
Functional sixense "laser" oculus selection mode.
2014-07-08 11:43:24 -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
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
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
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
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
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
a53d007c33
add support for getting current animation details for running avatar animations
2014-07-03 11:59:18 -07:00
Stephen Birarda
6038c33fe6
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 11:12:19 -07:00
wangyix
507518f16d
removed numFramesCapacity from being exposed everywhere
2014-07-03 11:11:56 -07:00
Atlante45
6b88724578
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-03 10:30:39 -07:00
Atlante45
20cdc0e3ca
Fix wrong slot names in ModelBrowser
2014-07-03 10:30:21 -07:00
Andrew Meadows
8c8a29f477
merge upstream/master into andrew/ragdoll
2014-07-03 09:27:52 -07:00
Stephen Birarda
f1e2ba1267
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 09:25:03 -07:00
Andrew Meadows
55dd2a4835
re-enable gravity effect on arm IK
2014-07-03 09:10:23 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Brad Hefta-Gaub
67910a5ba2
Merge pull request #3115 from Barnold1953/OculusSDK
...
3DTV UI overlay + Oculus fixes
2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub
1b29b7c120
Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback
...
Removed json callback
2014-07-02 21:45:19 -07:00
Brad Hefta-Gaub
da87ac4105
Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager
...
Replace QNetworkAccessManager by Wrapper
2014-07-02 21:41:08 -07:00
Atlante45
69533c25c2
Fix script not being loaded at startup
2014-07-02 17:54:21 -07:00
Philip Rosedale
257dc56168
Merge pull request #3111 from noirsoft/master
...
Implementing improved perlin noise
2014-07-02 17:20:10 -07:00
barnold1953
b6a626c928
Removed comment
2014-07-02 17:18:12 -07:00
barnold1953
edcf4d04f8
Fixed bug when switching from normal view to oculus
2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9
Fixed 3rd person camera for non oculus
2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a
Clickable 3D UI in 3DTV
2014-07-02 16:40:02 -07:00
Atlante45
106e5b578b
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 16:06:41 -07:00
Atlante45
45db5e2c40
Removed Xcode warnings
2014-07-02 15:57:11 -07:00
Clément Brisset
1f92d57230
Merge pull request #3103 from AlericInglewood/19827
...
Code Review for Job #19827
2014-07-02 15:53:57 -07:00
Clément Brisset
ae6b4def32
Merge pull request #3108 from huffman/19800
...
Code Review for Job #19800
2014-07-02 15:46:56 -07:00
Philip Rosedale
1a3becc123
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-02 15:26:19 -07:00
Philip Rosedale
ec1f909210
Merge pull request #3109 from AndrewMeadows/ragdoll
...
stable arm IK without constraints
2014-07-02 15:26:10 -07:00
Stephen Birarda
73312ecc5f
add the PitchWheel constant to the MIDIManager class
2014-07-02 15:07:49 -07:00
Atlante45
1ac38c9884
Switched call to setCache to invokeMethod
2014-07-02 14:31:19 -07:00
Atlante45
6e02561d96
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 14:08:57 -07:00
Chris Oates
c79c5df295
Fixing up #define / #if pair so that permutation table change can be turned of by setting #defined variable to 0 instead of having to comment it out.
2014-07-02 13:50:47 -07:00
Chris Oates
2d9a42c07a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a
Implemented Improved Perlin Noise in existing "textured voxels" option.
...
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
2014-07-02 13:09:16 -07:00
Andrew Meadows
9f5f79b2e3
merge andrew/ragdoll into andrew/bispinor
...
improved IK merged into AngularConstraint work
Conflicts:
interface/src/renderer/JointState.cpp
interface/src/renderer/JointState.h
2014-07-02 11:37:17 -07:00
Atlante45
598c1cb516
Switched Sound to NetworkAccessManager
2014-07-02 11:27:55 -07:00
Andrew Meadows
f5debdb930
merge upstream/master into andrew/bispinor
2014-07-02 11:23:42 -07:00
Atlante45
14a2bbb454
Switched SnapshotShareDialog to NetworkAccessManager
2014-07-02 11:22:29 -07:00
Andrew Meadows
b018c1c4a5
Add copy ctor for JointState
...
create AngularConstraint for joints that need them (but not used yet)
2014-07-02 11:22:07 -07:00
Atlante45
9bcd4e7ac8
Switched ScriptEditorWidget to NetworkAccessManager
2014-07-02 11:21:54 -07:00
Atlante45
602015be66
Switched ScriptModel to NetworkAccessManager
2014-07-02 11:21:26 -07:00
Ryan Huffman
70121357be
Update JSONCallbackParameters to take params in constructor
2014-07-02 11:12:06 -07:00
Atlante45
da0021cc8e
Switch ModelsBrowser to NetworkAccessManager
2014-07-02 10:53:30 -07:00
Atlante45
f6221abb71
Switch ModelUploader to NetworkAccessManager
2014-07-02 10:52:08 -07:00
Andrew Meadows
8b3af0b9cb
merge upstream/master into andrew/say-no-to-warnings
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
libraries/audio/src/AudioRingBuffer.cpp
2014-07-02 10:37:30 -07:00
Atlante45
6489151578
Switch ImageOverlay to NetworkAccessManager
2014-07-02 10:28:26 -07:00
Stephen Birarda
55d8b763c5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-02 09:42:32 -07:00
Andrew Meadows
6e5d77f0fc
merge upstream/master into andrew/ragdoll
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2014-07-02 09:41:13 -07:00
Andrew Meadows
49d54dd6f0
Add Model::inverseKinematics() for stable hand IK
...
(removed constraint enforcement which was causing problems,
will add that back later)
2014-07-02 09:33:51 -07:00
Brad Hefta-Gaub
2df851dcfc
Merge pull request #3106 from ctrlaltdavid/19823
...
Code Review for Job #19823
2014-07-02 09:06:01 -07:00
barnold1953
67ecde7d31
Made tree editor voxel world stationary and not crash
2014-07-01 21:39:19 -07:00
Ryan Huffman
f0c013960d
Remove unnecessary qDebug
2014-07-01 20:05:30 -07:00
Ryan Huffman
ccc638d8c1
Merge branch 'master' of git://github.com/highfidelity/hifi into 19800
2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53
Rename UserLocationsWindow to UserLocationsDialog
2014-07-01 20:03:05 -07:00
Ryan Huffman
aa08577c73
Fix long line
2014-07-01 17:59:59 -07:00
Ryan Huffman
a9e352981a
Fix cleanup of resources for UserLocations*
2014-07-01 17:59:49 -07:00
Atlante45
ab15a1487e
Switched BillboardOverlay to NetworkAccessManaqer
2014-07-01 17:44:38 -07:00
Atlante45
c5a997a567
Switched Application to NetworkAccessManager
2014-07-01 17:43:25 -07:00
wangyix
a5943e3608
made AudioRingBuffer frames capacity variable
2014-07-01 16:24:31 -07:00
Brad Hefta-Gaub
d8a5f59511
Merge pull request #3104 from Atlante45/model_and_billboard_overlays
...
Model and billboard overlays
2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0
Removed unnecessary function
2014-07-01 15:37:52 -07:00
Ryan Huffman
e7e7bef506
Add error string on rename failure
2014-07-01 15:37:10 -07:00
Ryan Huffman
9953fd6d2b
Update MyLocations to not send rename request if unchanged
2014-07-01 15:29:13 -07:00
Atlante45
12ebfd92d1
Memory leak
2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a
Added billboards overlays
2014-07-01 15:09:30 -07:00
wangyix
3730be9804
nacked edit packets are not resent if NACKs are disabled in menu
2014-07-01 14:03:26 -07:00
Atlante45
e9826250cb
CR
2014-07-01 12:57:39 -07:00
Philip Rosedale
227dab937c
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-01 12:48:02 -07:00
Atlante45
958367f579
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
...
Conflicts:
interface/src/devices/OculusManager.cpp
2014-07-01 12:45:42 -07:00
Atlante45
547431d52e
Coding Standard -- static_cast
2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097
ModelOverlay functionnal + bounding box
2014-07-01 12:42:56 -07:00
barnold1953
af30dc2722
Updated oculus readme.txt for windows users
2014-07-01 12:33:54 -07:00
barnold1953
1a1050cb06
Added back _raiseMirror usage for mirror mode.
2014-07-01 12:31:48 -07:00
wangyix
fd051310da
prune missing set before constructing nack packets;
...
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
2014-07-01 12:01:51 -07:00
Stephen Birarda
f389e3a6da
resolve conflicts on merge with upstream master
2014-07-01 11:02:25 -07:00
Stephen Birarda
de463642c0
add the ModWheel property to the MIDIManager
2014-07-01 11:00:17 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106
changed numSamplesNeedToStartPlayback calculation in Audio.cpp
2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17
Merge pull request #3099 from Barnold1953/OculusSDK
...
Oculus SDK Upgrade
2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b
Fixed warnings
2014-07-01 10:28:40 -07:00
Stephen Birarda
5ba4a4dbb5
initial pass of MIDI implementation that bubbles events to JS
2014-07-01 09:53:18 -07:00
Ryan Huffman
50b13c99a7
Update UserLocationsWindow derive from QDialog
2014-06-30 22:44:10 -07:00
Ryan Huffman
bfde24fe12
Update MyLocations sort order
2014-06-30 22:37:32 -07:00
Ryan Huffman
a566f90820
Update User Location update/delete to not work simultaneously
2014-06-30 22:37:13 -07:00
Ryan Huffman
15d60df420
Update User Locations window to update name when it changes on update
2014-06-30 22:25:00 -07:00
Ryan Huffman
51e42221be
Update menu to toggle User Locations Menu
2014-06-30 22:24:27 -07:00
Atlante45
2015861e13
Fixed spelling mistake
2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab
Comments + connectedDevice
2014-06-30 19:02:43 -07:00
Andrew Meadows
9ca1bfdfe5
add AngularConstraint.* with some unit tests
...
more unit tests to follow
2014-06-30 18:05:22 -07:00
Andrzej Kapolka
0075bb89c4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-30 18:02:56 -07:00
wangyix
f51a77ce45
reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed
2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
2014-06-30 17:54:34 -07:00
Atlante45
d102795314
Added application version to logger
2014-06-30 17:18:49 -07:00
barnold1953
1cd2066e79
Added option to disable glow effect for 10fps boost for oculus
2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100
Adding logger calls
2014-06-30 17:10:17 -07:00
wangyix
7a6b20fd84
added downstream audio stats to stats overlay
2014-06-30 17:01:22 -07:00
barnold1953
2727328729
Removed unneeded menu option
2014-06-30 16:46:25 -07:00
barnold1953
de0e65eb03
Restored glow effect
2014-06-30 16:26:50 -07:00
Clément Brisset
1fd830f53c
Merge pull request #3098 from ctrlaltdavid/19803
...
Code Review for Job #19803
2014-06-30 16:15:51 -07:00
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
barnold1953
e51eb34f05
Fixed build errors when libovr is not present
2014-06-30 15:14:21 -07:00
Atlante45
e9dffc0681
Removed testing code
2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
2014-06-30 14:30:17 -07:00
Atlante45
0d18debd1b
Moved UserActivityLogger to networking
2014-06-30 14:27:07 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
barnold1953
5a2d2bba8f
Updated readme.txt
2014-06-30 12:42:43 -07:00
Andrzej Kapolka
110f90df0e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-30 12:42:02 -07:00
