Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14581 commits 25 branches 0 tags 1.1 GiB
Commit graph

14581 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -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
Clément Brisset
0a30251411 Merge pull request #3131 from ey6es/metavoxels 
Basic incremental streaming of metavoxel data through a reliable channel (first attempts unreliable channel, then moves it over if too big).
 2014-07-08 10:00:57 -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
Clément Brisset
5d0ab08054 Merge pull request #3130 from huffman/19828 
Code Review for Job #19828
 2014-07-08 09:40:32 -07:00
Andrzej Kapolka
365bc2a93e Need to reset the stream here. 2014-07-07 19:27:04 -07:00
Andrzej Kapolka
aaae07087c Fix for local edits. 2014-07-07 18:09:50 -07:00
Andrzej Kapolka
6bf4182804 Fix for send timer. 2014-07-07 16:25:13 -07:00
Andrzej Kapolka
69e7a17f47 Rather than backing out when we find that the delta is too big, we can just 
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
 2014-07-07 16:07:04 -07:00
ZappoMan
a4b7673a2c some more virtual entity work 2014-07-07 14:29:03 -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
ZappoMan
3145d150f3 more work on virtual entities, unit tests passing woot 2014-07-07 12:56:32 -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
ZappoMan
29e02f2681 more hacking on virtualizing entities 2014-07-07 09:36:31 -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
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
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
ZappoMan
c449ba27a9 more virtual entity work 2014-07-03 15:18:17 -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
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -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
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