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

83993 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dale Glass
8761b26079 Remove unused variable 2020-09-26 23:01:05 +02:00
Dale Glass
2fac1ddf2c Add missing 'override' 
Fixes:
warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override]
 2020-09-26 22:58:44 +02:00
kasenvr
ac6486052d
Merge pull request #605 from kasenvr/feature/transparent-web-entities 
Transparent Web Entities
 2020-09-26 01:26:09 -04:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
kasenvr
faadb9e340
Merge pull request #668 from kasenvr/fix/URL-migrations 
New Metaverse PR
 2020-09-26 01:21:17 -04:00
Alezia Kurdis
d72f707862
Add the support for HMD buttons 
This adds the support for 6 new buttons:
Copy-Cut-Paste-Duplicate-Undo-Redo

It adds the automatic toggling of the HMD only buttons:
Copy-Cut-Paste-Duplicate
 2020-09-26 00:55:16 -04:00
Alezia Kurdis
41ef2fafce
Add 6 new buttons 
4 buttons for HMD enforce to be hidden by default. (Copy - Cut - Paste - Duplicate)
2 button (Undo and Redo)
 2020-09-26 00:50:49 -04:00
Alezia Kurdis
ab45a32fea
Add new button in HMD 
Add new button in HMD:
- add undo and redo support
- add HMD detection
 2020-09-26 00:46:32 -04:00
Alezia Kurdis
08038fb1bc
New css for new buttons and icons 
New css for new buttons and icons
for the Create App. new HMD button for copy, cut, paste, duplicate, undo and redo.
 2020-09-26 00:42:19 -04:00
Alezia Kurdis
4f353ec668
New fonts for pictograms 
New fonts for pictograms
since "hifi-glyphs.ttf" has no more room for new icons.

This contains icons for copy, cut, paste, duplicate, undo, redo... and a V logo.
 2020-09-26 00:38:53 -04:00
Kalila L
46875a6cf1 Update tutorial to Vircadia EU CDN. 2020-09-25 20:55:57 -04:00
Kalila L
a90af38921 Fix badly formatted JSON metadata being sent to metaverse. 2020-09-25 20:55:43 -04:00
Alezia Kurdis
7612b71455
Merge pull request #6 from kasenvr/master 
Upgrading
 2020-09-24 23:01:15 -04:00
Kalila L
9e8dc88f63 Fix temporary place name assignment. 2020-09-24 18:06:39 -04:00
Kalila L
a965ac8591 Fix some weird context. 2020-09-24 17:30:15 -04:00
kasenvr
1c818bc8eb
Merge pull request #657 from daleglass/fix-build-on-qt-5.14 
Fix build on qt 5.14
 2020-09-24 17:11:42 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings 
Fix warnings emitted by GCC
 2020-09-24 17:06:16 -04:00
daleglass
fffb6619b3
Update libraries/shared/src/BufferParser.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-24 22:17:22 +02:00
daleglass
ed4164b59e
Update libraries/shared/src/GeometryUtil.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-24 22:17:16 +02:00
Kalila L
2c1a51e7c4 Remove inventory app from defaultScripts.js 2020-09-24 16:03:27 -04:00
kasenvr
d46c6c192e
Merge pull request #753 from daleglass/improve-url-migrations 
Sanitize URLs in ExternalResources
 2020-09-24 15:40:30 -04:00
Dale Glass
9b4d115a5d Review fixes 
Make it ignore a // at the beginning of the URL
 2020-09-24 19:37:14 +02:00
Alezia Kurdis
826991d6b4
Code Adjustments and Optimizations 
Remove an unused commented const.
Generate all the material using a centralized function, using an array to store the keys. 
Make them deleted by iteration on this array.
Using now defaultFallthrough = true instead of setting albedo to fallthrough.
Replace "materialMappingMode" "projected" for "uv"
Added "ignorePickIntersection": true on the Material entities
 2020-09-23 22:28:52 -04:00
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04:00
Dale Glass
1d58ac4d79 Sanitize the URL further by removing leading slashes and any duplicated ones 2020-09-23 23:33:22 +02:00
Dale Glass
b243d382fc Fix warning due to multiline comment 2020-09-23 22:34:01 +02:00
kasenvr
892f97d38d
Merge pull request #751 from ctrlaltdavid/fix/external-resource 
Fix/external resource
 2020-09-23 15:40:33 -04:00
David Rowe
32b7823a73 Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource 
# Conflicts:
#	libraries/networking/src/ExternalResource.h
 2020-09-23 23:25:42 +12:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
32efb2443e Don't store current CDN paths in Interface.json at present 2020-09-23 22:15:40 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
kasenvr
d6932aa540
Merge pull request #632 from Misterblue/fix/add-get-temp-name 
Add --get-temp-name to domain-server invocation in creation of Docker
 2020-09-23 04:13:05 -04:00
Kalila L
24d4076079 Fix another URL. 2020-09-23 03:56:50 -04:00
Kalila L
560a1a7119 Update sandbox URL. 2020-09-23 03:29:03 -04:00
Kalila L
ec15b51110 Fix typo. 2020-09-23 02:52:20 -04:00
kasenvr
567c3475c5
Merge pull request #654 from Madders/feature/update-explore-ui 
Updated the Explore app UI
 2020-09-23 02:04:20 -04:00
Kalila L
ed5a7e82d7 Fix default URLs for edit.js 2020-09-23 01:57:00 -04:00
David Rowe
ba7242f4dc Script.getExternalPath() and related JSDoc 2020-09-23 17:23:40 +12:00
Kalila L
b493f0c51d Alter icon positions, colors, combine visit and search box. Add tooltips for some buttons. 2020-09-23 01:22:04 -04:00
Kalila L
2d871a8f88 Add hover effect for cards and fix description for add location. 2020-09-23 00:54:50 -04:00
Kalila L
1c9e1dd160 Remove redundant buckets. 2020-09-23 00:14:31 -04:00
Kalila L
3866bf478b Fix icon resolutions. 2020-09-23 00:04:27 -04:00
kasenvr
dcf1e41086
Update libraries/entities/src/EntityScriptingInterface.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-22 23:49:07 -04:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
ff46a40741 Update avatarbookmarks.json and allow parsing of new 'avatarIcon' property. 2020-09-22 20:16:15 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
kasenvr
79d34f6f1c
Merge pull request #748 from ctrlaltdavid/fix/screenshare-crash 
Fix Interface start-up crash on Windows
 2020-09-22 15:43:20 -04:00
David Rowe
4959ca4975 Move ExternalResource call into method 
Fixes Interface crash on Windows.
 2020-09-22 20:52:52 +12:00
David Rowe
3344c7423d Fix up types 2020-09-22 20:52:15 +12:00
Kalila L
085bdf0016 Merge branch 'master' into pr/654 2020-09-22 01:55:24 -04:00