Commit graph

58302 commits

Author SHA1 Message Date
Artur Gomes
8ef8e974b6 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:00:29 +01:00
Artur Gomes
030877457b Fix tablet not opening.
Fix headers not showing correctly since changes in editProperties page.
2017-08-16 20:59:09 +01:00
Zach Fox
4cf6f2d8b8 Merge pull request #11188 from davidkelly/dk/makeMeSomeKeys
Wallet needs some keys
2017-08-16 10:56:34 -07:00
Artur Gomes
9d87954d71 Merge branch 'master' of github.com:CraftsmanMG/hifi 2017-08-16 18:52:39 +01:00
Artur Gomes
d4255928c7 Add sections to brushes tab.
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 18:35:23 +01:00
Artur Gomes
3ddddf4ad6 Fix animated hue not working even though the checkbox was checked after
restarting the interface.
2017-08-16 18:35:23 +01:00
Artur Gomes
270d41fabf Fix animation flickering caused on multiplayer because both users
where using the script to update the color and the color was also being
replicated.
2017-08-16 18:35:23 +01:00
Artur Gomes
ca37c5ee94 Fix desktop drawing mode creating more than one entity in an unusual way. 2017-08-16 18:35:22 +01:00
Artur Gomes
fb696bcbac Fix settings not being correctly restored when reloading tablet (when
using desktop mode and right clicking over the tablet + refresh)
Remove postMessage in favour of emitWebEvent to communicate between the
tabs and the main script.
2017-08-16 18:35:22 +01:00
Artur Gomes
b41ef08428 Fix tablet loosing focus (from the drawing hand) when switching hands. 2017-08-16 18:35:22 +01:00
Artur Gomes
482924266c Fix brush texture stretching at start.
Add some code refactoring.
2017-08-16 18:35:21 +01:00
Artur Gomes
07416951e5 Did clean up of the code and unused files. 2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d Add hue, saturation and brightness dynamic brushes.
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
678dd5fbae Do not test!
Add missing information to property.
2017-08-16 18:33:43 +01:00
Artur Gomes
03b70ed492 Do not test!
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Artur Gomes
108c02d05e Fix Desktop painting weird behaviour when painting (painting surface not
always facing the user, this happened because of the change of the
paint surface direction on the last commit)

Fix brush tint (was just changing color in the last commit, now is
blending with the brush, using a kind of luminance blend effect)

