Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 23:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75274 commits 72 branches 59 tags 1.2 GiB
Commit graph

938 commits

Author SHA1 Message Date
LaShonda Hopper
3152d5808e Minor: Replace tabs with spaces noticed when browsing file. 
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 15:14:47 -05:00
LaShonda Hopper
b7a959255d [Case 7049] Remove basic color section from non-shape Properties tab. 
Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
 2017-11-30 15:14:47 -05:00
LaShonda Hopper
532fc2ca5b [Case 7049] Remove duplicate color fields for shapes (details below). 
There are 2 types or styles of color picker controls.
    * color-control1: Composed of only a color picker
    * color-control2: Composed of a color picker and rgb fields.  The color can be
      manipulated by either.

Previously for shapes, the Properties tab utilized both types of color controls.
Color-control1 was displayed within the quick properties section; whereas, color-control2 was
displayed farther down within the more detailed sections of Properties tab.

This commit removes the duplication of the fields, opting to utilize color-control2 within
the quick properties portion of the Properties tab.

Changes Committed:
    modified:   scripts/system/html/entityProperties.html
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 15:14:47 -05:00
Alexander Ivash
78d89d886f 9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key 2017-11-16 00:13:46 +03:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
Nissim Hadar
7cb9514feb Converted 'Glare Angle' control to a slider. 2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894 Merge branch 'master' into hazeUIFix 2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3 Converted 'Glare Angle' control to a slider. 2017-11-08 16:44:05 -08:00
Nissim Hadar
2920c6f9a9 Merge branch 'master' into hazeUIFix 2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993 Converted 'Background Blend' control to a slider. 2017-11-08 15:41:24 -08:00
Zach Fox
33b6a13a4d Revert 11728 and fix marketplace JS injection - should revisit 2017-11-08 15:21:36 -08:00
David Rowe
fadbf09cdd Avoid potentially slow entity list refresh upon deleting entities 2017-11-07 18:10:10 +13:00
Nissim Hadar
650df24761 Improved Haze UI in Create menu 2017-11-06 14:27:02 -08:00
howard-stearns
76e06a6214 Update to stable-v-staging metaverse switching, to handle marketplace 
injection.
 2017-11-01 15:28:28 -07:00
Zach Fox
82816b5551
Merge pull request #11720 from zfox23/commerce_getToBuy 
Change 'GET' to 'BUY' when hovering over costed items
 2017-11-01 09:49:39 -07:00
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Nissim Hadar
6391282680 Swapped location of keylight attenuation and the blending factor. 2017-10-30 12:05:23 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Andrew Meadows
5ed58d5e5d enable Quad in ShapeEntityItem properties 2017-10-26 22:59:25 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master 
Fingerpaint  PR
 2017-10-19 13:13:59 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Sam Gateau
4d7accabdf Merge pull request #11439 from NissimHadar/hazeZone 
Adding haze component to the zone entity.
 2017-10-18 16:14:28 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Nissim
1b42572f99 Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2017-10-16 14:29:56 -07:00
Nissim
fd2b0da76d First version. 2017-10-16 12:20:31 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Zach Fox
17a0dd2a76 Elide long usernames in injected code 2017-10-13 13:32:55 -07:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Nissim Hadar
d0deaa631c Trying to pretty-up. 2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547 Name correction. 2017-10-12 07:37:44 -07:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9 Added checkbox for altitude effect of haze. 2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8 Renamed haze colours and moved checkbox for glare. 2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b Moved Bakground Blend to end of Haze fields. 2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
Nissim Hadar
1a932fbaf0 Corrected error in html. 2017-10-09 19:10:30 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Nissim Hadar
bfdd489682 Fixed color selector bug. 2017-10-06 13:18:12 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3 Keylight attenuation implemented. 2017-10-05 18:25:02 -07:00
Nissim Hadar
f261477aa2 Adding sun attenuation. 2017-10-05 17:55:24 -07:00
Nissim Hadar
e15699192d Added blend angle and altitude reference base. 2017-10-05 14:18:03 -07:00
Nissim Hadar
2e2364e03f WIP - adding haze blend out colour 2017-10-05 13:20:21 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Nissim Hadar
395d9cbd6b WIP - haze colour. 2017-10-05 12:13:37 -07:00
Nissim Hadar
512b469dc6 Added haze colour selector. 2017-10-05 11:31:49 -07:00
Nissim Hadar
595530161a WIP - adding background blend. 
Haze altitude works.
 2017-10-05 09:28:55 -07:00
