Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 03:05:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
81752 commits 71 branches 56 tags 1.2 GiB
Commit graph

81752 commits

Author SHA1 Message Date
luiscuenca
e06e1bb377 Fix wheel touch interference with mac camera orbit 2019-11-18 14:49:35 -07:00
luiscuenca
1338cbd943
Fix touch event timeout on mac and allow camera orbit using the touchpad on windows 2019-11-18 11:38:12 -07:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom 2019-11-18 11:33:31 -07:00
Zach Fox
3b9a8b426f
Merge pull request from MiladNazeri/dev-2718/models-brought-in-at-incorrect-dimensions 
dev-2718/models-brought-in-at-incorrect-dimensions
 2019-11-15 15:54:08 -08:00
Shannon Romano
8d0a022f32
Merge pull request from hyperlogic/bug-fix/whoops 
Fix for inadvertent comment
 2019-11-15 15:36:51 -08:00
Zach Fox
b64ce343bd
Merge pull request from MiladNazeri/screenshareElectronApp 
Screenshare in Interface!
 2019-11-15 15:32:51 -08:00
milad
2fc0f01928 added natural dimensions after loading 2019-11-15 15:16:09 -08:00
milad
87adae6c6f cr 2019-11-15 12:48:32 -08:00
MiladNazeri
481e239a37
Update scripts/system/create/edit.js 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-11-15 12:43:25 -08:00
milad
4ae3c67493 added Entities.isLoaded 2019-11-15 11:45:05 -08:00
Anthony J. Thibault
217e17b4ac Fix for inadvertant comment 
This was likely breaking the avatar override feature.
 2019-11-15 11:19:10 -08:00
Shannon Romano
bcc058ba5f
Merge pull request from ctrlaltdavid/DEV-2769 
DEV-2769: Remove the "acceleration" entity property from Create app
 2019-11-15 09:26:33 -08:00
Shannon Romano
3c271aa27a
Merge pull request from ctrlaltdavid/DEV-2742 
DEV-2742: Fix Graphics.exportModelToOBJ() JavaScript crash
 2019-11-15 09:02:08 -08:00
Brad Hefta-Gaub
f88f5ddded
Merge pull request from highfidelity/fix-realtime-unfocused 
DEV-2760 - Fix Realtime Unfocused to be 60hz
 2019-11-14 17:37:19 -08:00
milad
b8b7e20c1a added clickToZoom header 2019-11-14 17:17:33 -08:00
Zach Fox
ee7c539d7e Add Click to Zoom to the repo and bootstrapper 2019-11-14 17:05:47 -08:00
milad
620a332199 removed old files and added new line 2019-11-14 16:12:08 -08:00
milad
664f9e2cdd newline add 2019-11-14 16:08:44 -08:00
milad
7e9f944d4b newline add 2019-11-14 16:07:05 -08:00
milad
1035467c27 newline add 2019-11-14 16:06:28 -08:00
milad
8f0d971e3a merge conflict resolution 2019-11-14 15:49:28 -08:00
milad
49d2e997bf updated readme and made sure there is an exact application title match 2019-11-14 15:47:02 -08:00
Zach Fox
5229b0c0f3 Various cleanup and CR 2019-11-14 15:45:52 -08:00
Zach Fox
e21ee20ff8 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-14 15:18:07 -08:00
David Rowe
7fbc9f5c5c emove the "acceleration" entity property from the Create app 2019-11-15 12:11:15 +13:00
milad
65089494a8 updated cmake 2019-11-14 15:09:23 -08:00
Maia Hansen
df7ad31de3
Merge pull request from AndrewMeadows/colossal-cave-redux 
DEV-1811 redux: apply entity deletion rules
 2019-11-14 12:10:23 -08:00
milad
a4ad78c337 comment updates and extra includes removed 2019-11-14 11:28:37 -08:00
Brad Hefta-Gaub
56b1be4958
Fix Realtime Unfocused to be 60hz 2019-11-14 10:21:55 -08:00
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 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
milad
90b58ebeba icon for screenshare app 2019-11-14 09:13:31 -08: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