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

32683 commits

Author SHA1 Message Date
Sam Gateau
43a119cbbc just adding the correct include tobring th edefines 2019-06-12 23:15:53 -07:00
Sam Gateau
fbab3fcde9 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-12 19:15:25 -07:00
Sam Gateau
5004070af9 Grab the name of the renderer no matter what 2019-06-12 17:14:44 -07:00
Brad Hefta-Gaub
50cfe4531e
Merge pull request #15752 from PrestonB1123/moreToolbarTinkering 
BUGZ-666: Toolbar Artifact Always Present
 2019-06-12 17:14:18 -07:00
Sam Gateau
b2feb0f920 Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air 2019-06-12 16:48:36 -07:00
Howard Stearns
0c1df749b9
Merge pull request #15746 from roxanneskelly/bugz516 
BUGZ-628 - Add quasi-MTBF logging to track disconnects
 2019-06-12 15:48:45 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Roxanne Skelly
ca0c9e236b Cleanup 2019-06-12 11:58:26 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats 
BUGZ-623: Quiet asan gpu stats
 2019-06-12 09:02:13 -07:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63 
DOC-63: Tablet JSDoc
 2019-06-11 16:51:08 -07:00
Brad Hefta-Gaub
d9e3dd2857
Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock 
Add mutex for Socket::_connectionsHash
 2019-06-11 16:41:11 -07:00
Roxanne Skelly
8704a36d07 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-11 16:26:55 -07:00
Roxanne Skelly
67cb5821bc Update packet headers / add connect 'reason' 2019-06-11 16:00:49 -07:00
David Rowe
92eb418690 Doc review 2019-06-12 10:50:37 +12:00
Seth Alves
2fe8979206 fix warning 2019-06-11 15:46:12 -07:00
Simon Walton
1c03aeac20 Add lock for Connections map 2019-06-11 15:14:01 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33 
DOC-33: MyAvatar API JSDoc catch-up
 2019-06-11 15:05:06 -07:00
Roxanne Skelly
071a779930 convert enum reason for disconnect to boolean 2019-06-11 14:38:39 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Howard Stearns
3111d2fa2e Merge branch 'master' of github.com:highfidelity/hifi into verbose-logging-2 2019-06-11 12:22:46 -07:00
Seth Alves
c5e1f2aedc change ContextStats::evalDelta to better handle wrapping values in graphics stats 2019-06-11 11:56:49 -07:00
Howard Stearns
bd446192e8 get windows error before calling io 2019-06-11 10:31:22 -07:00
Shannon Romano
973e93aa2f
Merge pull request #15729 from hyperlogic/bug-fix/avatar-data-max-size-computation 
AvatarData: Fix avatarDataByteArray max size computation
 2019-06-11 08:43:52 -07:00
Brad Hefta-Gaub
34283097d2
Merge pull request #15730 from SamGondelman/assert 
BUGZ-631: Don't normalize zero vector in flipNormalsMyAvatarVsBackfacingTriangles
 2019-06-11 07:48:29 -07:00
howard-stearns
d7f6685022 Merge branch 'master' of https://github.com/highfidelity/hifi into verbose-logging-2 2019-06-10 19:42:07 -07:00
Anthony J. Thibault
897e276188 Compile fix 2019-06-10 18:34:11 -07:00
Anthony J. Thibault
6c4e7cd805 AvatarData: arranged order of size computation reflect order in the packet. 2019-06-10 18:00:54 -07:00
Anthony J. Thibault
889a5d2bda AvatarData: Add FAR_GRAB_JOINTS_SIZE to byteArraySize computation. 2019-06-10 17:58:46 -07:00
SamGondelman
88003c37d7 fix physics assert 2019-06-10 17:12:56 -07:00
Shannon Romano
04d707dbe0
Merge pull request #15723 from sethalves/zero-size-grid-asan 
BUGZ-627: don't divide by zero if a grid entity-item has a zero dimension
 2019-06-10 16:54:03 -07:00
Anthony J. Thibault
2fa16719cf AvatarData: Fix avatarDataByteArray max size computation 
The previous size calculation did not take the presence of the hand controller section into account.
This could sometimes result in a buffer overrun of the network buffer as identified in a debug build.

https://highfidelity.atlassian.net/browse/BUGZ-526
 2019-06-10 16:52:44 -07:00
Anthony J. Thibault
654b5775e1 Crash fix for ResourceCache::getResource() 
A wrong 'read' locker is used around a critical section that actually modifies the _resources QHash.
This can result in memory corruption and seg faults.
 2019-06-10 15:05:34 -07:00
Seth Alves
67995a8677 don't divide by zero if a grid entity-item has a zero dimension 2019-06-10 14:25:44 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut 
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
 2019-06-10 13:10:56 -07:00
Shannon Romano
1982424ee9
Merge pull request #15719 from SamGondelman/crash 
BUGZ-545: Possible fix for Mac PolyLine-related crash
 2019-06-10 12:56:31 -07:00
Roxanne Skelly
4a89d22482
Merge pull request #15694 from roxanneskelly/bugz516 
BUGZ-516 - attempt to rebind bound sockets on silent domain checkin
 2019-06-10 12:30:23 -07:00
Howard Stearns
9c6ca60108 get windows error first, check for socket changes, and fix bad Q_OS_WINDOWS ref 2019-06-10 12:08:51 -07:00
SamGondelman
23f8778feb possible fix for mac crash? 2019-06-10 11:10:29 -07:00
Howard Stearns
0e8753d9fc Merge branch 'master' of github.com:highfidelity/hifi into roxanneskelly-bugz516 2019-06-10 11:02:54 -07:00
Sam Gateau
32399997b1 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-10 10:52:53 -07:00
Shannon Romano
d8791c4379
Merge pull request #15710 from SamGondelman/lightmap 
BUGZ-596: Fix baking of light maps
 2019-06-10 10:13:55 -07:00
Sam Gateau
e0714e5b1a Removing comments 2019-06-07 17:18:30 -07:00
Sam Gateau
2d9a7f7c4f Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware 2019-06-07 17:00:37 -07:00
Howard Stearns
c7b87a34d2 Merge branch 'bugz516' of git://github.com/roxanneskelly/hifi into roxanneskelly-bugz516 2019-06-07 16:41:54 -07:00
Roxanne Skelly
ec1118db1f Attempting to write to a socket in unbound state was causing qt to crash 
after a number of tries.  This fix does an initial check to prevent that
case.
 2019-06-07 15:23:06 -07:00