Nissim Hadar
b7af6a58a6 WIP - adding background blend 2017-10-05 09:16:14 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
Zach Fox
1050d2851d Modify injected code to add to dropdown menu 2017-10-02 12:37:49 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Zach Fox
f0d668c5c3 Fix marketplace injection problems - yay! 2017-09-28 11:14:44 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Seth Alves
3016ce0a2b Merge pull request #11470 from sethalves/fix-grab-vs-trigger 
set grabbable and other checkboxes correctly if userData is blank
 2017-09-27 15:24:37 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Daniela
7ccfac0b3b Protect stroke width from wrong user input. Protect color pick from wrong user input. 2017-09-21 15:54:53 +01:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
David Kelly
4bdfe092cf Regression in injection script 2017-09-05 12:28:31 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
David Kelly
396f108182 forgot this the first time 2017-08-31 12:18:46 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez
69a13052ab commented out blocks injection 2017-08-09 17:23:08 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Elisa Lupin-Jimenez
74c90d6323 minor typo 2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Zach Fox
9d60d5153f Clarifying comment and turn setting off first 2017-08-08 18:00:17 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
b2c5a1f899 Fancy MutationObserver! 2017-08-08 17:12:06 -07:00
Elisa Lupin-Jimenez
efd25a5e70 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-08 16:55:10 -07:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356 
21356 - Reorder Edit.js
 2017-08-08 15:15:37 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00
Chris Collins
4acccb6ace Merge pull request #11118 from cain-kilgore/chat-char-limit 
WL 21493 - Update the Chat.js to indicate when a message is too long
 2017-08-07 09:52:57 -07:00
Elisa Lupin-Jimenez
c2cb7573c5 Removed commented out blocks code 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
9d2be28a8a troubleshooting Blocks injection 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
4570814145 Added Blocks to marketplace window 2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez
a7dd6a5a41 Changed marketplaces message to be more discoverable 2017-08-04 16:56:30 -07:00
Cain Kilgore
f79a8b3cb5 Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit 2017-08-04 23:34:44 +01:00
Cain Kilgore
c8ebc299f5 Limited Max Length of the Chat Box to 256 - as this exceeds Message. max. 2017-08-04 23:25:26 +01:00
VRCat\VRKitten
e4e4ead4af 'Untabified' files 2017-08-02 16:56:02 -06:00
Elisa Lupin-Jimenez
c03c1c80e1 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-02 10:51:40 -07:00
Elisa Lupin-Jimenez
eb1fb1a1e1 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-02 08:28:55 -07:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470 
Fix tablet focus issue when property menu is open and field is selected
 2017-08-01 15:10:26 -07:00
Elisa Lupin-Jimenez
fcaebda04c troubleshooting Blocks injection 2017-07-28 10:21:03 -07:00
jmo
003c483ec6 stray tabs changed to spaces, and long comment split to multiple lines 2017-07-27 15:21:58 -06:00
Elisa Lupin-Jimenez
9cfc4dc91b Can drag blocks zip folder into hifi and upload the .obj 2017-07-26 15:21:39 -07:00
scromie@turnmeupgames.com
33ff5917be fix 2017-07-26 19:34:20 +03:00
Elisa Lupin-Jimenez
adda4f0598 Added Blocks to marketplace window 2017-07-25 18:36:39 -07:00
Elisa Lupin-Jimenez
f128dce185 Changed marketplaces message to be more discoverable 2017-07-25 10:16:05 -07:00
milad
1ce1204a64 WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS 
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));

The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));

createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
 2017-07-24 10:06:44 -05:00
jmo
a2b1b2e0f9 21356 - Reorder Edit.js 
Made changes to the 3 sub files for the properties tabs. Although
visually the exiting menu looked like it was in different sections,
structurally it was all just one run of item after item, with a fair
amount of div-itis. I added in fieldsets to provide true groups and
replaced much of the div-ities with aditional feidlsets as they are the
smeantic element to use here.
 2017-07-10 15:49:26 -06:00