Remove unecessary files.
2017-08-16 18:28:59 +01:00
Artur Gomes
2d2efab5ed Fix paint surface always facing the HMD instead of rotating with the
brush/hand;
2017-08-16 18:28:58 +01:00
Artur Gomes
6e4ad996af Make savedSettings variable null after it is used, since it is probably
a cause for a big memory leak.
2017-08-16 18:28:58 +01:00
Artur Gomes
130ed238a5 Add restore tablet state after removing and putting back the headset.
Update max line width;
Remove erase tab in favor of a single undo button in the tabs bar;
Add background color to brushes (using the same as the stroke color so
the user can preview the stroke with the color);
Add padding between custom color picker and preset colors table.
2017-08-16 18:28:58 +01:00
Artur Gomes
c477b50272 Fix brush weird behaviour when starting with clean settings (brush would
be black and filled instead of appliying the correct texture with color)
2017-08-16 18:28:57 +01:00
Artur Gomes
ae078f4689 Add Avatar dominant hand as default hand the first time the user starts
fingerpaint app or when the settings for the app are deleted.
Add some checks to fix an non critical error (when trying to reset the
left/right hands and they were not yet initialized)
2017-08-16 18:28:57 +01:00
Artur Gomes
c65010669b Move line width widget from the palette tab to the brushes tab. 2017-08-16 18:28:57 +01:00
Artur Gomes
91a6f2c8d9 Add undo for created Entities in order to be able to remove entities
when drawing in desktop mode.
Fix keyboard not showing.
Fix app button not being deactivated when switching to another app.
2017-08-16 18:28:56 +01:00
Artur Gomes
c94774ec18 Add Keyboard when input fields get focus in the palette tab.
Add feedback when user picks a color from the table or from the set
custom colors.
Fix hand hovering tablet when entering the app (stopped working after
restoring brush values).
2017-08-16 18:28:56 +01:00
Artur Gomes
5c40a6810e Add drawing in Desktop mode.
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be Add new Interface (more similar to the ui used on other apps)
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
2017-08-16 18:28:55 +01:00
Artur Gomes
9d35cdcda3 Add save and restore last user settings;
Fix multiple dynamic brushes not working in some cases (mixing axis
would not work neither for rotation nor for translation);
Fix tablet hovering detection only working for right hand;
2017-08-16 18:28:55 +01:00
Delanir
e70303c53e Add the following items to the libraries/networking/src/udt/PacketHeaders.h and cpp files.
add new value to the PacketVersion enum
in the versionForPacketType function, return the new version number when
packetType is EntityAdd, EntityEdit or EntityData.
2017-08-16 18:28:50 +01:00
Artur Gomes
c8d475dff1 Add new dynamic and colored brushes.
- Add dynamic hue brush;
- Add dynamic (animated) rotation and translation brush;
- Add colored brushes that already have the colors set (user can't
change it);
2017-08-16 18:25:03 +01:00
Artur Gomes
b6ccce3904 Add new brushes (In progress) 2017-08-16 18:25:03 +01:00
Artur Gomes
69a532ea45 Fix application button not resetting state after exiting the app.
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
2017-08-16 18:25:02 +01:00
Artur Gomes
b6beb2033f Switch between stylus and fingerpaint mode when not painting and hand
hovers the tablet.
Replace OK button in color picker with Add button (allows user to add custom
colors, and enables user to pick color just by pressing on top of the
color picker);
2017-08-16 18:25:02 +01:00
Artur Gomes
9309f5137a Add tablet application to replicate the existing overlay interface that
uses qml.
Add last user picked colors using the custom color picker so that users can easily reuse that color.
2017-08-16 18:25:02 +01:00
Delanir
3d8951a5e0 Replace Paint Source Entity by Overlay 2017-08-16 18:25:01 +01:00
Delanir
066598fe3f Add Support to different UV modes in the finger paint script and deactivate "paint hand" 2017-08-16 18:25:01 +01:00
Delanir
0a97cfd736 Change UVMode updateGeometry Function 2017-08-16 18:25:01 +01:00
Delanir
ed5515a2d4 Add new Property to polyline to enable different uv modes. 2 2017-08-16 18:25:00 +01:00
Delanir
faf57f068c Override hand animation for finger paint.
Paint hand stays in a pointing position while in paint mode.
2017-08-16 18:25:00 +01:00
Delanir
59719a13b6 Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE 2017-08-16 18:23:04 +01:00
Delanir
5acc7ae4c9 Add fingerPaint script (intermediate version) to script-archive folder
Added folder fingerPaint inside script-archive. In order to run this
intermediate version of the fingerPaint script, load
fingerPaint/fingerPaint.js .
2017-08-16 18:20:14 +01:00
David Kelly
73e943daaf Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-16 10:13:08 -07:00
Brad Hefta-Gaub
714027d2e2 Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Zach Fox
c024bd2d83 Merge pull request #11195 from zfox23/commerce_securityImage1
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
Artur Gomes
f794079c62 Merge remote-tracking branch 'upstream/master' 2017-08-16 17:54:35 +01:00
Artur Gomes
07a16d658b Add sections to brushes tab.
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 17:21:19 +01:00
Liv
36ff82db6b Merge pull request #11056 from misslivirose/feat/domain-setup
[Protocol Change] Allow specified users/groups to replace domain content from within Interface
2017-08-15 20:29:25 -07:00
Anthony J. Thibault
e9b8e5431d Fix for incorrectly scaled bounding volumes when switching avatars
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().

This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Zach Fox
2fa1bd25a8 Clipping and mipping! 2017-08-15 16:45:46 -07:00
Zach Fox
984a5aea2c You can now spawn infinite copies of items you've previously purchased 2017-08-15 16:32:23 -07:00
Zach Fox
5c157a7397 Move security image to top left 2017-08-15 16:24:14 -07:00