Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-27 15:05:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63860 commits 6 branches 1 tag 1.1 GiB
Commit graph

26198 commits

Author SHA1 Message Date
Brad Davis
795a3b8407 Fix merge errors 2018-01-16 19:27:35 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics 
Rename libraries/model -> libraries/graphics
 2018-01-16 18:12:25 -08:00
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -08:00
Anthony J. Thibault
1027025b5c remove bind poses from AnimSkeleton. 2018-01-16 17:41:25 -08:00
Anthony J. Thibault
51ea2632c0 Remove Avatar UseAnimPreAndPostRotations option. 
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
 2018-01-16 17:27:19 -08:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
NissimHadar
9a382ebb86
Merge pull request #12177 from NissimHadar/defaultAmbientFix 
Set ambient mode to inherit if no URLs have been entered.
 2018-01-16 14:40:08 -08:00
Brad Davis
ceb60f6eba Fix built-in resource loading from scripts 2018-01-16 12:33:09 -08:00
MiladNazeri
d356f4faf9
Merge pull request #12143 from ctrlaltdavid/21679 
location API JSDoc
 2018-01-16 12:32:25 -08:00
Clément Brisset
858221d4db
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash 
Fix concurrent access crash in avatar mixer
 2018-01-16 11:07:59 -08:00
David Rowe
f836a5f2b6 Fix typo 2018-01-17 08:06:04 +13:00
Mohammed Nafees
885801c5ca Fix copying to clipboard from JS scripts 2018-01-16 13:17:47 -05:00
Sam Gondelman
3879626205
Merge pull request #12176 from SamGondelman/rendering 
Fix animation crash, make last frame inclusive
 2018-01-16 10:05:48 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Seth Alves
b17913366a
Merge pull request #12178 from ctrlaltdavid/21694 
Support FBX files that have nodes with non-XYZ rotation order
 2018-01-16 07:50:11 -08:00
Olivier Prat
8fb863e98c Added SurfaceData mechanism to evalGlobalLight 2018-01-16 15:57:05 +01:00
Olivier Prat
705b475d0c Merged with master 2018-01-16 15:07:20 +01:00
Olivier Prat
3382a35c3f Fixed bug due to incorrect discard of fragments with no local lights 2018-01-16 12:13:45 +01:00
Olivier Prat
6686b328c7 Fixed error in Specular shader which gave low key specular highlights 2018-01-16 10:47:46 +01:00
David Rowe
02179e3efd Doc review 2018-01-16 17:14:30 +13:00
David Rowe
f319fa70cb Merge branch 'master' into 21679 2018-01-16 16:22:34 +13:00
Nissim Hadar
f2d272b6fe Merge branch 'master' of https://github.com/highfidelity/hifi into defaultAmbientFix 2018-01-15 17:56:19 -08:00
Nissim Hadar
daa6409936 Improved comments. 2018-01-15 17:33:48 -08:00
David Rowe
67218a697b Support FBX files that have nodes with non-XYZ rotation order 2018-01-16 14:01:20 +13:00
Brad Davis
30bd8977b7 Remove android specific start address 2018-01-15 15:16:37 -08:00
Nissim Hadar
a1415e28ff If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit. 2018-01-15 15:11:10 -08:00
SamGondelman
f1253e3c6c fix crash on last frame = first frame, make last frame inclusive 2018-01-15 15:01:17 -08:00
Brad Davis
aeb7ca17a5 Don't sync textures with unsupported formats to the GPU 2018-01-15 13:43:49 -08:00
Brad Davis
17e9c3d00c Don't try to set invalid uniforms 2018-01-15 13:43:19 -08:00
Ryan Huffman
9b7520ddba
Merge pull request #12173 from sethalves/atp-get-mapping 
expose GetMappingRequest to js
 2018-01-15 13:42:19 -08:00
Sam Gateau
2f5d2bef49
Merge pull request #12028 from Zvork/roughness_metal 
Lighting model update for better specular
 2018-01-15 10:51:18 -08:00
