Commit graph

446 commits

Author SHA1 Message Date
Victor Seiji Hariki
0156f4cff5
Create CONTRIBUTING.md
This creates some contributing guidelines, based on briandk's (https://gist.github.com/briandk) template at https://gist.github.com/briandk/3d2e8b3ec8daf5a27a62. I think that code contributions should go to the testing branch, while documentation and other simple fixes can be merged directly into main.
2022-12-10 09:48:23 -03:00
Victor Seiji Hariki
9af58c7ee6
Merge pull request #81 from zero01101/testing
Simple Index 0 image count fix and test if internal pulls still work
2022-12-10 08:54:55 -03:00
Victor Seiji Hariki
e3c77f433a try fixing external pull request checkout - test1
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-10 08:18:35 -03:00
Victor Seiji Hariki
877676cfae Merge remote-tracking branch 'zero/main' into testing 2022-12-10 08:09:44 -03:00
tim h
d04a8b0e50 Revert "more don't merge"
This reverts commit 4563694b1b.
2022-12-09 21:00:32 -06:00
tim h
4563694b1b more don't merge 2022-12-09 20:59:20 -06:00
tim h
9b0405579f ...maybe this will work?
look i am 100% the type to just throw things at the wall to see what sticks
2022-12-09 20:56:45 -06:00
Victor Seiji Hariki
ba7c7608c0 index 0 not counted as an image anymore
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-09 23:18:24 -03:00
tim h
43a2677af0
Merge pull request #76 from zero01101/testing
Custom select and (Very) simple settings page
2022-12-09 19:51:19 -06:00
tim h
f03fdd91c0
Merge pull request #77 from erjanmx/fix-readme-typo
Fix readme typo
2022-12-09 19:45:42 -06:00
Victor Seiji Hariki
0e6a5c8d4a adds index 0 to image gen
image gen has now index 0 to show what was before the image generation.
this is especially useful for img2img

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-09 22:07:18 -03:00
Erjan Kalybek
897f610655 Fix readme typo 2022-12-09 23:03:56 +01:00
Victor Seiji Hariki
f446cf3784 fixed color brush cursor rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 23:33:51 -03:00
Victor Seiji Hariki
f8687e9bac Seems like fix didn't work
performance optimization for firefox seems to have broken chrome after
today's changes. Seems like we will have to accept the slower method of
calculating coordinates. At least it is more flexible.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:42:14 -03:00
Victor Seiji Hariki
047d5ef01f fix getmodels that seems to have broken with merge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:12:02 -03:00
Victor Seiji Hariki
dc914d9243 removing debug calls as always
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:04:41 -03:00
Victor Seiji Hariki
ec59cf5538 Very crude settings interface
Very crude settings interface with only canvas size for now. Canvas size
only affects canvas on next page load. Dynamic resizing in the horizon,
but will take a while.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:38:55 -03:00
Victor Seiji Hariki
57a2debe5d Merge branch 'main' into testing
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:29:34 -03:00
Victor Seiji Hariki
2cda410b41 add custom select element with autocomplete
Same as a select, but you can kind of search for the item you want. Good
for when you have a lot of models.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:23:17 -03:00
Victor Seiji Hariki
c2e0cf4615 expand input field relative to drawable canvas
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 12:17:59 -03:00
Victor Seiji Hariki
0b5b0188e4
Merge pull request #75 from zero01101/testing
Some general fixes
2022-12-07 23:36:28 -03:00
Victor Seiji Hariki
458df53fac fix pixel alingment on select for scaling
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:17:46 -03:00
Victor Seiji Hariki
3701eb110b fix some more issues in selectjs pixel alignment
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:09:41 -03:00
Victor Seiji Hariki
548aa05001 windows now stop wheel event propagation
no more of the "mouse cursor size change while scrolling" issue

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 19:22:25 -03:00
Victor Seiji Hariki
c51c71915e add test for recommended configs
also adds option to change to recommended automatically

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 18:09:43 -03:00
Victor Seiji Hariki
aee812b70a fix mouse for chrome (for now)
Seems scroll delta is inconsistent between browsers, so for my chromium
installation it was simply not working at all due to snapping. Made it
so every event is a cursor size change for now. probably bad for smooth
mouse wheels, but for a complete fix we would have to keep track of
pixels scrolled and probably add a mouse wheel sensitivity setting
somewhere.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:32:43 -03:00
Victor Seiji Hariki
361efc76f2 bypass for browser that calculate layer*
Bypasses the kinda slow getBoundingClientRect for browsers that actually
support CSS transforms for cursors

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:10:01 -03:00
Victor Seiji Hariki
9a08408456 this might fix some of our pixel-alignment issues
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:05:14 -03:00
Victor Seiji Hariki
3373d2964e fix selection box when not grid-aligned
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 16:26:23 -03:00
Victor Seiji Hariki
3c0eed68ce fix slider strange behavior when mouse left
also added / to all res references

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 13:32:33 -03:00
tim h
09d3cb11c2 move upscalerX 2022-12-06 21:30:00 -06:00
tim h
8329784c88 wtf how did that even work 2022-12-06 21:17:02 -06:00
tim h
8818a355f6 upscale amount
probably should've put this in testing first but it's pretty bulletproof so far
2022-12-06 21:12:10 -06:00
Victor Seiji Hariki
4c6a632e90
Merge pull request #74 from zero01101/testing
Last pull for today
2022-12-06 23:25:01 -03:00
Victor Seiji Hariki
de4823e749 tool name no longer renders and breaks things
tool name now functions okay when cursor has 0 size

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 23:09:30 -03:00
Victor Seiji Hariki
bdf6bb8913 I swear I need to learn to delete my console.debugs
Will not merge yet to avoid pull request spam

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:57:39 -03:00
Victor Seiji Hariki
77ea8d7554
Merge pull request #73 from zero01101/testing
Fix layer hide/delete/undo
2022-12-06 22:52:04 -03:00
Victor Seiji Hariki
067b81960f Merge branch 'zero-main' into testing 2022-12-06 22:46:21 -03:00
Victor Seiji Hariki
88df998e98 fix some issues in layer delete/undo
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:39:33 -03:00
Victor Seiji Hariki
ea4226e877
Merge pull request #72 from zero01101/bleeding-edge
fix maskbrush stationary cursor wheel rendering
2022-12-06 22:09:18 -03:00
Victor Seiji Hariki
1c6fd1fb1a fix maskbrush stationary cursor wheel rendering
brush did not redraw when changing brush size. now it does

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:07:02 -03:00
tim h
ed99ec9f73 version bump, readme update, tiny tiny fixes so small they could be considered typos 2022-12-06 18:05:43 -06:00
tim h
de05a1ecba
Merge pull request #67 from zero01101/bleeding-edge
Prototype (though pretty stable) of a layer management system
2022-12-06 17:52:50 -06:00
Victor Seiji Hariki
1888d7f8a3 layer visibility toggle affects wrong layer (bleeding edge branch)
Fixes #71
2022-12-06 20:17:31 -03:00
Victor Seiji Hariki
5f16b8b21d some more visual tweaks
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 20:08:55 -03:00
Victor Seiji Hariki
e16800e5cf add tool identifier to reticle (it was too similar)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 20:00:50 -03:00
Victor Seiji Hariki
2c82c0468f some visual changes to image generation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 18:28:34 -03:00
Victor Seiji Hariki
7bc0549337 fix smooth rendering box incongruency on reload
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 18:22:22 -03:00
Victor Seiji Hariki
55de66a127 fix some console debug messages
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 12:32:37 -03:00
Victor Seiji Hariki
c5d887620d select color and do not redraw twice on maskbrush
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 12:30:55 -03:00