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
84183 commits 29 branches 0 tags 1.1 GiB
Commit graph

84183 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kalila
a3dfa6a25b
Update BUILD_ANDROID.md 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-13 03:07:49 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
Kalila L
f5485e858c Licensing headers. 2020-12-10 18:56:04 -05:00
Kalila
57c83b14da
Merge pull request #708 from vircadia/dependabot/npm_and_yarn/screenshare/yargs-parser-13.1.2 
Bump yargs-parser from 13.1.1 to 13.1.2 in /screenshare
 2020-12-10 17:59:15 -05:00
Kalila
f0124de07e
Merge pull request #905 from vircadia/dependabot/npm_and_yarn/screenshare/ini-1.3.7 
Bump ini from 1.3.5 to 1.3.7 in /screenshare
 2020-12-10 17:58:16 -05:00
dependabot[bot]
15b1c51c49
Bump ini from 1.3.5 to 1.3.7 in /screenshare 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-10 22:54:46 +00:00
Kalila
3c44d11bfa
Merge pull request #894 from AleziaKurdis/CreateApp_DEC2020 
Create App. - Feature Bundle - Dec 2020
 2020-12-10 17:54:10 -05:00
daleglass
70f2866871
Merge pull request #860 from makitsune/fix-alt-on-linux 
Fix alt key on Linux
 2020-12-10 23:45:55 +01:00
Alezia Kurdis
536bf4ef90
2 large import button in Desktop 
In Desktop mode, the 2 import buttons
are now one over the other and full width.
The text was overlapping with the default Create Tools window size.
 2020-12-04 23:50:44 -05:00
Alezia Kurdis
726901b087
Make the Create Tool window larger by default 
Previously it was 490px wide (in Desktop)
Now it will be 750 px wide (in Desktop)
The properties tab is now with an acceptable size by default. (which is closer to the landscape display we have in HMD.)

No change in HMD or in-Tablet display.
 2020-12-04 23:47:38 -05:00
kasenvr
ec1c8f2b87
Merge pull request #891 from JulianGro/ubuntu_20_04_cmake 
Fix hifi_qt.py reporting Ubuntu 20.04 as outdated
 2020-12-03 17:47:33 -05:00
kasenvr
248de8f666
Merge pull request #879 from kasenvr/feature/crash-rpt-cmd-option 
Initial add of crash report arg option.
 2020-12-03 17:46:12 -05:00
kasenvr
0f93c415ac
Merge pull request #895 from kasenvr/fix/master-references 
Fix references 'kasen/core' -> 'master'
 2020-12-02 22:20:59 -05:00
Alezia Kurdis
670d832c8b
Minor code change 
Minor code change
 2020-12-01 23:32:52 -05:00
Alezia Kurdis
5a71881799
Minor code changes 
Minor code changes
 2020-12-01 23:04:10 -05:00
Alezia Kurdis
510eb08be1
Replace Overlays by Local Entities 
1- Replace Overlays by Local Entities
2- Add the missing header with copyright and license 
(I have assumed that the author was the same person that make the grid parameter that is referenced there and only used in create App.)
3- Minor requested code change (0.0 instead of 0 in condition using real numbers)
 2020-12-01 22:56:17 -05:00
kasenvr
86cbcb53a3
Merge pull request #882 from ctrlaltdavid/fix/jsdoc-typo 
Fix JSDoc typo
 2020-12-01 05:58:31 -05:00
Kalila L
0575971d12 Fix references 'kasen/core' -> 'master' 2020-12-01 05:58:01 -05:00
Alezia Kurdis
bbde93f54b
Add Grid Actions Shortkeys 
Add Grid Actions Shortkeys

Toggle Grid	G
Activate/Deactivate Snap to Grid	H
Align Grid to Selected Entities	J
Align Grid to Avatar	K
 2020-12-01 00:15:15 -05:00
Alezia Kurdis
71d0fb52e2
Add Grid Actions Shortkeys 
Add Grid Actions Shortkeys

Toggle Grid	G
Activate/Deactivate Snap to Grid	H
Align Grid to Selected Entities	J
Align Grid to Avatar	K
 2020-12-01 00:14:15 -05:00
Alezia Kurdis
6a31c19747
Add Grid Actions Shortkeys 
Add Grid Actions Shortkeys

Toggle Grid	G
Activate/Deactivate Snap to Grid	H
Align Grid to Selected Entities	J
Align Grid to Avatar	K
 2020-12-01 00:13:26 -05:00
Alezia Kurdis
1f20536574
Add Grid Actions Shortkeys 
Add Grid Actions Shortkeys

Toggle Grid	G
Activate/Deactivate Snap to Grid	H
Align Grid to Selected Entities	J
Align Grid to Avatar	K
 2020-12-01 00:12:27 -05:00