Seth Alves
76048f3c30 error handling 2018-01-15 10:48:12 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08:00
Seth Alves
3e7d303661 export atp GetMappingRequest to js 2018-01-15 09:56:46 -08:00
Brad Davis
db30e9c45f Fixing PR builds 2018-01-15 09:47:31 -08:00
Olivier Prat
32445a5660 Updated pipelines 2018-01-15 18:18:13 +01:00
Bradley Austin Davis
537db9acb3 Fixing OSX build 2018-01-15 09:07:20 -08:00
Olivier Prat
54eab1c878 First working local lights on transparent objects 2018-01-15 17:49:55 +01:00
Olivier Prat
a3e50689cb Modified light outline shader to use some factorized code 2018-01-15 12:18:22 +01:00
Olivier Prat
6af6b5fe41 evalLocalLighting function created in LightLocal.slh 2018-01-15 12:02:29 +01:00
Olivier Prat
ca776fb9b4 Added LightLocal.slh to centralize shading with local lights 2018-01-15 11:36:52 +01:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
55bfdc105b Switch android to GLAD 2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
58d4d193f7 Add command line disabling of QML and KTX cache 2018-01-13 12:22:00 -08:00
Brad Davis
24b83aa0f1 Merge remote-tracking branch 'sam/android-gles' into windows_gles 2018-01-13 11:36:31 -08:00
Brad Davis
3d69ceea71 Re-enable HUD compositing 2018-01-13 11:34:56 -08:00
Brad Davis
8c528be481 Allow compile time disabling of QML surface rendering 2018-01-13 11:34:00 -08:00
Brad Davis
6d45238bbd Allow disabling of KTX cache 2018-01-13 11:32:47 -08:00
Brad Davis
6313e3ea69 Allow building on Android with GLAD disabled 2018-01-13 11:31:50 -08:00
Sam Gateau
d6e771f01d Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid 2018-01-13 10:02:53 -08:00
Sam Gateau
57f1ba2412 Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default 2018-01-13 02:00:34 -08:00
Brad Davis
c685cc0e6f Fix stencil buffer background issue 2018-01-13 01:31:42 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094 fixing the stencil not clearing correctly and shaders not compiled correctly in main thread 2018-01-13 01:00:10 -08:00
Sam Gateau
9fc50628e1 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:43:57 -08:00
Brad Davis
51a0131414 Fix linkage 2018-01-12 19:37:28 -08:00
Sam Gateau
628731ed19 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:37:07 -08:00
Sam Gateau
44920dd828 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-12 19:33:47 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Anthony Thibault
0a54241fe3
Merge pull request #12092 from hyperlogic/feature/dual-quat 
Fix tootsie roll wrists and shoulders with dual quaternion skinning
 2018-01-12 16:30:03 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Brad Hefta-Gaub
68de7f864e
Merge pull request #12162 from kencooke/audio-stereo-mic 
Support for stereo audio input/mic
 2018-01-12 13:29:28 -08:00
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix 
Dealing with legacy domains.
 2018-01-12 12:42:11 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Anthony J. Thibault
bfd18e3696 unused variable warning fix 2018-01-12 09:07:50 -08:00
Brad Davis
ffbb5442c7 Last GL config fix 2018-01-12 08:58:13 -08:00
samcake
481675ee41 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-12 08:54:50 -08:00
Brad Davis
8b2e8706ff Fixing android GLES config 2018-01-12 00:42:46 -08:00
Nissim Hadar
50a030b68b Corrected copy of ambient URL. 2018-01-12 00:22:06 -08:00
Olivier Prat
c2427523ce Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2018-01-12 08:43:57 +01:00
Brad Davis
8241def9b9 Disable variable allocation textures on android 2018-01-11 23:36:24 -08:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Sam Gateau
e3faec838c Adding colors to the world 2018-01-11 23:22:51 -08:00
Sam Gateau
6f6aedbf4f Merge branch 'master' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:56:52 -08:00
Sam Gateau
8142b207af Making the forward model normal lighted 2018-01-11 19:56:08 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop. 
Added copy of ambient URL.
 2018-01-11 19:35:13 -08:00
Sam Gateau
8294322993 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:12:06 -08:00
Ken Cooke
dfc8c86571 Fix bug when calling switchOutputToAudioDevice() with the active device. 
Pass QAudioDeviceInfo by value to avoid getting clobbered.
 2018-01-11 18:22:34 -08:00
Ken Cooke
db6e70cb24 Fix bug when calling switchInputToAudioDevice() with the active device. 
Pass QAudioDeviceInfo by value to avoid getting clobbered.
 2018-01-11 18:14:16 -08:00
samcake
f22429d098 Working on the shaders 2018-01-11 18:03:11 -08:00
Anthony J. Thibault
983e1fe075 warning fixes: removed unused variable. 2018-01-11 17:57:58 -08:00
Anthony J. Thibault
4e4ac6c54d Merge branch 'master' into bug-fix/elbow-glitch-fix 2018-01-11 17:57:41 -08:00
Bradley Austin Davis
800b7963f2
Merge pull request #12152 from gcalero/android_touchevents 
Android touchevents
 2018-01-11 20:39:55 -05:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00
Ken Cooke
7c5085bd24 Handle stereo changes while active, by restarting the codec on both ends 2018-01-11 16:10:50 -08:00
Gabriel Calero
c469e8ce53 Propagate touch events to qml offscreen surface 2018-01-11 20:45:26 -03:00
Anthony J. Thibault
467a7eaf2d Fix for elbow glitches 
The pole vector constraint calculation within the IK system would sometimes compute the incorrect rotations.
This would be visible as an instantaneous snap of the elbow joint as the bicep was curled.

