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

64197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
88f66f03cc remove merge mistake 2018-01-26 09:20:46 -08:00
Atlante45
093fff9c9e Add crashpad 2018-01-26 09:20:38 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Seth Alves
47f44eb21f extirpate bugsplat 2018-01-26 09:20:23 -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
Zach Fox
b41129f81b
Merge pull request #12258 from zfox23/commerce_fixSortingAgain 
Fix Purchases sorting (again); Fix (i) icon loading
 2018-01-25 17:35:26 -08:00
samcake
2f4e61888f Making it work maybe 2018-01-25 16:57:35 -08:00
Dante Ruiz
5bb1b1bbff remove backup file 2018-01-25 16:26:00 -08:00
Dante Ruiz
537db37b26 removed dead comment 2018-01-25 16:23: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
Anthony J. Thibault
faf8350369 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.
 2018-01-25 15:57:48 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
Liv Erickson
3a6f184278 make clear function is for avatar entities only, add error handling in non-client entity cases 2018-01-25 15:13:14 -08:00
Dante Ruiz
f3e20e72cb really fix multi-highlighing 2018-01-25 15:09:03 -08:00
Zach Fox
f117dd33a8 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain 2018-01-25 15:04:28 -08:00
Liv Erickson
7e5684c439 use signals 2018-01-25 15:04:12 -08:00
Thijs Wenker
2874a3d2ca fix android build (skip auto-complete when BUILD_TOOLS is FALSE) 2018-01-25 23:39:32 +01:00
John Conklin II
37b53e3968
Merge pull request #12259 from jherico/fix/render_config 
Fix a number of bugs caused by the binary resources migration
 2018-01-25 14:28:47 -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
Thijs Wenker
179c21acf4 jsdoc info on selected auto-complete entry 2018-01-25 22:46:30 +01:00
Dante Ruiz
07842f8e54 Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight 2018-01-25 13:30:45 -08:00
Brad Davis
ab4e2d99f1 Don't try to set the current directory to a QRC path 2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51 Fix help screen URL 2018-01-25 13:04:08 -08:00
Brad Davis
d4aef1ea88 Fix URLs in QSS files to use QRC base path 2018-01-25 13:03:42 -08:00
Brad Davis
ac94327ec7 Fix loading of the context overlay information icon 2018-01-25 12:44:55 -08: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
Zach Fox
afc71a5ac5 Fix Purchases sorting (again); Fix (i) icon loading 2018-01-25 12:17:34 -08:00
Liv Erickson
7ee5608992 initial first pass of exposing headless verification 2018-01-25 12:02:26 -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
Seth Alves
e3f859329d
Merge pull request #12245 from sethalves/fix-asan-build 
fix asan build
 2018-01-25 10:15:29 -08:00
John Conklin II
5ac2e9da15
Merge pull request #12251 from zfox23/commerce_fixMacSecurityPic 
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
 2018-01-25 09:42:32 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix 
RC63 Fix Edit/Asset Browser in HMD mode
 2018-01-25 09:38:23 -08:00
John Conklin II
d537146fd1
Merge pull request #12240 from luiscuenca/gotoFixForHMD 
RC63 GoTo fix for HMD
 2018-01-25 09:37:59 -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
John Conklin II
5599488b88
Merge pull request #12254 from hyperlogic/bug-fix/rc63-avatar-eye-offset 
RC63: Bug fix for incorrect positioned eyes on other peoples avatars
 2018-01-25 09:32:13 -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
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00