Commit graph

3600 commits

Author SHA1 Message Date
David Rowe
20c7e17fb6 Tidy up logging 2017-08-10 21:13:40 +12:00
David Rowe
b58cac1c56 Tidying 2017-08-10 17:28:43 +12:00
David Rowe
4b3f7d6614 Reorient Tools menu and slightly adjust Create palette position 2017-08-10 16:46:39 +12:00
David Rowe
a6af6e0bff Add extra color swatches for user tests 2017-08-10 16:27:19 +12:00
David Rowe
594d144210 Finesse sliders to produce values that fully got to 0.0 and 1.0 2017-08-10 15:45:05 +12:00
David Rowe
9442a667b4 Raise sliders on hover 2017-08-10 15:32:48 +12:00
David Rowe
cc64644946 Don't press sliders down when click on them 2017-08-10 15:02:19 +12:00
David Rowe
e1adb3a20e Add image slider (for H, S, V or similar values) 2017-08-10 12:44:30 +12:00
David Rowe
397527d3f3 Add image UI element 2017-08-10 10:23:13 +12:00
David Rowe
1aeaee8153 Rename slider to barSlider 2017-08-10 09:04:28 +12:00
David Rowe
1c2d3ced89 Add some further entities to the Create palette 2017-08-09 17:28:28 +12:00
David Rowe
c19ec58220 Halve hand highlight and grab sphere radius 2017-08-09 15:51:37 +12:00
David Rowe
938b09c1a4 Slider display per intersection value 2017-08-09 15:19:25 +12:00
David Rowe
3d4cec63cd Calculate slider value from laser intersection 2017-08-09 14:36:17 +12:00
David Rowe
c79931106d Add basic element of slider 2017-08-09 12:06:35 +12:00
David Rowe
28f9f9e4d0 Add a "Physics" button and panel 2017-08-09 11:02:33 +12:00
David Rowe
22432671ca Fix newly created entity not being grabbed 2017-08-09 09:26:33 +12:00
David Rowe
046ce353fd Fix highlight overlay getting deleted 2017-08-08 21:56:01 +12:00
David Rowe
42284796a1 Remember swatch colors 2017-08-08 21:44:54 +12:00
David Rowe
0b8ea29193 Clear swatch with grip click 2017-08-08 20:37:41 +12:00
David Rowe
f88191b7b3 Merge branch 'master' into vr-edit-a 2017-08-08 16:43:20 +12:00
David Rowe
6621b43fae Make some swatches start with "no color"; color them when clicked 2017-08-08 16:34:45 +12: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
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
David Rowe
1231491a72 Add color picker 2017-08-07 17:29:58 +12:00
Seth Alves
f898a05014 Merge pull request #11122 from ElderOrb/case6760
fix for 6760: Create Mode turns to Portrait when Reopening tablet
2017-08-06 19:02:47 -07:00
David Rowe
5d1732c5aa Merge branch 'master' into vr-edit-a 2017-08-05 20:45:12 +12:00
David Rowe
0f44e36128 Fix buttons sometimes staying pressed 2017-08-05 18:04:39 +12:00
David Rowe
4e87c13020 Tidy group buttons' enabling 2017-08-05 17:52:54 +12:00
David Rowe
bff3ad342d Tidy command and callback handling 2017-08-05 17:37:40 +12:00
David Rowe
e6456ca501 Tidy and fix options handling 2017-08-05 17:08:56 +12:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
anshuman64
22afb25d44 Capitalize "ENTER VR" 2017-08-04 17:19:26 -07:00
David Rowe
23fab65f27 Tidying 2017-08-05 12:08:36 +12:00
David Rowe
24f36c1ae5 Default current color and remember current color over tool/app toggles 2017-08-05 12:07:33 +12: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
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677
6677: Change "Desktop" App to Say "Exit VR"
2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
David Rowe
ceba5769e0 Apply color to entities when click them 2017-08-04 18:07:42 +12:00
David Rowe
75b481adab Update icon color as current color is changed 2017-08-04 17:52:53 +12:00
David Rowe
d0143c2c19 Add color swatch buttons and "current color" circle 2017-08-04 17:33:00 +12:00
David Rowe
ed497afdc3 Add "Color" tool button, icon, and empty options panel 2017-08-04 14:08:57 +12:00