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

26374 commits

Author SHA1 Message Date
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00
samcake
f044cf76d6 add the count of compilations of shaders to avoid recompiling them if ot needed 2018-01-30 18:31:30 -08:00
samcake
63371ff59c Fix the android build 2018-01-30 17:17:22 -08:00
Anthony J. Thibault
ed67a5b408 Fix avatars with extra joints during mirrored animations 
When the avatar is rotated it will play a mirrored and non mirrored versions of the rotation animation.
The mirrored version would also mirror extra joints on the model, yielding unexpected results.
This refines the logic that determines which joints are NOT mirrored, so that extra joints
remain unaffected by the mirrored animation playback.
 2018-01-30 16:51:39 -08:00
Dante Ruiz
9c81909be5 restructures _dirtyFlags name and bits 2018-01-30 16:42:08 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63 
Backtrace for rc 63
 2018-01-30 15:13:01 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
John Conklin II
eebbb7e563
Merge pull request #12276 from jherico/RC63_haze_hotfix 
RC63 Hotfix: Fix haze parameters uniform buffer size
 2018-01-30 15:04:07 -08:00
samcake
d5e52834ef cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 13:07:20 -08:00
samcake
2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 12:52:05 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Anthony Thibault
b3798553ed
Merge pull request #12287 from Atlante45/fix/mac-builds 
Fix Mac dev builds
 2018-01-30 10:50:54 -08:00
Seth Alves
c146a231fa
Merge pull request #12284 from ctrlaltdavid/21717 
FBX reader fixes
 2018-01-30 10:49:02 -08:00
Anthony Thibault
1e8a5485c1 8x shader compilation optimization and watchdog disable 
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary.  This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.

Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the  watchdog thread during
rendering pipeline setup.
 2018-01-30 10:27:06 -08:00
Dante Ruiz
4c0a173287 trying another solution 2018-01-30 10:23:19 -08:00
Dante Ruiz
bed2ea052d better solution 2018-01-30 09:44:49 -08:00
Seth Alves
7d1eb5fef8 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-30 09:13:02 -08:00
Dante Ruiz
eef2f656be Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash 2018-01-30 08:43:35 -08:00
David Rowe
280264d7ed Add location.domainID as a synonym for location.domainId 
And deprecate location.domainId.
 2018-01-30 20:46:27 +13:00
Atlante45
cb6bebd824 Fix Mac dev builds 2018-01-29 19:47:36 -08:00
David Rowe
cadd4e61ad Fix indent 2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa Handle geometric offsets in FBX mesh extents calculations 2018-01-30 14:36:34 +13:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4 Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information 2018-01-29 12:20:51 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization 
RC63: Bug fix for avatar neck cauterization
 2018-01-29 10:52:10 -08:00
samcake
04efaa0f92 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-29 10:28:45 -08:00
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -08:00
Olivier Prat
70a7ecc5f0 Fixed merge with remote trnormalmap 2018-01-29 10:50:17 +01:00
Olivier Prat
4cbfef55ef Merged with master. Had to add back shaders and code 2018-01-29 10:33:16 +01:00
David Rowe
d334f1c35c Don't append trailing FBX root nodes to the tail of the tree 2018-01-29 13:45:39 +13:00
Brad Davis
206927d72a Fix haze parameters uniform buffer size 2018-01-27 12:05:29 -08:00
Brad Davis
08df262474 Fix haze parameters uniform buffer size 2018-01-27 11:42:17 -08:00
Sam Gateau
221475d7d9 FIxing the dark ambient lighting on scattering surface 2018-01-27 10:37:32 -08:00
Sam Gateau
3d9985fa67 FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering 2018-01-27 08:48:19 -08:00
Sam Gateau
e08e64b573 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-26 19:43:07 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Anthony J. Thibault
3be857567b updated Skinning.slh comment and constant. 
(cherry picked from commit 43eaa02ef0)
 2018-01-26 14:02:18 -08:00
Seth Alves
78a5f535c1 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-26 12:09:38 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
3be42fe79a Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan 2018-01-26 10:36:26 -08:00
Seth Alves
503175cd28 Merge branch 'RC63' of github.com:highfidelity/hifi into warn-for-head-position-nan-for-rc-63 2018-01-26 10:34:51 -08:00
Seth Alves
2962c8979c print warnings if head position contains not-a-number 2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60 fix clang build 2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Thijs Wenker
08b712281f Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-26 18:10:47 +01:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-25 18:33:37 -08:00
Anthony J. Thibault
1ad65b8da5 Bug fix for twisted knees on some avatars. 
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.