When applying pole vector constraints, there needs to be two methods of determining the current orientation of the elbow joint.
One for when the arm/elbow joint is bent, and one for when the arm/elbow is straight.
Previously, the way we would switch between these two solutions could cause a large rotation delta to accur between very small angles.
Now we use the more accurate method (1) more often, and we smoothly blend between the solutions as the joint gets straighter.
 2018-01-11 15:40:53 -08:00
Nissim Hadar
311e95e0d0 Corrected default values - for reading legacy content. 2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
Nissim Hadar
d1cd2d9c96 Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix 2018-01-11 14:52:19 -08:00
Zach Fox
1e608b13b2 Show username when admin (this probably isn't the way to get username 2018-01-11 14:45:43 -08:00
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture 
Keep requesting render update until textures load
 2018-01-11 14:09:21 -08:00
Sam Gateau
09f5f0746b
Merge pull request #12141 from SamGondelman/uniformBuffer 
Fix particle uniform buffer issue
 2018-01-11 14:05:36 -08:00
Nissim Hadar
d225f803d0 Corrected default values. 2018-01-11 12:28:44 -08:00
Brad Davis
001edcd71b Allow creation of empty files with storage API 2018-01-11 08:06:52 -08:00
Gabriel Calero
9fa06e0019 Fixes to load cubemap 2018-01-11 11:12:58 -03:00
Olivier Prat
3f8865594b Fixed typo error that could potentially launch an assert when loading objects with blend shapes with normals but without tangents 2018-01-11 08:37:56 +01:00
Brad Davis
238f1b9449 Support normal vertex format 2018-01-10 19:43:28 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI 
Fix and improve currentAPI.js
 2018-01-10 17:55:08 -08:00
samcake
4dd925f025 Fixing forward render task to draw entities and avatars shapes 2018-01-10 17:51:03 -08:00
David Rowe
309e7f7333 Tidying 2018-01-11 14:48:45 +13:00
Brad Davis
560fd38547 Merge remote-tracking branch 'upstream/master' into android 2018-01-10 17:31:50 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body 
Bug fix to prevent wrists entering the avatar's torso.
 2018-01-10 17:22:50 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
SamGondelman
e9d751fd23 try to avoid reusing uniform buffer locations 2018-01-10 17:01:01 -08:00
David Rowe
951f52c4b2 Merge branch 'master' into 21679 2018-01-11 13:54:06 +13:00
Dante Ruiz
980807c657 make changes 2018-01-10 16:50:41 -08:00
David Rowe
753bd21e68 location API JSDoc 2018-01-11 13:44:16 +13:00
Ken Cooke
6a2e3cc272 Enable stereo codecs for AvatarAudioStream 2018-01-10 15:14:18 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
Nissim Hadar
8396997dec Renamed enum element. 2018-01-10 13:35:57 -08:00
SamGondelman
df574c6bc9 keep requesting render update until textures load 2018-01-10 13:19:53 -08:00
Anthony J. Thibault
ae997928c1 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.
 2018-01-10 11:51:44 -08:00
Nissim Hadar
c99a936720 Bumped up protocol version. 2018-01-10 11:45:37 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
Nissim Hadar
9f25b01b10 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 09:30:05 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
Ken Cooke
660032d8fb Fix bug in how emitAudioPacket() determines mono/stereo. 
Compressed bytes were counted as if audio samples.
 2018-01-10 06:54:27 -08:00
Olivier Prat
5ae4b99b90 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2018-01-10 11:20:00 +01:00
Olivier Prat
2960ad845c Fixed weird rendering bug. 2018-01-10 10:55:45 +01:00
Olivier Prat
cc8a717a81 Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2018-01-10 10:07:32 +01:00
Brad Davis
b1e95681a9 Cleanup android 2018-01-09 23:30:31 -08:00
Brad Davis
fb59a0a56f Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf Fixing UI 2018-01-09 18:36:42 -08:00
Nissim Hadar
bb04b68e42 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 15:51:46 -08:00
Nissim Hadar
5b1f8e83d4 Removed gcc warning. 2018-01-09 15:46:15 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
Nissim Hadar
0b1e321ccf Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 15:25:03 -08:00
Nissim Hadar
b53e411184 Corrected pushing of default lights. 2018-01-09 15:24:46 -08:00
Melissa Brown
7b50480a43
Merge pull request #12070 from 1st-BrainStormer/master 
WL#21651: Extend MIDI javascript support.
 2018-01-09 14:06:15 -08:00
Nissim Hadar
4ecb056210 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 13:44:13 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00