Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45468 commits 75 branches 59 tags 1.2 GiB
Commit graph

18641 commits

Author SHA1 Message Date
Bradley Austin Davis
ac743b6acb PR feedback 2016-07-26 11:55:25 -07:00
Bradley Austin Davis
3962487ee3 Fix depth state caching / resetting 2016-07-26 11:55:25 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45 fix unix warning, added comments 2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Anthony J. Thibault
0a35c13a94 Moved creation of pipeline into call_once block 2016-07-25 16:30:29 -07:00
Anthony J. Thibault
fb84f058d6 Fix alpha cut-outs and incorrect gamma on Web3DOverlays 2016-07-25 15:56:05 -07:00
Seth Alves
e3b4612283 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-25 13:19:13 -07:00
Chris Collins
e1e1ca1c12 Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change 
fix interface crash when chaning avatar models
 2016-07-25 12:11:46 -07:00
Chris Collins
3c9b9aef4f Merge pull request #8304 from ChristophHaag/fixGridShader 
fix grid shader
 2016-07-25 09:47:12 -07:00
Andrew Meadows
1df3b59aa1 change BUG to FIXME 2016-07-24 19:19:35 -07:00
Andrew Meadows
d876251f1e release geometry refs in Model::deleteGeometry() 2016-07-24 19:17:39 -07:00
Brad Hefta-Gaub
c85d6800c3 reduce activity logging spam 2016-07-24 11:44:25 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui 
Fix some UI elements triggered by WebViews
 2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub
f0574282eb Merge pull request #8299 from hyperlogic/bug-fix/no-hips-no-problem 
Prevent avatars with missing "Hips" joints from causing crashes
 2016-07-23 13:44:14 -07:00
Brad Hefta-Gaub
41e02276e5 Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override 
Support for animGraphUrl override in FST file.
 2016-07-23 13:42:46 -07:00
Brad Davis
85b0440e32 Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now 2016-07-23 11:06:33 -07:00
Andrew Meadows
7280992806 add mutex lock around AvatarData joint data 2016-07-23 10:30:44 -07:00
Christoph Haag
7134d2bfd4 fix grid shader 
this shader is used for example in
developer - audio - audio scope - show scope
 2016-07-23 11:09:16 +02:00
Brad Davis
89d9affb41 Merge remote-tracking branch 'upstream/stable' 2016-07-22 19:47:31 -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
a06ef47bb3 Merge pull request #8300 from davidkelly/dk/noACAudioPlus 
Actually audio was really broken
 2016-07-22 18:23:28 -07:00
Seth Alves
9a69361391 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 17:52:49 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
David Kelly
4b48cc7c2e 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 17:47:24 -07:00
Zander Otavka
c25b87c33f Use custom dialog for asset server add to world 2016-07-22 17:14:45 -07:00
Zander Otavka
530e17a7e5 Move JSON parsing for custom dialog to be sooner 2016-07-22 17:14:45 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Chris Collins
e755528cf2 Merge pull request #8278 from sethalves/fix-equip-fly-away 
fix equip fly-away
 2016-07-22 16:47:31 -07:00
Anthony Thibault
3b14988577 Fix another crash if "Hips" joint is not found. 2016-07-22 16:27:43 -07:00
Anthony Thibault
a43e9a5710 Fix for crash on avatars with missing "Hips" joint 2016-07-22 16:00:40 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
Brad Hefta-Gaub
566e0f5dbf Merge pull request #8287 from AndrewMeadows/fix-simple-compound 
fix bug breaking simple-compound shape type
 2016-07-21 18:18:04 -07:00
Brad Hefta-Gaub
c24472d390 Merge pull request #8290 from howard-stearns/cleanup-heartbeat 
cleanup domain-server heartbeat code
 2016-07-21 18:17:19 -07:00
Anthony Thibault
2429b82b5e Support for animGraphUrl override in FST file. 2016-07-21 17:17:08 -07:00
howard-stearns
b303c6df8e strong type checking my arse 2016-07-21 16:04:12 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
Brad Hefta-Gaub
bb8224be8c fix silence on no codec after previous codec has been set 2016-07-21 13:57:11 -07:00
Seth Alves
6a94bfe8aa Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-21 09:32:47 -07:00
Anthony Thibault
592a50356b Merge pull request #8211 from highfidelity/skin 
Skin sub-surface lighting
 2016-07-20 15:48:25 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
samcake
1c4742e710 Fixing comments from review 2016-07-20 11:02:27 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
David Kelly
7b2d5e7fab Potential cause of that buzzsaw when resetting 2016-07-20 10:41:16 -07:00
Seth Alves
c1b27a9249 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-20 10:03:22 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
Andrew Meadows
22e7e150fc remove debug cruft 2016-07-19 18:01:06 -07:00
Seth Alves
56726183f6 clear internal bullet flag before switching entity to kinematic 2016-07-19 16:45:57 -07: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
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -07:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Seth Alves
5f6e608207 don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't. 2016-07-19 11:23:21 -07:00
samcake
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -07:00
Brad Hefta-Gaub
1ee5023f6d fix warnings 2016-07-19 08:33:54 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -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 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
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -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
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
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
David Kelly
3df373252f Several minor things 
We could only partially fill the _scratchBuffer - .wav files may not
be exactly N frames long.  Doh.

While at it, I needed to call finishLocalInjection() after local
injectors are done, and the access to the injector vector needs to
be locked, given that we do a QtDirectConnection with the networking
and thus the outputLocalInjectors is on a different thread.

The clicking was just 0-ing out the _scratchBuffer.
 2016-07-18 14:00:41 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
samcake
80587ca8a3 using the textureGather lookup 2016-07-18 12:52:21 -07:00
samcake
be4839d46c a better depth filter 2016-07-18 12:26:04 -07:00
Brad Davis
0f240d39b6 Actually delete textures we're not using 2016-07-18 11:21:09 -07:00
samcake
a4ad4659c4 Fixing build warnings 2016-07-18 11:17:06 -07:00
David Kelly
a30b631a0a Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho 2016-07-18 11:15:58 -07:00
Seth Alves
180cc90197 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-18 10:54:01 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
Brad Hefta-Gaub
2cd38064a5 Merge pull request #8235 from jherico/more_shapes 
Support triangle and hexagon shapes, add shape support to overlays.
 2016-07-18 09:05:24 -07:00
samcake
86d9ee56d2 Downsampling shader pass 2016-07-18 03:56:11 -07:00
samcake
5a0ce81516 Performing the curvature generation and diffusion at half the resolution 2016-07-18 03:54:05 -07:00
samcake
378f4576fa a bit better making the curvature and diffusion passes 2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Seth Alves
4d9f5ce777 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-16 07:39:36 -07:00
Brad Hefta-Gaub
dc2741950a Merge pull request #8259 from kencooke/improved-hrtf 
Fix the AudioMixer distance attenuation.
 2016-07-15 22:36:51 -07:00