Zach Fox
6f2e7f5b83 Tweak the Snapshot 'Share' button to make its purpose more clear 2017-07-05 12:39:15 -07:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324 
Reworked Particle Editor UI
 2017-06-13 13:00:54 -07:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
Seth Alves
759a87c27e Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts 
Move chat app to run with default scripts
 2017-06-08 20:26:34 -07:00
Seth Alves
9fa74029c7 Merge pull request #10633 from mnafees/21299 
CR for Job #21299 - Save category on Marketplace when using back button
 2017-06-08 16:10:56 -07:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot 
Added Polaroid Feature to Snapshot
 2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae Final touches to polaroid feature 2017-06-07 16:52:16 -07:00
Mohammed Nafees
608becef7d Make the back button work again, uses the browser history directly now. 2017-06-07 15:52:06 +05:30
Liv Erickson
6e5cb63d4f Add z-index fix for dropped down list 2017-06-06 09:15:41 -07:00
seefo
b729707ce7 Removed old comments in SnapshotReview.js 2017-06-06 09:10:25 -07:00
Liv
9248715b21 Fixing z-index for Shape drop down 2017-06-05 17:37:32 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
85a1e1d691 Merge pull request #10608 from ctrlaltdavid/21379 
Fix icon for polylines in entities editor properties page
 2017-06-05 11:06:23 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376 
Move record script files to unpublishedScripts directory
 2017-06-02 16:25:56 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12:00
