Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 02:10:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83226 commits 71 branches 59 tags 1.2 GiB
Commit graph

8421 commits

Author SHA1 Message Date
Kasen IO
16ef73c6f7 Merge branch 'master' into fix/chat-optimizations 2020-06-30 19:06:47 -04:00
kasenvr
c3c6ad47da
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-30 18:57:32 -04:00
kasenvr
555dd8fe98
Update scripts/communityScripts/chat/FloofChat.html 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-30 03:03:20 -04:00
kasenvr
82638e47c4
Merge pull request #476 from ctrlaltdavid/fix/update-more-app 
Update More app from community apps repo
 2020-06-29 23:18:03 -04:00
Kasen IO
c289434f01 Don't play sound if user sends msg, make localOnly, lower volume. 2020-06-29 22:06:20 -04:00
Kasen IO
baa24c311e Add notification sound + muting system. 2020-06-29 21:52:58 -04:00
Kasen IO
580d4826e9 Fix line lengths. 2020-06-27 14:25:15 -04:00
Kasen IO
6c3340051e Add external URL launching. 2020-06-27 01:08:55 -04:00
Kasen IO
dc5418748d Fix time and date formatting. 2020-06-27 00:43:39 -04:00
Kasen IO
394c9e2175 Chat window resize, shrink text size and boxes, add date to timestamp. 2020-06-26 21:48:58 -04:00
Kasen IO
968fd2b72d Move chat to correct folder. 2020-06-26 18:46:30 -04:00
Kasen IO
fc418fa9e4 Remove script that no longer exists created by the Vive Pro Eye PR. 2020-06-23 15:57:15 -04:00
David Rowe
84a2fe061f Update More app from community apps repo 2020-06-23 20:27:08 +12:00
kasenvr
4cc31fc427
Merge pull request #442 from kasenvr/fix/fix-model-scale-create-app 
Fix models not scaling correctly when loading due to timeout.
 2020-06-20 17:09:09 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand 
Rebranding stuff
 2020-06-18 17:12:47 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
Kasen IO
3e585267e4 Fix gizmo size issue post auto-resize of a new model. 2020-06-18 01:11:07 -04:00
David Rowe
189f6f5440 Code review 2020-06-15 08:04:51 +12:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
kasenvr
2ae304864e
Merge pull request #439 from kasenvr/fix/remove-goto 
Remove old goto, update Explore app.
 2020-06-11 17:24:48 -04:00
Kasen IO
3910448367 Fix models not scaling correctly when loading due to timeout. 2020-06-11 15:36:13 -04:00
Kasen IO
8a2b6fcb0a Convert == to === in various places. 2020-06-10 19:18:25 -04:00
kasenvr
1d0cbe04c8
Update scripts/communityScripts/explore/explore.html 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-10 19:16:49 -04:00
Kasen IO
05837d178a Update Explore app to latest. 2020-06-10 13:33:33 -04:00
Kasen IO
6e7b3a387d Remove old goto, update community-apps beta link. 2020-06-10 02:54:42 -04:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
David Rowe
6df34d2a89 Reduce minimum inspect distance 2020-06-08 08:10:19 +12: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
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
David Rowe
b32bdba111 Reinstate controller module priorities per master 2020-05-26 14:58:27 +12:00
David Rowe
c05225ca2f Reinstate nearParentGrabOverlay controller module 
Fixes regression where tablet becomes large when grabbed if avatar is
small.
 2020-05-26 14:58:13 +12: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
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
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02: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
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
Alezia Kurdis
3023924cf1
Minor code adjustments 
Minor code adjustments
 2020-05-20 16:11:48 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -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
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
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
MotoFufu9k
dd9728a09f
Change standard grabbable setting to false 2020-05-13 23:06:36 +02:00
Alezia Kurdis
5d00341662
Correct value to ENTIRE_DOMAIN_SCAN_RADIUS 
Set the correct value to constant: ENTIRE_DOMAIN_SCAN_RADIUS

var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
to reach all the entities of a domain from the center,(including in the corners) the radius must be:
sqr((16000 ^2) + (16000) ^2 + (16000 ^2))
which is once rounded = to 27713.
 2020-05-09 15:24:18 -04:00
Alezia Kurdis
d575616a6d
Code Adjustments. 
Constant used for ENTIRE_DOMAIN_SCAN_RADIUS instead of 17000
Missing spaces,
and line too long being adjusted.
 2020-05-09 15:08:38 -04:00