Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48807 commits 76 branches 59 tags 1.2 GiB
Commit graph

20178 commits

Author SHA1 Message Date
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Chris Collins
bc9f2b4007 Merge pull request #9163 from jherico/gl_context_preservation 
Preserve and restore the GL context when resizing QML surfaces
 2016-12-07 09:08:36 -08:00
Bradley Austin Davis
5c3480e2a2 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 05:02:45 -08:00
Howard Stearns
2eb8d9d0c4 Merge pull request #9153 from davidkelly/dk/machineFingerprint 
Machine fingerprint
 2016-12-06 16:34:45 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
Brad Hefta-Gaub
b97012fc97 Merge pull request #9137 from jherico/msvc2015 
Fixes for building on MSVC 2015 / Qt 5.8
 2016-12-06 10:25:16 -08:00
Chris Collins
6d4b1c4b97 Merge pull request #9155 from jherico/text_degrade_fix 
Fix drop in text rendering quality when texture memory is low
 2016-12-06 09:23:32 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1" 
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
 2016-12-05 15:17:53 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
samcake
acdce95bba Merge pull request #9140 from jherico/polyline_threading_fix 
Possible polyline crash fix
 2016-12-02 14:16:14 -08:00
Chris Collins
6cb85e92b1 Merge pull request #9136 from samcake/hdr 
Fix a crash if current shader is null
 2016-12-02 09:14:07 -08:00
Brad Davis
12ccbdac0b Actually render polylines 2016-12-01 19:46:08 -08:00
Seth Alves
8fe7c3156a Merge pull request #9138 from hyperlogic/bug-fix/3dsmax-fbx-reader-fixes 
Support for the 3ds Max object offset feature
 2016-12-01 19:39:05 -08:00
Brad Hefta-Gaub
934148fea5 Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1 
Added jsdocs for MyAvatar
 2016-12-01 18:11:25 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar 
Not complete by any means, but it's a start.
 2016-12-01 17:38:43 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Anthony J. Thibault
68b103b46b Fix for missing fields in static initializer. 2016-12-01 15:21:49 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Brad Davis
5bade2ef9a Add locking around the code that reads polyline entity data and builds GPU structures for them 2016-12-01 14:14:17 -08:00
Chris Collins
942850293e Merge pull request #9105 from druiz17/teleportBug 
Fix for unable to teleport to areas that you should
 2016-12-01 11:35:06 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
samcake
ff39ec6753 fix a potential crash if the current shaderObject is null 2016-12-01 10:51:32 -08:00
Andrew Meadows
2bbe2be516 fix spelling: physcis --> physics 2016-12-01 10:50:10 -08:00
Andrew Meadows
ae699e2a65 add initializer for member variable 2016-12-01 10:41:40 -08:00
Andrew Meadows
445c730ca3 remove cruft, fix formatting and spelling 2016-12-01 10:38:13 -08:00
Andrew Meadows
333e9ec7f4 Merge pull request #9128 from Polyrhythm/ryan/v3-and-shader-helpers 
Vec3 and shader helpers
 2016-12-01 10:32:34 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Brad Hefta-Gaub
e0bcbb08ff Merge pull request #9134 from samcake/blue 
Fix a bug when using the gpu::Batch::_glUniform*() calls  with a bad location
 2016-12-01 09:03:56 -08:00
sam
3d29187156 FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:44:04 -08:00
sam
6342762fde FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:39:52 -08:00
Anthony J. Thibault
e96676fea4 Support for the 3ds Max object offset feature 
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
 2016-11-30 18:28:55 -08:00
Ryan Jones
7b0756c745 remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions 2016-11-30 16:37:04 -08:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
samcake
c3db2704ed Merge pull request #9126 from jherico/gl_debugging 
Working on OpenGL debuggability
 2016-11-30 10:51:58 -08:00
Dante Ruiz
1b20cc8bd0 more clean up 2016-11-30 18:28:50 +00:00