Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 17:22:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83072 commits 21 branches 28 tags 1.2 GiB
Commit graph

83072 commits

This branch
This branch
All branches
Author SHA1 Message Date
Heather Anderson
00e8ce9bb8 Initial code pass: 
- adding migrate-from-athena (copying server state over, launching services)
- deletes all server files on purge
 2020-06-05 23:34:32 -07:00
Heather Anderson
ffc1b7ee53 Initial pass renaming athena -> vircadia 2020-06-05 23:34:31 -07:00
kasenvr
72d931688c
Merge pull request #409 from kasenvr/fix/entity-null-check 
Bugfix: Add null check to entity render clearing to fix crash.
 2020-06-05 13:09:41 -04:00
kasenvr
886f44321f
Merge pull request #421 from ctrlaltdavid/fix/fix-gha-pr-builds 
Fix GitHub Actions PR builds
 2020-06-04 23:18:22 -04:00
David Rowe
9e9469fd6d Tidy residual High Fidelity reference 2020-06-05 11:22:15 +12:00
David Rowe
ef268c6207 Fix PR builds 2020-06-05 11:21:59 +12:00
kasenvr
5f15e8df04
Merge pull request #418 from Misterblue/fix/includes-for-VS-build 
Include <stdexcept> for building on Windows10 with Visual Studio 2019
 2020-06-04 17:30:15 -04:00
kasenvr
250ec64edf
Merge pull request #410 from kasenvr/fix/vircadia-packaging 
Update packaging parameters for Vircadia
 2020-06-04 16:50:29 -04:00
Robert Adams
ee1d46af94 Include <stdexcept> so building on Windows10 with Visual Studio 2019 works. 2020-06-04 09:35:45 -07:00
kasenvr
86dbf3f3f9
Merge pull request #414 from kasenvr/fix/revert-instancing-temporarily-1 
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
 2020-06-04 00:54:10 -04:00
kasenvr
103fd8eef2
Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
kasenvr
d69c89583f
Merge pull request #394 from ctrlaltdavid/feature/enable-vr-flying 
Enable flying in VR by default
 2020-06-03 22:40:05 -04:00
kasenvr
ec9c584eaa
Merge pull request #416 from HifiExperiments/model 
Fix issues with glb urls
 2020-06-03 22:37:00 -04:00
HifiExperiments
ade6bf24bb fix issues with glb urls 2020-06-03 15:19:54 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Kasen IO
cefda3f7f2 Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
Kasen IO
94c230b78b Add null check to entity render clearing to fix crash. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-06-01 22:13:52 -04:00
kasenvr
079c0c022e
Merge pull request #406 from kasenvr/fix/entity-size-on-create 
Bugfix: Create app now uses proper dimensions on create
 2020-06-01 12:40:50 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2 
Improve performance of MyAvatar::simulate when you have lots of descendants
 2020-05-31 14:47:22 -04:00
Kasen IO
778276bb43 Adjust how check is performed. 2020-05-30 20:56:28 -04:00
Kasen IO
3c21a4d3f6 Fix Create app using naturalDimensions for all entity types. 2020-05-30 19:58:54 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1 
Merge K2.1 into Master
 2020-05-30 18:49:38 -04:00
kasenvr
41c961198c
Merge pull request #369 from AleziaKurdis/feature/zonesSelectorSorted 
Zones Selector sorted by zone names
 2020-05-29 20:44:45 -04:00
Alezia Kurdis
0b330dfcd6
Zone selector sorting vs uppercases 
This makes the sorting of the Zone in the Zone selector
with the uppercase grouped with the lowercase for a same letter
but uppercase always first.
(Note: Accented char are considered as a different letter. We would need to support exception cases for all the existing charsets. These are only entities descriptors, not really for literature.)
 2020-05-28 23:32:44 -04:00
kasenvr
1c1a24e89f
Merge pull request #278 from kasenvr/fix/other-renamings 
Docs + QML updates
 2020-05-28 03:50:20 -04:00
kasenvr
3c487106a7
Merge branch 'master' into fix/other-renamings 2020-05-28 03:46:36 -04:00
kasenvr
c13b274a8d
Merge pull request #391 from kasenvr/fix/install-packager-docs 
Update INSTALL.md
 2020-05-28 03:42:24 -04:00
Kasen IO
4f55bfe512 Update window title. 2020-05-27 18:09:01 -04:00
David Rowe
d451012d08 Enable flying in VR by default 2020-05-28 09:12:17 +12:00
kasenvr
d2fdbe280a
Update LICENSE 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-05-25 16:41:38 -04:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
kasenvr
942fee25ef
Update INSTALL.md 
Adds missing steps, fixes old ones, offers insight into a potential problem.
 2020-05-24 01:10:12 -04:00
Alezia Kurdis
b7393b2398
Make the zones sort as case insensitive 
Make the sort of the zone selector to be case insensitive.
 2020-05-23 22:54:45 -04:00
kasenvr
1101e0aa49
Merge pull request #373 from kasenvr/fix/update-more-app-k2.1 
Update More App to latest revision.
 2020-05-23 18:46:09 -04:00
Alezia Kurdis
e6d092aefe
Code Adjustment 
Code Adjustment

{
    ...
    listExistingZones.sort(zoneSortOrder());
    return listExistingZones;
}

function zoneSortOrder() {
    return function(a, b) {
        if (a.name > b.name) {
            return 1;    
        } else if (a.name < b.name) {
            return -1;
        }
        return 0;
    }
}
 2020-05-21 22:13:33 -04:00
Alezia Kurdis
3023924cf1
Minor code adjustments 
Minor code adjustments
 2020-05-20 16:11:48 -04:00
Kasen IO
9fb9b52165 Merge branch 'fix/other-renamings' of https://github.com/kasenvr/project-athena into fix/other-renamings 2020-05-20 15:08:29 -04:00
Kasen IO
c9f6f86619 Add descriptions, some still are TODO. 2020-05-20 15:08:18 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
kasenvr
e990e2d5bf
Update README_hifi.md 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-05-20 15:00:28 -04:00
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update 
Update to latest OpenVR SDK
 2020-05-20 14:03:05 -04:00
Kasen IO
8d9ad0aed4 Update More App to latest revision. 
More app now links to cdn.vircadia.com and also has a developer mode.
 2020-05-19 18:22:20 -04:00
kasenvr
22e9aec0dd
Merge pull request #296 from kasenvr/fix/qml-whitelist-default 
Add community-apps repo to default QML whitelist.
 2020-05-19 16:49:29 -04:00
daleglass
cd3eec4192
Merge pull request #346 from daleglass/remove_qstring_null 
Remove all uses of QString::null
 2020-05-19 22:36:55 +02:00
Alezia Kurdis
3a0c4e1477
Zones Selector sorted by zone names 
This change makes the Zones Selector sorted by zone names.
To address issue: renderWithZones: zone list incorrectly sorted. #354
(But this doesn't fix the problem with the scrolling)
 2020-05-18 23:48:02 -04:00
Kasen IO
fa5f19ed2c Merge branch 'fix/other-renamings' of https://github.com/kasenvr/project-athena into fix/other-renamings 2020-05-18 15:17:53 -04:00
Kasen IO
44933f0cc7 Update CONTRIBUTING.md and README.md 2020-05-18 15:17:40 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00