Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
82957 commits 2 branches 0 tags 1.1 GiB
Commit graph

8351 commits

Author SHA1 Message Date
kasenvr
ac38455d13
Merge pull request #215 from AleziaKurdis/feature/shape-alpha 
Feature/shape alpha
 2020-05-08 16:32:05 -04:00
David Rowe
c6774016b5 Further fixes 2020-05-08 15:12:09 +12:00
Alezia Kurdis
309f330af8
Merge branch 'master' into feature/shape-alpha 2020-05-07 22:59:59 -04:00
David Rowe
395f950cb3 Fix whitespace and line endings in tabs.css 2020-05-08 14:59:01 +12:00
Alezia Kurdis
67578a361e
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

3- Include tooltip for "renderWithZones" attribute (to avoid another rework on this file for PR#274) This includes some additional tooltip update done after PR215 for PR274 (no impact on functional)
 2020-05-07 22:44:35 -04:00
Alezia Kurdis
a94ed7f6c1
Minor Code Adjustments 
Minor Code Adjustments
 2020-05-06 23:37:36 -04:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
f43b0f52f5
Minor code adjustments 
Add missing space between ":" and the value for many class attributes.
 2020-05-06 23:16:56 -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
8c1d80d495
To really avoid a regression 2020-04-27 22:48:47 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
cc6fc40b0e
to avoid regression. 2020-04-27 22:19:04 -04:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Kasen IO
35da6721ea Do not cache newly installed scripts in the more app. 2020-04-13 00:24:35 -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
kasenvr
243309fdc4
Merge pull request #247 from FluffyJenkins/feature/chat 
Added license
 2020-03-30 18:50:53 -04:00
Fluffy Jenkins
f5b287b084 Added license 2020-03-30 22:10:53 +01:00
David Rowe
0bef98fd96 Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13:00
Kasen IO
46bd7e6001 Update title. 2020-03-27 14:44:33 -04:00
Kasen IO
3a4fbbc0b9 Update to explore app. 2020-03-26 22:28:39 -04:00
Alezia Kurdis
90ef2ee070
Replace Label "Allow Transition" 
Replace Label "Allow Transition" for "Allow Translation".
 2020-03-22 16:25:29 -04:00
Alezia Kurdis
c86bf3dd7d
New tooltips for the alpha properties. 
This fix replaces the text of the tooltips of all the "alpha" properties
by a more informative text for profane users.
 2020-03-20 23:01:28 -04:00
Alezia Kurdis
1f72e995d7
Fix the "outline fill" of the textEffect property 
Fix the "outline fill" of the textEffect property

The value to used was "outline fill" and not "outlineFill" as the JS doc pretends.
Issue #221 has been open to fix the JSdoc.

The usage of a space separated value has been imagined to preserve the backward compatibility of the existing script.
in order to support a list (space separated) of effects to apply instead of a single effect as today.
 2020-03-19 01:00:21 -04:00
Alezia Kurdis
1b53014030
Added 5 missing properties 
Added 5 missing properties
On "TEXT" entity:
- font
- textEffect
- textEffectThickness
- textEffectColor
On "WEB" entity:
- inputMode

Added "physics" section to "MATERIAL" entity.

Allowed negative values to be entered on the following light intensity properties:
- ZONE: keyLight intensity
- ZONE: ambientLight intensity
- LIGHT: intensity
 2020-03-18 19:39:18 -04:00
Alezia Kurdis
5fad30dc17
Added 5 missing properties 
Added 5 missing properties
On "TEXT" entity:
- font
- textEffect
- textEffectThickness
- textEffectColor
On "WEB" entity:
- inputMode
 2020-03-18 19:12:48 -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
e371823896
Move the tabs.css with other css 
Move the tabs.css with other css
 2020-03-18 18:33:09 -04:00
Alezia Kurdis
35e76610a8
Added 3 other missing properties 
Added 3 other missing properties:
- "alpha" of the "Image" Entity.
- "billboardMode" of the "Web" Entity.
- "showKeyboardFocusHighlight" of the "Web" Entity.
 2020-03-18 00:06:18 -04:00
Alezia Kurdis
500c2eff5d
Adding tooltips for 3 other missing properties 
Adding tooltips for 3 other missing properties:
- "alpha" of the "Image" Entity.
- "billboardMode" of the "Web" Entity.
- "showKeyboardFocusHighlight" of the "Web" Entity.
 2020-03-18 00:01:53 -04:00
Alezia Kurdis
1b3744ac73
Add alpha property on Shape entity 
Add the "Alpha" property on the "Shape" entity editor.

propertyID: "shapeAlpha",
propertyName: "alpha",
 2020-03-16 23:19:04 -04:00
Alezia Kurdis
f29cde66cd
Add alpha property on Shape entity 
Add the tooltip for the alpha property of Shape entity.
 2020-03-16 23:16:14 -04:00
kasenvr
d0cea34269
Merge branch 'kasen/core' into feature/default-moreapp 2020-03-16 17:58:58 -04:00
kasenvr
474770f0f2
Merge pull request #190 from kasenvr/feature/interim-goto 
Adds interim decentralizedGoTo as a default script, adds beta channel as well.
 2020-03-16 17:52:47 -04:00
kasenvr
f7e2b277bc
Merge pull request #192 from kasenvr/feature/toggle-beta-defaults 
Adds menu toggle for beta default scripts
 2020-03-16 17:51:28 -04:00
Kasen IO
5c4078320b Undo var -> const in more.html because it doesn't work, because reasons. 2020-03-16 00:39:29 -04:00
Kasen IO
3731b64b37 DisplayApp -> displayApp function name. 2020-03-16 00:28:32 -04:00
Kasen IO
391c4975fa var -> const in more.html 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-16 00:25:08 -04:00
kasenvr
c78f7a9596
Apply suggestions from code review 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-03-16 00:22:04 -04:00
Kasen IO
6420752db1 Update code formatting and add search optimization features. 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-15 23:15:20 -04:00
Kasen IO
f70a9ec4c0 Bugfixing. - authored by Keb Hellion. 2020-03-13 13:34:32 -04:00
Kasen IO
cb4407532d Type check for metadataScript.src. 2020-03-13 10:09:33 -04:00
Kasen IO
bb3da99856 Undo overwritten previous fixes to type checking. 2020-03-12 15:29:11 -04:00
Kasen IO
1f67adc6dd Fix menu unsubscribing. 2020-03-12 03:46:09 -04:00
Kasen IO
4eea4980fd Lint + fix default apps per page + fix script list loading bug. 2020-03-11 14:59:35 -04:00
David Rowe
0839d15c5a Fix button icons 2020-03-11 16:31:02 +13: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
kasenvr
db0bcb9b19
Merge pull request #184 from kasenvr/fix/chat-goto-json 
Updates the var name and URL for the goto JSON for use in chat
 2020-03-09 15:18:38 -04:00