Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 07:29:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82888 commits 74 branches 59 tags 1.2 GiB
Commit graph

69 commits

Author SHA1 Message Date
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
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -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
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
Alezia Kurdis
fa7143c87e
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:35:48 -05:00
Alezia Kurdis
0eb6f1f183
Fix page height blocking dropdown 
Fix the page height that blocked the correct use of the shape dropdown.
The layout looks more stable now.
 2020-02-29 15:52:06 -05:00
Alezia Kurdis
29e780e3f1
Sections reorganization 
1- Section "behavior" is now split in 2 sections: "behavior" and "scripts"

2- Particles sections: "particles_acceleration" and "particles_spin" 
has been joined as a new section: "particles_behavior"

3- Particles section: "particles_alpha"  has been merged under  section: "particles_color"
 2020-02-29 14:07:15 -05:00
Alezia Kurdis
bb422a3832
Icons for sections reorganization 
behavior will be split: behavior,  scripts
particles_behavior will replace: particles_acceleration and particles_spin
 2020-02-29 14:02:57 -05:00
Alezia Kurdis
2bd0950a01
Delete particles_spin.png 
Not going to be used.
 2020-02-29 14:00:10 -05:00
Alezia Kurdis
fd0186f997
Delete particles_acceleration.png 
No going to be used.
 2020-02-29 13:59:38 -05:00
Alezia Kurdis
3c4e073874
Properties Editor using tabs 
Properties Editor using tabs instead of collapsible sections to avoid painful scrolling.
 2020-02-28 23:52:24 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
Marcus Llewellyn
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
Shannon Romano
a5943f8ac8
Merge pull request #16443 from ctrlaltdavid/DEV-2646 
DEV-2646: Use Alt to clone entities on Mac
 2019-11-19 14:02:10 -08:00
milad
2fc0f01928 added natural dimensions after loading 2019-11-15 15:16:09 -08:00
milad
87adae6c6f cr 2019-11-15 12:48:32 -08:00
MiladNazeri
481e239a37
Update scripts/system/create/edit.js 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-11-15 12:43:25 -08:00
milad
4ae3c67493 added Entities.isLoaded 2019-11-15 11:45:05 -08:00
David Rowe
7fbc9f5c5c emove the "acceleration" entity property from the Create app 2019-11-15 12:11:15 +13:00
David Rowe
45eda40466 Enable Alt action for cloning on Mac 2019-11-13 10:48:08 +13:00
Shannon Romano
895619c71f
Merge pull request #16461 from ctrlaltdavid/DEV-2649 
DEV-2649: Fix entities list "filter to frustum" eye button
 2019-11-08 10:28:24 -08:00
Shannon Romano
79df071c23
Merge pull request #16468 from RebeccaStankus/webEntities 
Made web entities not grabbable by default
 2019-11-08 10:27:44 -08:00
Sabrina Shanman
9180a639df
Merge pull request #16440 from ctrlaltdavid/DEV-2648 
DEV-2648: Fix Cmd-click multi-select in entity list on Mac
 2019-11-07 14:06:39 -08:00
Sabrina Shanman
deceb16a9b
Merge pull request #16451 from ctrlaltdavid/DEV-2650 
DEV-2650: Remove "user" icon from Entities List
 2019-11-07 13:59:28 -08:00
Rebecca Stankus
4173cc46e2 Made web entities not grabbable by default 2019-11-06 14:11:17 -08:00
Zach Fox
a2f784d225 DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI 2019-11-06 11:26:10 -08:00
David Rowe
eeceec35d6 Fix entities list "filter to frustum" button 2019-11-06 12:22:45 +13:00
David Rowe
5fb18566fe Use Alt to clone entities on Mac 2019-11-06 09:55:16 +13:00
David Rowe
a8173e9477 Remove "user" icon from Entity List 2019-11-05 13:55:31 +13:00
David Rowe
7db99cce6b Fix Cmd-clone entities on Mac 2019-11-02 12:07:11 +13:00
David Rowe
4e12750255 Typo 2019-11-02 11:00:16 +13:00
David Rowe
3bb65edafb Fix Cmd-click multi-select in entity list on Mac 2019-11-02 09:51:21 +13:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
Ryan Huffman
8b2c935f92
Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate 
Make Create app use Ctrl key to duplicate entities instead of Alt
 2019-07-23 08:52:22 -07:00
David Rowe
f2d591dbe9 Take no action if Alt is pressed at mouse-down 2019-07-12 21:28:44 +12:00
David Rowe
db1137fa0f Use Ctrl to duplicate entities instead of Alt 2019-07-12 21:27:33 +12:00