Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-26 12:38:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67094 commits 25 branches 0 tags 1.1 GiB
Commit graph

5596 commits

Author SHA1 Message Date
David Back
3f2a49d243 fix list of tablet IDs ray cast checks in edit.js 2018-03-17 10:59:18 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move 
Android joystick rotate move
 2018-03-16 17:24:15 -07:00
Zach Fox
a792bcc3d3 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-16 13:24:17 -07:00
Alexia Mandeville
f356de5fdf Updating repo script to match marketplace script 2018-03-16 11:51:03 -07:00
Alexia Mandeville
921b19139d Updating indentation 2018-03-16 11:09:53 -07:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
Alexia Mandeville
74c654690f Updating image path in script for HMD 2018-03-15 16:55:41 -07:00
Alexia Mandeville
700d828b67 Updating away image and image path in away script 2018-03-15 16:46:21 -07:00
SamGondelman
0fa73c73ce stats 2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169 New notification flow for item updates 2018-03-15 16:03:49 -07:00
Cristian Luis Duarte
03cbadece5 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-15 17:11:40 -03:00
vladest
3e00243c37 Merge branch 'master' into bubblu_button_blink_fix 2018-03-15 19:45:33 +01:00
vladest
c385bf26e9 Do not use timer for switching bubble button active state 2018-03-15 19:43:00 +01:00
Seth Alves
a64f0d2779 if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done. 2018-03-15 11:39:05 -07:00
Seth Alves
8a0b8aa034 make tablet invisible in secondary-camera if wallet passphrase page is up 2018-03-15 11:01:13 -07:00
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Cristian Luis Duarte
9e429e9f03 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-12 15:51:46 -03:00
Olivier Prat
aad571f6bd Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-03-12 14:22:57 -04:00
Olivier Prat
bafd6340a2 Removed unused fonts in scripts 2018-03-12 14:21:48 -04:00
Cristian Luis Duarte
ce0d76be2b Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-09 20:51:21 -03:00
Cristian Luis Duarte
3d933e1810 Android - Joystick hidden when opening login and shown after Cancel. 2018-03-09 17:41:05 -03:00
NissimHadar
317d9a8dbc Correct can cast shadow flag being visible on entities that can't cast shadows. 2018-03-09 11:45:39 -08:00
Brad Hefta-Gaub
8e44b429d8
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport 
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
 2018-03-09 08:49:07 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
Cristian Luis Duarte
4c3ee195de Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front). 2018-03-08 19:58:15 -03:00
Zach Fox
4df58f1e67 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
Cristian Luis Duarte
4f0cecefc3 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:03:39 -03:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Gabriel Calero
243e79df4a Fix merge of radar.js 2018-03-06 21:59:59 -03:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
NissimHadar
05e9aa52c9 Moved can-cast-shadow checkbox to behaviour section. 2018-03-06 16:22:54 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
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
John Conklin II
7ebe3df2b1
Merge pull request #12537 from zfox23/fixJsRequest 
Fix undefined request from JS
 2018-03-02 13:39:27 -08:00
Zach Fox
a5a109e4f1 Fix undefined request from JS 2018-03-02 10:05:32 -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
Zach Fox
c4e90c24eb Fix undefined request from JS 2018-03-01 16:40:24 -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
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13: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
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13: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
Olivier Prat
d288ebe79e Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased 2018-02-26 18:07:44 +01: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
Olivier Prat
ee253143ff Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-23 14:53:14 +01:00
Olivier Prat
c9a6d6bf14 Added adjustable post sharpen filter 2018-02-23 11:53:05 +01: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
Olivier Prat
f53c2f41a5 Merge branch 'master' of http://github.com/highfidelity/hifi into prev 2018-02-21 09:46:38 +01: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
Ryan Huffman
acda90577a
Merge pull request #11997 from ZappoMan/oldPropsFilters 
giving more info to entity edit filters to allow more flexibility
 2018-02-20 12:57:44 -08: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
ZappoMan
76d611d563 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-19 19:15:33 -08: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
Olivier Prat
9cfe53be3e Merged from orgin taa 2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01: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
ZappoMan
6f27d1e5a9 add additional example 2018-02-14 09:19:14 -08:00
ZappoMan
e71811bef2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-14 09:03:32 -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
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
John Conklin II
915870018a
Merge pull request #12359 from misslivirose/fix/collapse-headers 
Fix collapse headers in edit.js
 2018-02-13 10:34:30 -08:00
Sam Gateau
040710807d
Merge pull request #12346 from Zvork/scripts 
Fix transition (ex-fade) debugging scripts
 2018-02-13 09:08:35 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
 2018-02-12 17:50:39 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow 
