Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45033 commits 71 branches 56 tags 1.2 GiB
Commit graph

45033 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
2c3b25cfa7 Merge pull request #8302 from davidkelly/dk/hotfixForAudio 
Hotfix for RC-16: Audio fix for injectors and Assignment Clients
 2016-07-22 19:11:56 -07:00
David Kelly
3d3a7a8820 Merge branch 'stable' of github.com:highfidelity/hifi into dk/hotfixForAudio 2016-07-22 18:40:06 -07:00
David Kelly
8b8a98bfcc Acutally audio was really broken 
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
  because you are an assignment client), we would not do the
  network injection at all.  That's bad.
* When we don't have a codec, like when using an injector, we
  were serializing the empty string in some problematic way.  I
  just use the built-in serialization, and it seems fine.

I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too).  Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.

Then, I added a script to play audio as a persistent script, which
just loops forever and ever.  You should hear that on both interface
clients also.

A detailed test plan to follow.

Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls.  Good to do this cuz
you know, things happen...
 2016-07-22 18:33:38 -07:00
Chris Collins
d11e26e665 Merge pull request #8289 from highfidelity/RC-16 
Beta Release 16 - Includes up to Developer Release 5179
 2016-07-21 12:07:00 -07:00
Chris Collins
cc4c21e899 Merge pull request #8284 from davidkelly/dk/noMoBuzzsaw 
Potential cause of that buzzsaw when resetting
 2016-07-20 14:00:31 -07:00
Chris Collins
71c12c30a2 Merge pull request #8286 from sethalves/build-server-only-plugins 
Build server only plugins
 2016-07-20 14:00:13 -07:00
Seth Alves
4e308914b2 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:37:30 -07:00
Seth Alves
5485b3ee13 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:34:44 -07:00
Seth Alves
c36d0d91ad when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:29:57 -07:00
Seth Alves
406b08ffa1 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:29:00 -07:00
David Kelly
7b2d5e7fab Potential cause of that buzzsaw when resetting 2016-07-20 10:41:16 -07:00
Ryan Huffman
1dd7d108d8 Merge pull request #8271 from thoys/fix-duplicate-teleport-target-overlays 
FIX duplicate teleport target overlays
 2016-07-20 09:10:16 -07:00
Thijs Wenker
be0ccad0d3 Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:26 +02:00
Thijs Wenker
b3b1bf7884 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:02 +02:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Chris Collins
0632f6df2d Merge pull request #8279 from birarda/master 
fix crash with multiple solo nodes in closeCurrentPacket
 2016-07-19 14:57:00 -07:00
Chris Collins
de06c7c370 Merge pull request #8276 from ZappoMan/addCodecNameToStream 
Fix issues with mismatched codecs
 2016-07-19 13:45:45 -07:00
howard-stearns
4a6132874f encodeURIComponent of the protocol signature 2016-07-19 13:43:28 -07:00
Thijs Wenker
2adff24a05 silly workaround- workaround 2016-07-19 21:34:42 +02:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Anthony Thibault
897627ebd6 Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes 
Mac OS X fixes
 2016-07-19 11:18:46 -07:00
Brad Hefta-Gaub
866ba2f185 Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom 
far-grabbed objects no longer fly away when the avatar body shifts
 2016-07-19 10:40:48 -07:00
Anthony J. Thibault
212175bdaa bug fix for far-grab pulling the object in the wrong direction 2016-07-19 10:23:00 -07:00
Brad Hefta-Gaub
48705d33c5 Merge pull request #8277 from jherico/pause_lighting 
Ensure the pause overlay is unlit (emissive)
 2016-07-19 08:34:15 -07:00
Brad Hefta-Gaub
1ee5023f6d fix warnings 2016-07-19 08:33:54 -07:00
Brad Davis
d98ae1ba9c Ensure the pause overlay is unlit (emissive) 2016-07-19 07:10:34 -07:00
Brad Hefta-Gaub
c484fec51d cleanup 2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
dbf60a594c Merge branch 'master' of https://github.com/highfidelity/hifi into addCodecNameToStream 2016-07-18 22:43:16 -07:00
Brad Hefta-Gaub
c6ffd81c4b some cleanup 2016-07-18 22:42:38 -07:00
Brad Hefta-Gaub
2e63aba8c9 when getting unexpected codec in the mixer, send a message to the client to select a different codec 2016-07-18 22:29:05 -07:00
Brad Hefta-Gaub
20824f038c include codec in audio stream packets so that each side can discard packets that don't match 2016-07-18 21:59:44 -07:00
Brad Hefta-Gaub
2e491e0afb Merge pull request #8275 from jherico/web_entity_leak 
Cleanup resources used by offscreen GL surfaces
 2016-07-18 21:46:18 -07:00
Brad Hefta-Gaub
0a6aee1707 Merge pull request #8254 from murillodigital/master 
Changes for hifiCodec plugin building on Linux
 2016-07-18 21:14:46 -07:00
Brad Hefta-Gaub
90c8abb4e9 Merge pull request #8268 from sethalves/fix-throwing-some-more 
improve throwing release velocity
 2016-07-18 21:13:35 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
Brad Davis
455d890358 Merge pull request #8266 from jherico/texture_free_fix 
Actually delete textures we're not using
 2016-07-18 19:41:35 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
howard-stearns
98555be987 Merge branch 'protocol3' of https://github.com/howard-stearns/hifi into suggestions 2016-07-18 18:11:05 -07:00
Brad Hefta-Gaub
171b9d8ecc Merge pull request #8270 from davidkelly/dk/audioPlayingFix 
NotFinished never should have had its own bit
 2016-07-18 18:05:55 -07:00
Anthony J. Thibault
ad7fa971aa copy scripts into build directory 2016-07-18 17:09:10 -07:00
Anthony J. Thibault
7fd40a5d10 MacOS: fix crash when touchscreen device is nullptr. 2016-07-18 17:08:17 -07:00
howard-stearns
17e64cf5e6 suggest only unrestricted domains, and also use server to sort 2016-07-18 16:58:29 -07:00
Ryan Downe Karpf
6e71e369a4 Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii 
grab script improvements
 2016-07-18 16:46:38 -07:00
Thijs Wenker
11b461a730 Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one 2016-07-19 01:46:29 +02:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
David Kelly
2a89fa25bb Removing comments 
Since I looked into it, seems ok
 2016-07-18 16:22:12 -07:00
David Kelly
df615b1503 NotFinished never should have had its own bit 
Since there is a Finished flag too.  So now, it is just 0, used as
a starting point, and we check for !hasState(Finished).  <sigh>
 2016-07-18 16:02:02 -07:00
Chris Collins
dc6ab167e4 Merge pull request #8253 from davidkelly/dk/localNoEcho 
Injectors now always play locally, and send to server without echo
 2016-07-18 15:02:29 -07:00
howard-stearns
98f76924c5 log hearbeat like we do updates 2016-07-18 14:49:56 -07:00
Seth Alves
2d73b23c56 when deciding on the release velocity of something thrown, don't include a zero velocity caused by seeing the same controller data as last frame 2016-07-18 14:44:41 -07:00