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

32629 commits

Author SHA1 Message Date
Simon Walton
aa65361b37 Merge remote-tracking branch 'upstream/master' into stun-on-iface-change 2019-06-10 10:32:31 -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
Simon Walton
c088fab606 Fix annoying typo 2019-06-07 16:23:38 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
PrestonB1123
73ce5ef619
Merge pull request #15695 from PrestonB1123/logspam 
BUGZ-346: QML Logspam
 2019-06-07 13:37:38 -07:00
Shannon Romano
8d8c7c1a10
Merge pull request #15555 from raveenajain/gltf_walkingBounding 
Case 22352: gltf walking, bounding, collision
 2019-06-07 12:23:52 -07:00
Shannon Romano
96a9092847
Merge pull request #15706 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-429) Fix stuck transition due to removing sub render items before parent
 2019-06-07 12:23:15 -07:00
Simon Walton
498d681d3e Force new IP port on local address change 2019-06-07 12:04:04 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
sabrina-shanman
21966fe345 Fix stuck transition due to removing sub render items before parent 2019-06-07 11:14:32 -07:00
Seth Alves
54906a270e don't hang if somehow setting display plugin to the current one 2019-06-07 10:31:48 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
sabrina-shanman
9a75feecde Fix binding to temporary transitionStage pointer 2019-06-06 14:52:42 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
sabrina-shanman
971d563f49 Add debug icons for transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
faf5db5476 Change semantic for removing transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
sabrina-shanman
5587193640 Add more transition icon debugging 2019-06-06 13:25:00 -07:00
jennaingersoll
677b54e240
Merge pull request #15684 from ctrlaltdavid/DOC-78 
DOC-78: Polish Vec3 JSDoc
 2019-06-05 16:26:32 -07:00
Roxanne Skelly
b8d6c57483
Merge pull request #15677 from roxanneskelly/bugz516 
Log socket error string when socket error happens
 2019-06-05 15:50:15 -07:00
David Rowe
42cb3d9828 Polish Vec3 API JSDoc 2019-06-06 10:26:43 +12:00
Shannon Romano
a3d3190813
Merge pull request #15678 from ctrlaltdavid/DOC-75 
DOC-75: Polish Users JSDoc
 2019-06-05 14:20:19 -07:00
Roxanne Skelly
2f2e967a92 log windows socket error code on socket error 2019-06-05 14:08:26 -07:00
David Rowe
eac7d298dc Change "privacy bubble" to "privacy shield" 2019-06-06 08:21:22 +12:00
Roxanne Skelly
04f879be3e Add additional logging on socket send error 2019-06-05 12:41:08 -07:00
Roxanne Skelly
9fb43b4930 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-05 11:08:26 -07:00
Roxanne Skelly
06ed751f56 checkpoint to deal with merge 2019-06-05 11:08:12 -07:00
jennaingersoll
dc16b678d8
Merge pull request #15679 from ctrlaltdavid/DOC-76 
DOC-76: Polish Uuid JSDoc
 2019-06-05 10:17:32 -07:00
Ken Cooke
a132dad486 On platforms where nativeFormatForAudioDevice() is reliable, do not enumerate formats 2019-06-05 07:03:18 -07:00
David Rowe
42c0362303 Fix link 2019-06-05 15:14:05 +12:00
David Rowe
ef56cba71b Polish Uuid API JSDoc 2019-06-05 14:39:27 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Shannon Romano
c48ecb5f67
Merge pull request #15674 from sethalves/quiet-some-warnings 
Quiet some warnings
 2019-06-04 17:00:54 -07:00
David Rowe
0bdca38644 Polish Users JSDoc 2019-06-05 11:46:14 +12:00
Seth Alves
02ff4ea2f5 add some comments to help future devs 2019-06-04 15:45:33 -07:00
Roxanne Skelly
512b43e1de Log socket error string when socket error happens 2019-06-04 15:18:38 -07:00
Shannon Romano
0cfc090655
Merge pull request #15664 from roxanneskelly/domaincheckin 
BUGZ-516: last-heard-from monitoring on domain server
 2019-06-04 14:48:51 -07:00
Howard Stearns
cb16ff1a1b
Merge pull request #15585 from SimonWalton-HiFi/domainlist-recv-logging 
Logging for DomainList reception & timebox overruns
 2019-06-04 14:43:25 -07:00
Seth Alves
8018a84e8b avoid div by zero 2019-06-04 13:00:26 -07:00
Seth Alves
55daef837a fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
0d2bc23a63 avoid crash on shutdown 2019-06-04 13:00:26 -07:00
Seth Alves
16d259f54f fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
32de196a2c remove some spammy logging 2019-06-04 13:00:26 -07:00
Seth Alves
8a32d230a8 avoid div by zero 2019-06-04 13:00:26 -07:00
Seth Alves
7ee64258ec fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
766a5c7f81 avoid div by zero 2019-06-04 13:00:26 -07:00
Seth Alves
8a9f3b9508 fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
50e99cc1fd fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
426f97fb35 avoid div by zero 2019-06-04 13:00:26 -07:00
Seth Alves
d1824c4d6d remove spammy log 2019-06-04 13:00:26 -07:00