seefo
655a411865 Cleaned up Polaroid code 2017-06-02 11:02:01 -07:00
Menithal
bdcf9a0070 Merge remote-tracking branch 'upstream/master' into 21324 2017-06-02 06:39:55 +03:00
seefo
4e190434d1 Added polaroids to snapshots 2017-06-01 16:53:48 -07:00
Zach Fox
53701371ab Fix some bugs :( 2017-05-31 16:43:21 -07:00
Liv
27d4edd2d0 Add circle and cone to entity shape list 2017-05-31 16:25:11 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Zach Fox
fd92afff8c Ensure old snaps don't accidentally get shared for_url 2017-05-31 14:47:07 -07:00
David Rowe
f0c56dac3f Further files required for record script 2017-06-01 09:09:17 +12:00
Seth Alves
e80704f3c9 Merge pull request #10578 from thoys/fix/grabableDynamic 
Edit.js: Fix hidden dynamic property while clone-able is active
 2017-05-31 12:54:36 -07:00
Thijs Wenker
5c5aaf3254 Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates 2017-05-31 20:18:42 +02:00
Zach Fox
0441d8c703 Add placeholder image when previous snapshot can't be loaded 2017-05-31 10:27:17 -07:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Menithal
4269fcf69c Lots of Groundwork for UI Building 
- Changed underscore to lodash for smaller file size / faster loading
- Removed dat.gui dependency, as we now have a completely custom
solution
- Started to use some more modern convensions which Qt Supports
 2017-05-21 19:42:14 +03:00
Zach Fox
6765451cc8 Ensure snapshots without story_ids get uploaded 2017-05-19 10:36:31 -07:00
Zach Fox
8efac1e7f1 Prevent another GIF from being captured while one is processing 2017-05-18 14:30:08 -07:00
Seth Alves
36f8d08b32 Merge pull request #10450 from hiflex/patch-1 
Fix the Face Camera checkbox on the text entity properties tab.
 2017-05-16 20:31:56 -07:00
Zach Fox
aa0394c2ef Fix case when user stories would be incorrectly deleted 2017-05-16 11:07:03 -07:00
Zach Fox
d189f3f110 Fix the twitter mention 2017-05-12 12:39:10 -07:00
hiflex
a4406906f3 Fix the Face Camera checkbox on the text entity properties tab. 
The checkbox appeared unchecked even if the underlying property was true.
 2017-05-11 20:12:10 -05:00
Zach Fox
6a33ef49c2 New language for unshareable snaps 2017-05-04 16:17:33 -07:00
Zach Fox
2ad3346697 Are there bugs? 2017-05-04 16:05:20 -07:00
Zach Fox
946c5e7662 Almost finished with not-logged-in and not-shareable 2017-05-04 15:24:51 -07:00
Zach Fox
b08d23924a Keep hover status of both images in sync 2017-05-04 11:00:13 -07:00
Zach Fox
b01bff061e Hover lock when uploading 2017-05-04 10:06:52 -07:00
Zach Fox
c7f5115e26 Move help text to above buttons 2017-05-04 10:06:52 -07:00
Seth Alves
ecd690e5e9 Merge pull request #10348 from ctrlaltdavid/21311 
Don't sort recordings
 2017-05-04 09:59:12 -07:00
Zach Fox
c82a07016d New Preparing text; Better disabled behavior 2017-05-03 11:30:44 -07:00
Zach Fox
09488c4987 Disabled state for share butotns 2017-05-03 11:02:44 -07:00
Zach Fox
ff3a76f716 No magic numbers! 2017-05-02 18:23:15 -07:00
Zach Fox
aa46534b60 Whoops. 2017-05-02 17:10:57 -07:00
Zach Fox
964e79ce14 It's working! 2017-05-02 16:58:33 -07:00
Zach Fox
68fa8e06ef Super amped about this. Only need to add disabled state? 2017-05-02 16:38:16 -07:00
Zach Fox
5d38cd543d Yet another checkpoint 2017-05-02 16:06:13 -07:00
Zach Fox
7817c72ea1 Another checkpoint 2017-05-02 15:58:43 -07:00
Zach Fox
0beceae59b Checkpoint 2017-05-02 15:19:20 -07:00
Zach Fox
1067d1e0f6 Don't let user blast in certain cases 2017-05-02 14:43:16 -07:00
Zach Fox
d8095c5ea5 New setup instructions; new 'blank snapshot' text 2017-05-02 14:20:27 -07:00
Zach Fox
d1dff7606c Lint cleanup; Immediate share button visibility; 2017-05-02 14:10:24 -07:00
Zach Fox
a754c4d6cc Still image on top 2017-05-02 10:11:54 -07:00
Zach Fox
0ead9e5a24 Visual fixes; Select only 1 image at a time 2017-05-02 10:11:53 -07:00
Zach Fox
d295b5a69d ShareBarHeight-= 5px; Remove test call 2017-05-02 10:11:53 -07:00
Zach Fox
5b168301bc Update some typefaces; Add margins to pics 2017-05-02 10:11:53 -07:00
Zach Fox
ac86c13477 Fix sharing; disable HiFi buttons independently 2017-05-02 10:11:53 -07:00
David Rowe
cb8f75394d Don't sort recordings 2017-05-02 12:08:39 +12:00
Zach Fox
3f146fca9d Fix announcement audience; Fix disabled buttons 2017-04-27 15:36:59 -07:00
Zach Fox
4152e44d2c Click anywhere on the image except the bottom to toggle share buttons 2017-04-27 14:01:08 -07:00
Zach Fox
832e16ef86 Visual tweaks; fix active share buttons; comment out tests 2017-04-27 14:01:07 -07:00
Zach Fox
7297355183 Open ShareBar on P0 by default 2017-04-27 14:01:07 -07:00
Zach Fox
0ac660d4ab Cleanup 2017-04-27 14:01:07 -07:00
Zach Fox
b6601feb1d It's 5 already? 2017-04-27 14:01:07 -07:00
Zach Fox
a24a48843f Checkpoint 2017-04-27 14:01:07 -07:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
92187e2424 Making progress towards file chooser dialog 2017-04-27 14:01:07 -07:00
Zach Fox
8c9cd0fad0 Custom social buttons; better testing functionality 2017-04-27 14:01:07 -07:00
Zach Fox
d461723012 Thanks to Jess, slightly different Tweet language 2017-04-27 14:01:07 -07:00
Zach Fox
d7348aabc8 Quick comment updates 2017-04-27 14:01:07 -07:00
Zach Fox
e1789996fb Add announcements support 2017-04-27 14:01:06 -07:00
Zach Fox
f838e87f48 Pretty stable... 2017-04-27 14:01:06 -07:00
Zach Fox
7c5de1e60b Getting closer 2017-04-27 14:01:06 -07:00
Zach Fox
fad470eeea Checkpoint (this is complicated) 2017-04-27 14:01:06 -07:00
Zach Fox
eaa699bbfd Wow, it's really coming together! 2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e Checkpoint 2017-04-27 14:01:06 -07:00
Zach Fox
c08b40b950 Initial sharing code hooked up 2017-04-27 14:01:06 -07:00
Zach Fox
01e78612c7 Soooo much progress today 2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d Rearchitecture 2017-04-27 14:01:06 -07:00
Zach Fox
2880b22f9f External share buttons! 2017-04-27 14:01:06 -07:00
Zach Fox
4270086a22 Support 1 and 2 images 2017-04-27 14:01:06 -07:00
Zach Fox
0b4cd41d75 More and more progress! 2017-04-27 14:01:06 -07:00
Zach Fox
a4f428a6e6 Lots of progress 2017-04-27 14:01:06 -07:00
Zach Fox
7acdc86644 Progress 2017-04-27 14:01:05 -07:00
Zach Fox
0860352caa Checkpoint before switching to crash duty 2017-04-27 14:01:05 -07:00
David Rowe
9c7353deb2 Make record script able to be put on the marketplace 2017-04-27 11:22:25 +12:00
David Rowe
4581b9a0df Refresh countdown number upon reopening dialog 2017-04-26 20:13:21 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
David Rowe
c0a258f9b3 Disable "load" button while making a recording 2017-04-25 09:04:26 +12:00
David Rowe
d73fd6e08d Update AC script URL in info 2017-04-25 07:42:21 +12:00
David Rowe
7fe0ba19b5 Don't display the "Record" button as pressed while recording 2017-04-22 10:05:02 +12:00
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5 Right-align "i" icon and update info text 2017-04-21 17:46:30 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
Stephen Birarda
3452dd0251 increment colspan count in table footer 2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
David Rowe
e91cf4a4e8 Use "i" circle for info button 2017-04-15 12:50:00 +12:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
David Rowe
f715850766 Display animated GIF while recording 2017-04-14 16:13:45 +12:00
David Rowe
08f4fc2cf9 Remove hover highlight from "x"s 2017-04-14 15:51:59 +12:00
David Rowe
c2d8755b15 Merge branch 'master' into 21249 2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9 Use HiFi glyph for delete "x"s 2017-04-14 15:30:28 +12:00
David Rowe
5f333ee02c Style "i" button and info text 2017-04-14 15:14:39 +12:00
David Rowe
1d43e5a992 Style overall dialog layout 2017-04-14 15:12:36 +12:00
David Rowe
75e4fb3820 On tablet with option enabled recording ends when open tablet or dialog 2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f Show "busy" spinner when counting down or recording 2017-04-13 19:23:22 +12:00
David Rowe
ff42715a15 Retain "Record" button's pressed state when close and reopen dialog 2017-04-13 18:41:55 +12:00
David Rowe
b508d6882f Add checkbox that stops countdown/finishes recording when reopen dialog 2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75 Don't close dialog when start recording; press "Record" again to finish 2017-04-13 17:00:35 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
David Rowe
464bc17491 Column heading for "unload" buttons 2017-04-13 13:40:20 +12:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
David Rowe
f30dc4b560 Add a "record" button to initiate recording 2017-04-12 15:04:29 +12:00
David Rowe
905560b96d Remove checkbox and record-on-close functionality 2017-04-12 14:48:15 +12:00
David Rowe
86baf785aa Add "Load" button 2017-04-11 15:23:09 +12:00
David Rowe
9a9bcaf2ae Stop button stops playing recording 2017-04-11 09:37:57 +12:00
David Rowe
bd63960876 Add table of recordings currently being played 2017-04-11 07:23:52 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
David Rowe
b29bfd4bb4 Dialog instructions refer to tablet or window as appropriate 2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0 Toolbar icon state and start/stop recording with window closing/opening 2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523 Add dialog with "Enable recording" checkbox 2017-04-05 16:20:04 +12:00
David Rowe
f397adb22a Reinstate scrollbars to marketplace pages 2017-04-01 11:06:27 +13:00
David Rowe
260309ae24 Remove CSS hack no longer needed 2017-04-01 10:53:46 +13:00
David Rowe
a5c683192b Improve entity properties scroll handle operation in tablet 2017-03-31 12:26:22 +13:00
David Rowe
9c4414cff6 No custom styling of marketplaces directory scrollbar 2017-03-30 14:38:17 +13:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
David Rowe
6a3dea030e Settings link 2017-03-28 15:15:33 +13:00
David Rowe
a6ef592353 Non-scrolling window with images scaled to fit 2017-03-28 14:43:26 +13:00
David Rowe
ead1f00bbf Title 2017-03-28 09:10:20 +13:00
David Rowe
35305b4476 Make dialog single column with images above controls 2017-03-28 08:55:38 +13:00
David Rowe
d0fc352d3b Address event bridge being shared with other scripts 2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda Open snapshot dialog in tablet or window appropriately 2017-03-27 15:04:33 +13:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07:00
Seth Alves
d792559d9a have edit.js resend properties of selected entity to entityProperties.js once it's ready 2017-03-10 09:59:23 -08:00
Seth Alves
66d44ac6f0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-08 09:26:51 -08:00
Menithal
d85cb645b0 Changed limit logic, default limit is now 0 
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
 2017-03-04 11:42:43 +02:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
155a310852 Merge pull request #9761 from Menithal/21166 
WL#21166 Cloneable Equipment
 2017-03-02 16:33:13 -08:00
Menithal
9c31f66b75 Addressed CR of 9684 2017-03-02 21:39:56 +02:00
Menithal
231ebef117 Removed stray debugPrint 2017-03-02 01:01:57 +02:00
Menithal
f538ac24f3 Various Properties 2017-03-01 22:07:02 +02:00
Menithal
1d8be2aeaa Added missing dynamic 2017-02-26 19:17:46 +02:00
Menithal
10151c3f5b Added Multi-userdata field updater 2017-02-24 08:04:03 +02:00
Seth Alves
d6428ee98c Merge pull request #6 from fayeli/tablet-edit-layout-fix 
fix overlapping issue with the delete button
 2017-02-23 17:40:15 -08:00
Menithal
4d98cc436b Finished up Edit.js 2017-02-23 23:20:21 +02:00
Menithal
e95e50ad6e Preliminary work on edit.js to allow for new param 2017-02-23 10:34:04 +02:00
Menithal
9b8503eba5 Initial Grab Clone 2017-02-19 18:18:38 +02:00
Menithal
dcbe3c622d Added Hotkey Listening to the webview 
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
 2017-02-18 11:51:19 +02:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
Seth Alves
e030a4a518 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 15:20:14 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Seth Alves
a19bc31a78 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 10:51:22 -08:00
Faye Li
2388ec65fe Merge pull request #9659 from fayeli/users-fix 
Tablet Users Fixes
 2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0 simpler filter code 2017-02-15 10:23:36 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
Faye Li
a57a0435c1 fix overlapping issue with the delete button 2017-02-13 15:13:10 -08:00
Faye Li
f981f21aa4 fix for ozan's domain 2017-02-13 11:47:58 -08:00
Faye Li
27057190ce display users even if they dont have a domain name 2017-02-13 11:01:37 -08:00
Faye Li
8cc8f2c7fd highlight current visibility option 2017-02-13 10:51:01 -08:00
Faye Li
6e0d7bb3cf make visibility settings into a modal for better readability 2017-02-13 10:42:07 -08:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
Faye Li
65ca0c7e4a sticky header bar 2017-02-10 17:27:02 -08:00
Faye Li
e28e16ea5e make drop down text a little bit bigger 2017-02-10 16:56:13 -08:00
Faye Li
0ba934f543 sort online users array alphabetically 2017-02-10 16:39:14 -08:00
Faye Li
8f43ceed9d filter out yourself from users online list 2017-02-10 16:22:30 -08:00
David Kelly
61e558e568 Entity Edit Filters for zones 
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
 2017-02-08 09:53:25 -07:00
Faye Li
c24b6e5e5e missing words 2017-02-01 15:13:52 -08:00
Faye Li
c16a9a955e display correct username 2017-02-01 14:53:03 -08:00
Faye Li
9a22055c27 initialise the toggle button with correct info 2017-02-01 14:30:16 -08:00
Faye Li
3c3ff908b4 handling the visibility toggle event 2017-02-01 14:22:13 -08:00
Faye Li
6d55b3c82d visibility toggle drop down 2017-02-01 13:45:17 -08:00
Faye Li
378fdaec8b the missing commit - fix typo and added user info 2017-02-01 11:27:48 -08:00
Faye Li
3f84e5778c jump to the selected user 2017-02-01 10:45:18 -08:00
Faye Li
fc1e588588 sending and recieving jump to event 2017-02-01 10:34:54 -08:00
Faye Li
59aea60be0 fill confirmation modal with data of the selected user 2017-01-31 16:16:40 -08:00
Faye Li
fda20694b3 jump to user confimation modal 2017-01-31 15:47:51 -08:00
Faye Li
06d797bb3b load bootstrao 2017-01-31 14:27:17 -08:00
Faye Li
8e64de26a9 Merge branch 'tablet-ui' into new-users-js 2017-01-30 11:25:58 -08:00
Faye Li
ff1c4995af removed unused code 2017-01-27 15:44:07 -08:00
Faye Li
8091b0ced4 button style 2017-01-27 13:33:07 -08:00
Faye Li
bf51ba7195 button brings up add/remove friends page 2017-01-27 11:34:38 -08:00
Faye Li
bfbee20f43 display friends 2017-01-27 10:19:20 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Faye Li
6a4a9bcb32 end of day commit 2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e polling users and displaying user count 2017-01-25 17:36:50 -08:00
Faye Li
b5b781f4a5 tab content switching 2017-01-25 16:59:16 -08:00
Faye Li
5ad522668a tabs header for everyone and friends 2017-01-25 16:29:25 -08:00
Faye Li
ce0ee610ea a test on polling friends 2017-01-25 14:32:36 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Faye Li
f02b2ef40a auto poll users when page loads 2017-01-25 11:59:31 -08:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Ryan Downe Karpf
3f151cb3d7 Merge pull request #9483 from Atlante45/fix/rescale 
Fix Edit.js rescale for decimal values
 2017-01-23 15:44:10 -08:00
Faye Li Si Fi
f8162970ec filter out yourself from user list 2017-01-23 15:24:33 -08:00
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a Fix width of edit.js dropdown to accomodate collision options 2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b Update the name of the collision shapes used in edit.js properties 
Update the names to be consistent with what is shown on the add model
dialog.
 2017-01-23 13:56:48 -08:00
Faye Li Si Fi
afc85a3afe Don't display users who aren't in a domain 2017-01-20 13:53:09 -08:00
Faye Li
763028dad4 refresh icon 2017-01-19 15:46:02 -08:00
Faye Li
5bc0030c8f hook up event bridge 2017-01-19 15:24:56 -08:00
Ryan Huffman
7cd19192d9 Remove dead code in entityProperties.js 2017-01-19 15:00:30 -08:00
Faye Li
bbed26c8fa display all online users 2017-01-19 14:34:28 -08:00
Faye Li
23269c2efb move refresh button to top bar 2017-01-19 13:41:36 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Faye Li
193251eb8d background 2017-01-19 13:11:35 -08:00
Faye Li
450b94f641 load font 2017-01-19 12:55:06 -08:00
Faye Li
53404caccf top bar css 2017-01-19 12:15:27 -08:00
Faye Li
10f512306e successfully polling all online users 2017-01-19 10:58:29 -08:00
Faye Li Si Fi
5ad1cc6f4d end of day commit 2017-01-18 18:03:16 -08:00
Faye Li Si Fi
75b1eba84e initial commit for users.html 2017-01-18 16:10:42 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
6f2386eabd Fix processing of Clara.io status messages 2017-01-13 11:20:00 +13:00
David Rowe
4dee0efdd3 Use more reliable Clara.io API parameters 2017-01-13 09:12:49 +13:00
David Rowe
d45e6f00cb Prepare only one download at a time 2017-01-12 22:35:42 +13:00
David Rowe
288c069687 Make cancelling downloads more robust 2017-01-12 22:31:09 +13:00
David Rowe
6e622b3719 Don't request model be centered as work-around for downloads failing 2017-01-12 21:35:24 +13:00
David Rowe
cbe8ce0c19 Improve handling of zip file generation failing 2017-01-12 21:33:32 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
David Rowe
9bdcdf73c1 User must be logged into Clara.io site to download 2017-01-12 09:15:01 +13:00
David Rowe
71d6a5cb1d Implement model request and download 2017-01-11 21:33:03 +13:00
David Rowe
530b176d09 Replace Clara download button with own 2017-01-11 16:36:18 +13:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
David Rowe
3d6fe6efe8 Move Clara download button when displaying on tablet 2016-12-16 14:58:22 +13:00
David Rowe
04aef641c5 Fix auto-downloads not happening after forced log in 2016-12-16 11:45:17 +13:00
David Rowe
a7e0135a6a Continuously update Clara pages because content can change dynamically 2016-12-16 11:28:34 +13:00
David Rowe
861ce2c27b Reduce whitespace in Clara categories 2016-12-15 20:33:43 +13:00
David Rowe
eb7b2dbdcf Improve robustness of navigation footer 2016-12-14 15:07:06 +13:00
David Rowe
2b0529bcea Inform user if can't do Clara.io download because can't write to ATP 2016-12-14 14:45:33 +13:00
David Rowe
4890e92733 Start at HiFi marketplace page instead of directory page 2016-12-14 00:12:52 +13:00
David Rowe
8195393205 Fix Clara marketplace button appearing on top of navigation footer 2016-12-13 22:54:19 +13:00
David Rowe
20623ebddb Raise and lower keyboard on password fields 2016-12-13 22:48:17 +13:00
David Rowe
14ecb24986 Remove extra browse history item created by Clara download 2016-12-11 17:43:55 +13:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
David Rowe
c4c2a95e83 Add "back" button to marketplaces footer 2016-12-08 10:58:37 +13:00
David Rowe
1de2c14fee Remove e-mail message hyperlink if displaying on tablet 2016-12-07 12:52:53 +13:00
David Rowe
e821ec5593 Inject navigation footer into Clara account createion page 2016-12-07 12:38:16 +13:00
David Rowe
01226b03ef Improve text and robustness of marketplaces footer 2016-12-07 12:20:43 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Rowe
b83d5c6275 Inject Clara Web page modifications 2016-12-05 21:34:34 +13:00
David Rowe
f04c493e16 Fix navigation bar and opaqueness of Web page 2016-12-05 17:48:20 +13:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Zach Fox
20a2d1275a Bugfixes and GIF uploads workinggit add -A! 2016-11-18 14:39:30 -08:00
Zach Fox
adcbb0b760 Code clarity and potential bugfix 2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7 Huge progress today. Buggy behavior with multiple snapshots remains 2016-11-18 14:39:29 -08:00
David Rowe
591db37a21 Fix up navigation footer fonts 2016-11-15 15:09:33 +13:00
David Rowe
e4b8d34080 Add navigation bar to marketplace pages 2016-11-15 14:38:03 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
David Rowe
1caca601f2 Update user instructions 2016-11-10 20:39:29 +13:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
Ryan Huffman
c4f35bf7bf Fix userData in edit.js sometimes showing wrong value when locked 2016-11-07 11:39:36 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07:00
David Rowe
de5e02310b Provide keyboard in marketplaces window 2016-11-03 09:00:40 +13:00
David Rowe
0c6ed67e3b Tidying 2016-11-02 00:05:30 +13:00
David Rowe
35448b6c09 Update Clara.io instructions 2016-11-02 00:05:10 +13:00
David Rowe
c6558ebebd Reinstate "reload" button for entity scripts in entities editor 2016-10-21 11:14:57 +13:00
Anthony J. Thibault
f76dbeeffd Edit.js now works with new ignoreIK default 2016-10-11 17:12:02 -07:00
David Rowe
ad5d525340 Fix keyboard status when switching between entities editor tabs 2016-09-30 14:13:35 +13:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
David Rowe
e3be34528f Fix keyboard flickering when select entities 
Fix entities list footer count of selected entities in the process.
 2016-09-29 16:53:20 +13:00
David Rowe
8e44096981 Fix last entities properties not scrolling when keyboard raised 2016-09-29 15:59:24 +13:00
David Rowe
b60f649e0a Scroll HTML window if necessary when raise keyboard 2016-09-28 19:27:16 +13:00
David Rowe
a94d77ee12 Raise and lower keyboard in entities editor 2016-09-28 17:57:53 +13:00
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12:00
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00