Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 08:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66210 commits 74 branches 59 tags 1.2 GiB
Commit graph

4019 commits

Author SHA1 Message Date
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
John Conklin II
16bb992d8d
Merge pull request #12557 from druiz17/correctly-use-defaults-values 
correctly use default values and don't delete userData in entitiesProperties.js
 2018-03-05 13:15:23 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-05 11:36:39 -08:00
Dante Ruiz
1997cd27bd correctly use default values 2018-03-05 11:26:37 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f5a8187fe2 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
Dante Ruiz
654770af51 fix controller dispatacher error 2018-03-05 09:39:26 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
John Conklin II
ed07b3c28b
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick 
Purge RayPick and LaserPointers from default scripts
 2018-03-02 14:59:32 -08:00
Dante Ruiz
d12a4f0c18 little change 2018-03-02 14:30:02 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
LaShonda Hopper
fde1ca6262 [Case 4315] Ensures that Particle Tab Color Pickers obey colpick visual styling. 
Changes Committed:
    modified:   scripts/system/particle_explorer/particleExplorer.html
 2018-03-01 16:42:56 -05:00
LaShonda Hopper
b2c7ddbd05 [Case 4315] Particle System Tab has additional color picker support (details below). 
* Adds 3 additional keys/properties to hifi-entity-ui's specification support for
color pickers.
    * layoutType:  This correlates to colpick's layout property.  This is expected
        to be a string.  Valid values are those supported by colpick, see colpick.js for
        additional details.
           * Within hifi-entity-ui, if this value isn't specified the default is
             "hex" as was previously hard coded.
    * layoutColorScheme:  This correlates to colpicks's colorScheme property.  This is
        expected to be a string.  Valid values are those supported by colpick, see colpick.js
        for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              "dark" as was previously hard coded.
    * useSubmitButton:  This correlates to colpick's submit property.  This is expected
        to be a boolean.  See colpick.js for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              true as was previously hard coded.
* Amends particleExplorer.js color picker descriptors to make use of the new
  keys to bring the color pickers within the Particle Tab inline with the appearance
  of the Properties Tab color pickers submitted within PR #12241 which don't utilize
  the OK button.

Changes Committed:
    modified:   scripts/system/particle_explorer/hifi-entity-ui.js
    modified:   scripts/system/particle_explorer/particleExplorer.js
 2018-03-01 16:42:56 -05:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
Andrew Meadows
181944d5db fix bugs in controllerDispatcher.js 2018-03-01 08:41:13 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
Elisa Lupin-Jimenez
061a189e9f
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam 
Fixed log spam undefined error
 2018-02-28 09:37:17 -08:00
Thijs Wenker
6bf1c9878f
Merge pull request #12473 from misslivirose/fix-log-spam 
Logspam fix for editing in HMD mode
 2018-02-28 01:59:25 +01:00
Elisa Lupin-Jimenez
b8fd640ddf fixed log spam undefined error 2018-02-27 16:44:45 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Zach Fox
0802bd2c21 Fix going to marketplace main page from WalletChoice 2018-02-26 14:27:59 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
howard-stearns
a5cedde3c8 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
John Conklin II
c227c11aa2
Merge pull request #12475 from ElderOrb/FB12518 
fix for 'help icon in toolbar does not highlight when help window is open'
 2018-02-26 09:35:56 -08:00
howard-stearns
30a6cca4b3 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 09:26:09 -08:00
Gabriel Calero
7982d8da58 Set bubble default state off for android. 2018-02-26 13:06:22 -03:00
howard-stearns
8b46bdd9a1 make bank link testable in staging 2018-02-25 15:17:28 -08:00
Zach Fox
fe515e949b New UI for new HFC users 2018-02-23 16:36:20 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Alexander Ivash
f9de255fa7 FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials 2018-02-23 20:07:09 +03:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes 
Android ui fixes
 2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Zach Fox
f14673bc50 Fixup Checkout for apps 2018-02-22 16:38:38 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
Liv Erickson
269d8312e2 wrap selection print in wantDebug to avoid spamming logs in HMD 2018-02-22 13:03:16 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -08:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Seth Alves
cfbe082074
Merge pull request #12438 from ctrlaltdavid/21757 
Fix selecting values when tabbing between entity properties fields
 2018-02-21 09:22:46 -08:00
Nissim Hadar
af484d0af6 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-20 23:48:12 -08:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Gabriel Calero
bd9d8ac4f9 Tune radar styles 2018-02-20 19:07:41 -03:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
Zach Fox
11f897beb0 Initial app support 2018-02-20 10:39:36 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
Gabriel Calero
c19664e3ca Remove the shrink cap in radar mode 2018-02-20 12:01:10 -03:00
David Rowe
44aafd92a4 Merge branch 'master' into 21757 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-20 17:34:59 +13:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Gabriel Calero
12770142fa Add bubble button to android bottombar 2018-02-19 16:59:34 -03:00
Gabriel Calero
779e45aae7 Restore avatar overlays 2018-02-19 16:12:41 -03:00
David Rowe
65efeadf10 Fix selecting values when tabbing between entity properties fields 2018-02-19 19:17:23 +13:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Nissim Hadar
ff43e4c2ad Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-15 11:53:11 -08:00
Nissim Hadar
777862f253 can cast shadow flag now works correctly (UI/JS aspects). 2018-02-15 11:50:38 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Sam Gondelman
09645c8b48
Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split 
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
 2018-02-15 09:34:59 -08:00
Nissim Hadar
adb02d69f9 WIP -adding canCastShadow flag. 2018-02-14 21:45:56 -08:00
Nissim Hadar
12f4b8dbb1 Corrected event listener for canCastShadow - still bad. 2018-02-14 19:12:24 -08:00
Nissim Hadar
ef771b6db4 Minor indentation correction. 2018-02-14 19:11:13 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
LaShonda Hopper
d466c079a4 Simple fix for 801 Uncaught TypeError (details below). 
entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined

This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2018-02-14 17:00:52 -05:00
Dante Ruiz
e14f46101b fix tablet rotation when switching into and out of create mode 2018-02-14 13:49:43 -08:00
Nissim Hadar
a92765a83a Adding can cast shadow property. 2018-02-14 12:01:30 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-13 13:55:32 -08:00