Alezia Kurdis
64caa54d08
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:38:31 -05:00
Alezia Kurdis
889b74dd04
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:37:48 -05:00
Alezia Kurdis
7d364add66
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:37:18 -05:00
Alezia Kurdis
21eee3c24e
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:36:15 -05:00
Alezia Kurdis
ab999e529d
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:35:15 -05:00
Alezia Kurdis
af9367ae29
Create App "tools" menu implementation 
Create App "tools" menu implementation
 2020-11-30 00:34:09 -05:00
Julian Groß
dec726b976 Update hifi_qt.py to recognize ubuntu version over 19.10 as not supported yet. 2020-11-28 23:30:34 +01:00
Alezia Kurdis
76b7ca9779
Merge pull request #2 from kasenvr/master 
Upgrade to current master
 2020-11-28 15:11:39 -05:00
kasenvr
6b320899d6
Merge pull request #863 from daleglass/upgrade-tbb 
Upgrade tbb to fix a startup crash on Fedora 32 and later
 2020-11-28 14:20:31 -05:00
kasenvr
60e59abe47
Merge pull request #874 from AleziaKurdis/CreateApp_Issue869 
Fix new Zones appearing as parent of a ghost child
 2020-11-28 14:19:07 -05:00
kasenvr
0157d5f804
Merge pull request #887 from daleglass/fix-ati-auto-vram 
Fix getting the free VRAM on ATI cards
 2020-11-28 14:17:02 -05:00
Dale Glass
182302c3e7 GL_TEXTURE_FREE_MEMORY_ATI returns 4 values, not just 1 
This should fix a buffer overflow that happens on ATI cards.
 2020-11-28 02:07:08 +01:00
kasenvr
9b253c3a32
Update interface/src/main.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-11-25 16:27:46 -05:00
kasenvr
4e1b6838cc
Merge pull request #871 from kasenvr/revert-868-revert-659-scriptEngine 
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""
 2020-11-24 18:43:33 -05:00
kasenvr
78214b15d9
Merge pull request #881 from ctrlaltdavid/fix/gha-master-target 
Fix GHA master build target branch
 2020-11-24 18:43:13 -05:00
kasenvr
fe9e32fa5c
Merge pull request #615 from HifiExperiments/gha 
Playing with GHA
 2020-11-24 18:42:33 -05:00
David Rowe
eb70d15f77 Fix JSDoc typo 2020-11-23 19:13:48 +13:00
Alezia Kurdis
343ded8c6f
Minor code adjustments 
Minor code adjustments
 2020-11-21 22:02:49 -05:00
David Rowe
c4092a35e3 Fix GHA master build target branch 2020-11-22 14:08:36 +13:00
Alezia Kurdis
b633bc4a16
Excluding EntityShapeVisualizer from Children list 
Excluding EntityShapeVisualizer from Children list
Now a name is given to the EntityShape of the EntityShapeVisualizer (used to display the zone)
so we can now exclude them from the children list when it's time to figure if there are children for an entity.
(This is a better approach than excluding al the local entities)
The name has been used because it gives better results than trying to use the id map that arrive always too late.
The name is unique for a session, it includes a UUID.
 2020-11-21 15:44:15 -05:00
Alezia Kurdis
00575ae8f8
Excluding EntityShapeVisualizer from Children list 
Excluding EntityShapeVisualizer from Children list
Now a name is given to the EntityShape of the EntityShapeVisualizer (used to display the zone)
so we can now exclude them from the children list when it's time to figure if there are children for an entity.
(This is a better approach than excluding al the local entities)
The name has been used because it gives better results than trying to use the id map that arrive always too late.
The name is unique for a session, it includes a UUID.
 2020-11-21 15:43:12 -05:00
Kalila L
f7b0437bc8 Initial add of crash report arg option. 2020-11-21 00:03:56 -05:00
Alezia Kurdis
22abf1c2c4
Fix for Issue 869 
This excludes the local and avatar entities from what is returns by Entities.getChildrenIDs
to avoid the selection tools of the Zone entities to be considered as Children of it.
This was necessary for the display of the hierarchy status, but also for the "Add Children to Selection".
 2020-11-18 23:15:23 -05:00
Alezia Kurdis
031b3985b0
Fix for Issue 869 
This excludes the local and avatar entities from what is returns by Entities.getChildrenIDs
to avoid the selection tools of the Zone entities to be considered as Children of it.
This was necessary for the display of the hierarchy status, but also for the "Add Children to Selection".
 2020-11-18 23:14:34 -05:00
HifiExperiments
8047887685
Merge branch 'master' into gha 2020-11-18 17:01:16 -08:00
kasenvr
db2133115d
Merge pull request #872 from ctrlaltdavid/fix/pr-gha 
Replace set-env in PR GHA
 2020-11-18 19:49:25 -05:00
HifiExperiments
1e07971d10 how about this 2020-11-18 11:04:09 -08:00
David Rowe
e8520becd6 Syntax 2020-11-18 21:11:48 +13:00