Commit Graph

2874 Commits

Author SHA1 Message Date
Lubos Lenco 33b48752e3 Merge branch 'master' of https://github.com/armory3d/armorpaint 2022-03-18 16:16:05 +01:00
Lubos Lenco 18611014cb Use kmake to build and drop node dependency 2022-03-18 16:15:57 +01:00
Lubos Lenco 0f8b85571c Update submodules 2022-03-18 15:56:42 +01:00
Lubos Lenco 19c77f56e5 Merge pull request #1334 from MathemanFlo/ImproveSwatches
Improve swatches and picker
2022-03-18 13:54:24 +01:00
Lubos Lenco 2324c03bd0 Update submodules 2022-03-17 21:33:13 +01:00
Lubos Lenco a57d187249 Include armorcore shaders 2022-03-17 21:32:59 +01:00
MathemanFlo 67a4c21c4c Restore previous tool after color picking 2022-03-15 22:17:23 +01:00
MathemanFlo 3c0bae578b Show color picker icon 2022-03-15 22:06:38 +01:00
MathemanFlo 0d5a205f48 Make color picker pbr swatch ready 2022-03-15 22:05:42 +01:00
MathemanFlo 683b813e47 Release color picker on right click 2022-03-15 22:04:28 +01:00
MathemanFlo 0b98385d8d Fix pbr swatches 2022-03-15 21:26:18 +01:00
Lubos Lenco ae4d69c37d Format 2022-03-15 14:54:18 +01:00
Lubos Lenco 537a670472 Merge pull request #1329 from MathemanFlo/ColorPicker
Color picker support for color wheels
2022-03-15 14:52:05 +01:00
Lubos Lenco a94144e140 Merge branch 'master' into ColorPicker 2022-03-15 14:50:53 +01:00
Lubos Lenco e3ce152344 Update submodules 2022-03-15 14:45:36 +01:00
Lubos Lenco 484a258028 Format 2022-03-15 14:42:03 +01:00
Lubos Lenco 54b91ec3b8 Merge pull request #1325 from MathemanFlo/PbrSwatches
Pbr swatches
2022-03-15 14:22:17 +01:00
Lubos Lenco df76693ca1 Update submodules 2022-03-15 13:54:10 +01:00
Lubos Lenco b7133605bf Fix save and quit handling 2022-03-15 13:53:59 +01:00
Lubos Lenco 0cc8cc69fa Update submodules 2022-03-14 18:06:45 +01:00
Lubos Lenco 622456cbf4 Merge pull request #1331 from MathemanFlo/FixUpdateFillMaterial
Fix #1330
2022-03-14 11:07:18 +01:00
MathemanFlo 815dc4bbc4 Improve material select for color picker 2022-03-13 10:34:34 +01:00
MathemanFlo f31554577e Fix #1330 2022-03-12 18:05:57 +01:00
MathemanFlo 68eac101a5 Respect material live setting in node color picker 2022-03-12 15:43:53 +01:00
MathemanFlo f59c5af41a Color picker support for color wheels 2022-03-12 15:15:34 +01:00
MathemanFlo 10c1185b60 Cleanup imports in Layers.hx 2022-03-12 09:09:42 +01:00
MathemanFlo 4bd326fd41 Improve swatch tooltip 2022-03-12 09:09:42 +01:00
MathemanFlo 55204d7762 Add create material and layer to swatch context menu 2022-03-12 09:09:42 +01:00
MathemanFlo 88502084d7 Make swatch context menu pbr ready 2022-03-12 09:09:42 +01:00
MathemanFlo fcab8b94cc Add pbr swatch gui 2022-03-12 09:09:29 +01:00
MathemanFlo 273d6a2c23 Add pbr swatch feature to layers tab 2022-03-12 09:07:42 +01:00
MathemanFlo 478c5227f5 Add pbr swatch feature to material tab 2022-03-12 09:05:58 +01:00
MathemanFlo efefdbf847 Add pbr swatch feature to color picker 2022-03-12 09:05:58 +01:00
luboslenco 65209ba922 Fix line endings 2022-03-11 16:45:01 +01:00
Lubos Lenco ace2a160f6 Add contributors button 2022-03-11 15:14:13 +01:00
Lubos Lenco 23e414f395 Update submodules 2022-03-11 09:12:38 +01:00
Lubos Lenco 75c3c33ac9 Format 2022-03-11 09:12:25 +01:00
Lubos Lenco 335458093d Merge pull request #1327 from MathemanFlo/TooltipImprovements
Tooltip improvements
2022-03-11 09:08:52 +01:00
MathemanFlo 3200784895 Add tooltips for camera controls 2022-03-10 22:32:02 +01:00
MathemanFlo b7058c3af4 Add tooltip for light angle and env angle 2022-03-10 22:27:07 +01:00
MathemanFlo 338701bd38 Add delete shortcuts to buttons. 2022-03-10 22:26:38 +01:00
Lubos Lenco a10e65cb09 Merge pull request #1321 from MathemanFlo/ImproveColorId
Improve color id tool
2022-03-09 17:52:23 +01:00
Lubos Lenco 5404d95b7c Update submodules 2022-03-09 17:38:06 +01:00
Lubos Lenco aa7f29e2ba Switch to kmake 2022-03-09 17:37:17 +01:00
MathemanFlo c4a80226ab Merge branch 'master' into ImproveColorId 2022-03-09 15:58:26 +01:00
MathemanFlo 920d8f544b Add set as color id map to texture context menu 2022-03-09 15:56:58 +01:00
MathemanFlo b386b1644c Redraw viewport if color id tool is open and id map deleted 2022-03-09 15:56:05 +01:00
MathemanFlo db683637b9 Clear picked color if new map is selected 2022-03-09 15:55:35 +01:00
MathemanFlo e5fa5d6cb4 Show import button permanently 2022-03-09 15:54:35 +01:00
Lubos Lenco b38b09ff63 Update submodules 2022-03-09 13:52:02 +01:00