Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 13:50:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
84268 commits 69 branches 56 tags 1.2 GiB
Commit graph

84268 commits

This branch
This branch
All branches
Author SHA1 Message Date
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
6d1667df5a better picking against billboarded shapes other than spheres 2021-01-10 16:48:44 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
Kalila
165537a4eb
Merge pull request #944 from HifiExperiments/physicsFix 
Possible fix for bad physics performance
 2020-12-30 03:04:17 -05:00
HifiExperiments
0f9f95f716 possible fix for physics 2020-12-28 23:46:37 -08:00
daleglass
f894a0a141
Merge pull request #877 from vircadia/feature/domain-server-reporting-socket 
Send address and port with each metaverse heartbeat.
 2020-12-26 20:40:58 +01:00
Kalila
df1feaf4f1
Merge pull request #907 from AleziaKurdis/CreateApp_DEC2020_Material_Icons 
Create app dec2020 material icons
 2020-12-24 17:24:33 -05:00
Kalila
f1576aba78
Merge pull request #824 from ctrlaltdavid/fix/interface-console 
Remove "Console" options from Interface-only installer (Windows)
 2020-12-20 16:34:25 -05:00
David Rowe
71cee734ec Merge branch 'master' into fix/interface-console 
# Conflicts:
#	README.md
 2020-12-18 19:44:20 +13:00
Alezia Kurdis
7ff8236da2
Minor Code Adjustments 
Minor Code Adjustments
 2020-12-17 22:07:11 -05: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
5c9b1edb86 Convert QString to QJsonObject. 2020-12-14 01:03:36 -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
0468c98c30 CR, move duplicate consts to top of file. 2020-12-11 15:55:24 -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
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
28e53c9c86
Migrate from 3dImage Overlay to Local Entities 
Migrate from 3dImage Overlay to Local Entities
 2020-12-08 23:54:32 -05:00
Alezia Kurdis
aea3e7936f
Add Material icons in edit mode 
1- This adds a new Material icon to identify the material entities that are linked to a parent.
Since those material entities become invisible, this help to figure their presence.

2- The Create App - Preference: "Show Zones in Create Mode"
has been removed, since it was doing nothing for a couple of years now.
the method behind is still in the API, but do nothing. 
(abandoned since it was only drawing a box that wasn't useful to figure the shape of the zone)
There was no real value to bring this back in a different way.

3- The Create App - Preference: "Show Lights and Particle Systems in Create Mode"
has been renamed for "Show Icons in Create Mode"
since this setting was also managing all the icons (including Zones and now the Parented Materials)
The objective of the setting is mainly to simplify the display at the edit when a scene is very dense.
(In the future, we might want to make this "à la carte". For now, I think we can try as is. )
 2020-12-08 23:52:04 -05:00