Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 17:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83568 commits 71 branches 56 tags 1.2 GiB
Commit graph

103 commits

Author SHA1 Message Date
Kasen IO
3e585267e4 Fix gizmo size issue post auto-resize of a new model. 2020-06-18 01:11:07 -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
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
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
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
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
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
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
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
Alezia Kurdis
6357dd91f5
Fix EOL from Windows to Unix 
Fix EOL from Windows to Unix
 2020-05-09 02:50:16 -04:00
Alezia Kurdis
c96591367b
Fix the wrong merge 2020-05-08 23:41:52 -04:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI 2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs 
Merge the "screenshare" modifs with renderWithZones update
 2020-05-08 15:16:38 -04:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes. 
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611

2- Include merge for conflict (not detected by Github) for "screenshare" attribute
 2020-05-07 22:46:35 -04:00
Alezia Kurdis
91d234589e
Minor Code Adjustment 
Minor Code Adjustment
and uncommented the new property renderWithZones
 2020-05-06 23:39:11 -04:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
cc308c11b6
Minor Code Adjustment 
Line 50: removed extra space char.
 2020-05-06 23:06:33 -04:00
Alezia Kurdis
1671887602
Merge branch 'master' into kasen/core 2020-04-29 12:02:12 -04:00
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file 2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare 
Adding field screenshare
to avoid conflict
 2020-04-27 22:05:24 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Alezia Kurdis
9c5f8fc946
Typo 
missing dot.
 2020-04-05 02:18:51 -04:00
Alezia Kurdis
6d33713e35
Better tooltip for renderWithZones property 
Better tooltip for renderWithZones property
 2020-04-05 02:14:10 -04:00
Alezia Kurdis
cdef49d633
Fix tooltip text for particles alpha properties 
Fix the tooltip's text for particle alpha properties.
 2020-04-04 22:18:59 -04:00
Alezia Kurdis
4a3405484c
Add new property "renderWithZones" 
Add the new property "renderWithZones" to the Create App.
For this, a new type of renderer type has been added: "Multiple Zones Selector".
(Required for the PR#78)
 2020-04-03 23:43:36 -04:00
Alezia Kurdis
16c5d8c051
Support for "Multiple Zones Selector" Renderer 
Add the code to expose the Zones list to the entityProperty.
as support for the new "Multiple Zones Selector" Renderer type.
(Required to support the new property "renderWithZones" for PR #78)
 2020-04-03 23:37:18 -04:00
Alezia Kurdis
0afca55e18
Add the new property "renderWithZones" 
This adds the Tooltip for new property "renderWithZones"
(Required for PR#78)
 2020-04-03 23:32:45 -04:00
Alezia Kurdis
e52e1bafc6
Moved tabs.css reference 
-Change the path for the new location of tabs.css
-Local "style" migrated to "class"
 2020-03-18 18:38:41 -04:00
Alezia Kurdis
022ea6c5fb
Moved tabs.css to system/html/css 
Moved tabs.css to system/html/css
with other css.
 2020-03-18 18:34:51 -04:00
Alezia Kurdis
8ab40e1a08
Fix the userData and materialData editor 
Fix the userData and materialData editor.
Only 2 conditions have been modified to make it works.
I have removed a significant quantity of dead code
that was trying to overlay a static text an obscure reason.
Please, retest this. In case I missed something that I don't know.
 2020-03-10 00:48:54 -04:00
Alezia Kurdis
d934018c7b
Codes minor adjustments 
Codes minor adjustments.
Some formatting issues.
Use element instead of a string
 2020-03-04 18:42:57 -05:00
Alezia Kurdis
206b1b12c5
Additional fixes about the formatting. 
Additional fixes about the formatting.
 2020-03-04 18:26:23 -05:00
Alezia Kurdis
ed9918a537
Fix for the multiselection. 
This is the fix for the multiselection case.
(It doesn't include the solution for User Data.)
 2020-03-03 19:21:14 -05:00
Alezia Kurdis
e6a45690ba
Color Adjustments 
The color has been attenuated on those 2 icons.
It was too present compared to the others.
 2020-03-02 23:53:55 -05:00
Alezia Kurdis
d1c641de49
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:13:47 -05:00
Alezia Kurdis
4a1926a901
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:11:45 -05:00
Alezia Kurdis
124b3fe6a2
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:10:33 -05:00
Alezia Kurdis
f3096ae74d
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:37:44 -05:00
Alezia Kurdis
5c7e6e43c2
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:36:43 -05:00