(cherry picked from commit 991ba7f195)
 2018-01-25 18:31:41 -08:00
Anthony J. Thibault
21c1e32490 Bug fix for avatar neck cauterization 
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader.  If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.

(cherry picked from commit faf8350369)
 2018-01-25 17:47:39 -08:00
samcake
2f4e61888f Making it work maybe 2018-01-25 16:57:35 -08:00
SamGondelman
78d72a1703 remove unnecessary invokeMethod from ResourceCache::getResource 2018-01-25 16:07:26 -08:00
Dante Ruiz
3c12ed3b75 Merge branch 'master' of github.com:highfidelity/hifi into entity-joints 2018-01-25 16:03:15 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Thijs Wenker
ce50380698 fix JSAPI typo 2018-01-25 22:47:35 +01:00
Brad Davis
bde5282541 Fix loading of the render config JSON 2018-01-25 12:43:49 -08:00
Bradley Austin Davis
00538c69cd
Merge pull request #12257 from jherico/source_tree_qml 
Fix resource loading from source tree
 2018-01-25 12:29:24 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
John Conklin II
1865432b47
Merge pull request #12180 from Zvork/locallights 
Local lights on translucent objects
 2018-01-25 09:36:58 -08:00
Seth Alves
7c09b210c6
Merge pull request #12253 from hyperlogic/bug-fix/avatar-eye-offset 
Bug fix for incorrect positioned eyes on other peoples avatars
 2018-01-25 07:51:35 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
samcake
ae6a95ec0d fixing my bugs on vissibility 2018-01-24 18:07:35 -08:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees 
Bug fix for twisted knees on some avatars.
 2018-01-24 16:19:49 -08:00
John Conklin II
1529fea983 Revert "Display both lasers on tablet and Web surfaces" 
(cherry picked from commit 455090d2b9)
 2018-01-24 14:51:42 -08:00
humbletim
e8f0df4363 switch to bool per CR feedback 2018-01-24 14:28:22 -05:00
humbletim
3ebf322fcf switch to foreach per CR feeddback 2018-01-24 14:13:34 -05:00
humbletim
63a226f999 make fromScriptValue logic easier to follow for CR; eliminate extra QByteArray conversion 2018-01-24 13:49:58 -05:00
MiladNazeri
3da8e5249c
Merge pull request #12226 from kencooke/audio-options-pitch 
Add "pitch" property to allow pitch shifting an audio effect
 2018-01-24 10:38:24 -08:00
humbletim
c2ee13931e changes per CR feedback; additional jsdoc 2018-01-24 13:38:10 -05:00
Olivier Prat
d0f2138e87 Merged with master 2018-01-24 10:00:41 +01:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Anthony J. Thibault
991ba7f195 Bug fix for twisted knees on some avatars. 
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
 2018-01-23 16:05:43 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android 
Android updates
 2018-01-23 14:41:35 -08:00
humbletim
9fb20bee80 remove extra space 2018-01-23 15:13:53 -05:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
76cbc4ee55 separate getAsset fail/then handlers 2018-01-23 14:47:49 -05:00
Olivier Prat
55abaf33fb Added shaders to support normal maps on translucent objects 2018-01-23 17:35:01 +01:00
Olivier Prat
24692f13fd Added separate scribe function to evalGlobalLightingAlphaBlendedWithHaze to shorten shader C string 2018-01-23 14:19:39 +01:00
Olivier Prat
8985514a31 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-23 09:51:17 +01:00
humbletim
97889b30d5 remove unnecessary lambda capture 2018-01-23 03:21:19 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
Anthony J. Thibault
5926384076 Take defaultPoseFlag section into account when computing byteArraySize. 
(cherry picked from commit c13c9f301c)
 2018-01-22 16:02:35 -08:00
Dante Ruiz
2d70e76546 fix merge conflict 2018-01-22 15:15:11 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c Take defaultPoseFlag section into account when computing byteArraySize. 2018-01-22 14:57:09 -08:00
Thijs Wenker
e8955fcd32 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-22 23:37:24 +01:00