Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-09 00:52:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84249 commits 17 branches 0 tags 1.1 GiB
Commit graph

84249 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
71cee734ec Merge branch 'master' into fix/interface-console 
# Conflicts:
#	README.md
 2020-12-18 19:44:20 +13:00
Kalila
89d1346644
Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0 
Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)
 2020-12-17 20:24:37 -05:00
Kalila
f1c9614076
Merge pull request #917 from JulianGro/gles 
Fix building with GLES 3.2 on Linux
 2020-12-17 20:23:26 -05:00
Kalila
2d22f9a395
Merge pull request #908 from ctrlaltdavid/fix/update-links 
Update GitHub links
 2020-12-16 22:13:44 -05:00
Kalila
1b26220655
Merge pull request #916 from vegaslon/documentation/contributing 
Add Tips for making pull request to CONTRIBUTING.md
 2020-12-16 20:37:25 -05:00
Adam Ivie
3a7195c21c
Remove artifact from resolving conflict 
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
 2020-12-16 18:37:19 -05:00
Julian Groß
b416ca1e17 Simplify code according to review 2020-12-16 16:50:54 +01:00
Julian Groß
dcd26c8ad6 Add comment about FILENAME being missing from ANDROID 2020-12-15 21:19:49 +01:00
Julian Groß
4e18382089 Work around android not building with set glad32es.zip filename 2020-12-15 13:53:17 +01:00
Adam Ivie
d20ffd30c6
Merge branch 'master' into documentation/contributing 2020-12-15 06:24:04 -05:00
David Rowe
086d46018b Merge branch 'master' into fix/update-links 2020-12-15 21:09:07 +13:00
ArcadeFever
65fb1320cc Upgraded Oculus SDKs to latest 2020-12-15 00:04:59 -08:00
Kalila
633c642d4a
Merge pull request #906 from vircadia/fix/update-references 
Fix/update references
 2020-12-15 01:29:47 -05:00
Julian Groß
3485efd808 Fix failing builds 2020-12-15 05:00:58 +01:00
Julian Groß
0cebb700fb Change conditionals according to review 2020-12-15 04:15:44 +01:00
Kalila
0f87e4cd86
Merge pull request #838 from ctrlaltdavid/fix/hud-recentering 
HUD overlay fixes and improvements
 2020-12-14 20:46:02 -05:00
Julian Groß
5e17639bed Fix building with GLES 2020-12-15 02:43:39 +01:00
Kalila
0d9076cccc
Merge pull request #878 from vircadia/feature/gha-sentry 
Enable crash reporting on PR builds from GHA
 2020-12-14 19:43:56 -05:00
Adam Ivie
e5802a29f1
Update CONTRIBUTING.md 
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
 2020-12-14 18:01:27 -05:00
Kalila
8c4ce96c63
Merge pull request #830 from HifiExperiments/update 
Entity update improvements 2
 2020-12-14 17:56:01 -05:00
Kalila L
261c2e6cff Final stragglers...? 2020-12-13 23:57:04 -05:00
Adam Ivie
51ebb12d29 Add Tips for making pull request to CONTRIBUTING.md 2020-12-13 21:18:12 -05:00
Kalila
1634138c62
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-13 16:24:42 -05:00
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
David Rowe
5a4210a04f Further updates 2020-12-13 21:56:03 +13:00
Kalila
a3dfa6a25b
Update BUILD_ANDROID.md 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-13 03:07:49 -05:00
David Rowe
fe7380630e Further updates 2020-12-12 21:17:53 +13:00
David Rowe
e8a2de86bb Update GitHub links 2020-12-12 20:32:02 +13: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
Kalila
16cc5304ec
Update pr_build.yml 2020-12-10 17:49:41 -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