Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
82053 commits 29 branches 0 tags 1.1 GiB
Commit graph

82053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
ec872bfcf8 remove unused variable 2019-11-14 09:59:43 -08:00
Andrew Meadows
7692e858a1 use EntityItemID rather than QUuid 2019-11-14 09:59:43 -08:00
Andrew Meadows
9dd0105ba5 only one copy of entityIDs instead of two 2019-11-14 09:59:43 -08:00
Andrew Meadows
dbeea4038d remove unused argument 2019-11-14 09:59:43 -08:00
Andrew Meadows
b5ca93a019 remove redundant checks in 'if' clause 2019-11-14 09:59:43 -08:00
Andrew Meadows
b231dadba5 add check for local-entity when changing phys properties 2019-11-14 09:59:43 -08:00
Andrew Meadows
28f51f6204 add comments 2019-11-14 09:59:43 -08:00
Andrew Meadows
de44cdaf25 remove unnecessary check in if clause 2019-11-14 09:59:43 -08:00
Andrew Meadows
0f2d9027e1 fix indentation 2019-11-14 09:59:43 -08:00
Andrew Meadows
039f7cae13 avoid Qt container in another spot 2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a use std::vector<> instead of QVector<> 2019-11-14 09:59:43 -08:00
Andrew Meadows
fb090d1388 force delete OtherAvatar entities when necessary 2019-11-14 09:59:43 -08:00
Andrew Meadows
4159bc4862 abide by domain-entity hierarchy deletion rules 2019-11-14 09:59:43 -08:00
Andrew Meadows
4e6a647718 don't restrict edit properties of myAvatarEntity 2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
milad
82c85b51df cleanup 2019-11-14 09:54:41 -08:00
Shannon Romano
ba60f5e96d
Merge pull request #16494 from hyperlogic/bug-fix/revert-safe-landing-fix 
Revert safe landing "fix"
 2019-11-14 09:52:14 -08:00
milad
d664b9e118 removed icon log 2019-11-14 09:28:05 -08:00
DouglasWilcox
11e1c4e6fe linear acceleration experiment 2019-11-14 09:23:16 -08:00
milad
90b58ebeba icon for screenshare app 2019-11-14 09:13:31 -08:00
David Rowe
ef45a6092f Polishing 2019-11-14 16:07:00 +13:00
David Rowe
c44c7dd85e AudioStats JSDoc 2019-11-14 15:57:51 +13:00
Zach Fox
b4135e2655 We are so close... 2019-11-13 17:35:57 -08:00
Anthony Thibault
929e829801 Revert "Speculative fix for infinite loop in SafeLanding" 
This reverts commit 52acfc9333.
 2019-11-13 17:17:37 -08:00
Anthony Thibault
487515d956 Revert "bug fix from code review comment" 
This reverts commit e81b21ac59.
 2019-11-13 17:17:17 -08:00
Zach Fox
8255210c6a Add new screenshare error signals 2019-11-13 15:43:41 -08:00
ingerjm0
ed9db81bed Fix for displaying moved properties' documentation in docs 2019-11-13 14:58:32 -08:00
Shannon Romano
e1fc666b0f
Merge pull request #16479 from hyperlogic/bug-fix/safe-landing-deadlock 
Speculative fix for infinite loop in SafeLanding
 2019-11-13 14:47:41 -08:00
Zach Fox
50a1ebaa4d Call stopScreenshare when screenshare app closed 2019-11-13 14:24:01 -08:00
Anthony Thibault
a06905e6d0
Merge pull request #16488 from hyperlogic/bug-fix/android-t-pose 
Bugfix for t-pose avatar when moving
 2019-11-13 14:07:36 -08:00
DouglasWilcox
b8e85aedc7 Merge branch 'master' into improve_seated_rotation 2019-11-13 13:11:30 -08:00
milad
9ebe7067c5 fixed the ordering of selects 2019-11-13 13:08:34 -08:00
milad
c6c9059a29 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-13 13:06:12 -08:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing 
Fix code style / remove cruft
 2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
Zach Fox
61f0896e30 Fix small bugs with the HTTP request to screenshare endpoint 2019-11-13 12:35:01 -08:00
David Rowe
1145bc8904 Fix Graphics.exportModelToOBJ() JavaScript crash 2019-11-14 08:43:51 +13:00
Anthony J. Thibault
e81b21ac59 bug fix from code review comment 2019-11-13 10:40:00 -08:00
milad
abf592f533 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-13 10:14:14 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro 
DEV-2711: Fix crash when highlighting custom pipeline shapes
 2019-11-13 09:50:16 -08:00
Brad Hefta-Gaub
0dd764cd29
Merge pull request #16487 from amerhifi/resetAudio 
case DEV-2709: reset QAudioDevInfo on switch
 2019-11-13 09:48:33 -08:00
Anthony J. Thibault
b92badbe76 Updated avatar-animation-optimized-ik.json from latest avatar-animation.json 2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1 Merge branch 'master' into bug-fix/android-t-pose 2019-11-13 08:21:19 -08:00
ingerjm0
417856fec4 JSDoc updates for PR16399 2019-11-12 20:45:20 -08:00
amerhifi
3939c7e6fd adding qaudio reset on switch. 2019-11-12 17:07:43 -08:00
Zach Fox
b0c578aa7f Improved HTTP request to proper endpoint - won't work until PR16459 is merged 2019-11-12 17:06:35 -08:00
Andrew Meadows
1c399f5e9b add doc about PICK_BYPASS_IGNORE Pick FilterFlag 2019-11-12 16:58:09 -08:00
amerhifi
d7fbd1e2d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-12 16:57:47 -08:00
milad
ea8e285793 Zach's ss cpp cleanup changes 2019-11-12 16:02:52 -08:00