Shadow performance / acnee improvements
 2018-02-12 14:41:13 -08:00
David Rowe
2ff78493db A further guard 2018-02-13 10:11:18 +13:00
David Rowe
b1f49be790 Merge branch 'master' into 21742 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 10:04:32 +13:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
David Rowe
033b85a3a8 Merge branch 'master' into remove-deprecated-items 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 09:42:40 +13:00
Zach Fox
ffea8104fc Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45 it's a start 2018-02-09 15:56:28 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2 
Commerce: Inspection Certificate Redesign (Fixed!)
 2018-02-09 15:51:46 -08:00
LaShonda Hopper
b058b346bd [Case 4315] ESLint Pass 7 for colpick.js resolves regex error (details below). 
Issue Count for colpick is now 0.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 18:25:50 -05:00
LaShonda Hopper
fed85a7a53 [Case 4315] ESLint Pass 6 Pt 2 for colpick equality checks (details below). 
* Suppressing equality checking issues within color conversion helper functions.
    * These issues are suppressed as opposed to resolved because their resolution causes
      issues with the color picker's understanding of the color it's being set to along with
      the respective hue.  This is likely due to rounding issues; however, it may also be something
      related to the equality operator implicit conversions semantics of JavaScript.  It's something
      that can be looked into later if desired.
          * Bug Steps upon resolving check as opposed to suppressing them:
              - Select a shape entity for example.
              - Note the visual color and actual RGB values for that entity's color upon selection.
              - Click the Color Wheel.
              - Notice the automatic change of the color for the entity when the picker is shown.
                  - If the issue doesn't show itself right away, alter the color for the entity close the
                    picker, and repeat steps 2-3.

* Issue Count reduced from 8 to 1

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 18:21:37 -05:00
LaShonda Hopper
59e0b8476a [Case 4315] ESLint Pass 6 Pt 1 for colpick.js (details below). 
First portion of vetted equality check fixes.
Issue Count reduced from 28 to 8.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:57:42 -05:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
LaShonda Hopper
83749b16c7 [Case 4315] ESLint Pass 5 resolves hex already defined issue (details below). 
* var hex was declared both the hexToRGB and hexToHsb functions.
    * hexToRGB was updated to have a more explicit var name
    * hexToRGB & hexToHSB also had the function param name updated to clarify the expected
      object type.  Also error statements and early returns were added should an unsupported
      object type be received.

* Issue Count is now 28

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:35:03 -05:00
LaShonda Hopper
ef1fd19a98 [Case 4315] ESLint Pass 4 for colpick.js (details below). 
Resolved payeX vs pageX issues.
Resolved stopList & huebar undefined issues.

Issue Count reduced from 47 to 29.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:14:34 -05:00
LaShonda Hopper
0a1e05326e [Case 4315] ESLint Pass 3, adds global declarations (details below). 
This resolves 23 error <x> is not defined no-undef errors related to global objects.
Issue Count reduced from 70 to 47.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:49:44 -05:00
LaShonda Hopper
691aafcf29 [Case 4315] ESLint Pass 2 for colpick.js (details below). 
Resolves all error Line <x> exceeds the maximum line length of 128  max-len issues.
Issue Count reduced from 85 to 70.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:42:43 -05:00
LaShonda Hopper
35bf8f1d01 [Case 4315] ESLint Pass; Simple errors addressed (details below). 
Initial ESLint Pass on colpick.js.
Issue Count reduced from 185 to 100 via:
    eslint -c .eslintrc.js scripts/system/html/js/colpick.js --fix

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:24:54 -05:00
ZappoMan
0ed3a18118 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-09 13:24:31 -08:00
Cristian Luis Duarte
017f99837a Android - Sign in, Sign up and Sign out. Note: It's still desktop scaled, being some components small for a phone 2018-02-09 17:32:13 -03:00
Cristian Luis Duarte
8d6d078ea2 Android - Make radar turn of the virtual pad 2018-02-09 17:32:12 -03:00
Cristian Luis Duarte
fe5075bff2 Android - Use the Wooden Mannequin avatar instead of being of light in the Avatar window 2018-02-09 17:32:12 -03:00
Cristian Luis Duarte
bb4f57f982 Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace. 2018-02-09 17:32:12 -03:00
Cristian Luis Duarte
e8312c72be Android - Radar mode implemented. 2018-02-09 17:32:12 -03:00
Cristian Luis Duarte
7af5cd2c2a Fix +android/defaultScripts array of filenames. 2018-02-09 17:32:12 -03:00
Gabriel Calero
d5e101c2e8 Add mode selector (my view / radar), not finished 2018-02-09 17:32:12 -03:00