huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity
3298 commits 7 branches 30 tags 224 MiB
Commit graph

3298 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Alexsander 7d1b72aa58 Make the vertical ruler show its values vertically 2019-12-19 19:23:08 -03:00
Michael Alexsander 9dc5c53f7e Keep "View" menu visible when toggling items 2019-12-19 18:14:08 -03:00
CheetoHead 73f550f723 Merge remote-tracking branch 'upstream/master' 2019-12-19 12:10:23 -05:00
OverloadedOrama 80f7a0ca13 Added Shift+Ctrl+Z as a secondary shortcut for Redo 2019-12-19 17:07:26 +02:00
OverloadedOrama 69392ff34b Constrained angles on straight lines while pressing Ctrl 2019-12-19 15:50:41 +02:00
Overloaded ece2f3039d
Merge pull request #74 from Schweini07/master 
Change Redo shortcut
 2019-12-19 14:05:31 +02:00
Schweini 2cce289b0b Change Redo shortcut 2019-12-19 11:34:26 +01:00
OverloadedOrama a76bfcef48 Straight lines now paint the target pixel too 
They also start at the middle of the pixel, rather than the last mouse position in general
 2019-12-19 03:38:14 +02:00
OverloadedOrama 91b21a52f5 Angle between last drawn pixel and line is now appearing on the top when drawing a straight line 
Also straight lines work with LightenDarken now, and moved the Seconds Timeline a bit to the left
 2019-12-19 03:15:23 +02:00
OverloadedOrama 3cf44a6d55 Created basic theme changing under Preferences 
Also fixed bug where Global.can_draw wasn't being set to true after PreferencesDialog was hidden
 2019-12-19 01:18:57 +02:00
greusser 803a42d38c
Merge pull request #9 from Orama-Interactive/master 
Merge with latest
 2019-12-18 16:28:33 -05:00
OverloadedOrama 432c9690ff PreferencesDialog is now a scene of its own 
We should change the organization of the project, and use multiple saved scenes instead of everything being on Main.tscn.
Also restored "X" as a shortcut for color switch, because that somehow got lost.
 2019-12-18 18:12:44 +02:00
Overloaded 4586853636
Merge pull request #73 from greusser/palette_updates 
Updates to new palette/import button
 2019-12-18 17:56:15 +02:00
Overloaded 1b23cc25f4
Merged Main.tscn with the theme changes 2019-12-18 17:54:05 +02:00
Overloaded af67f9540a
Update project.godot 2019-12-18 17:52:46 +02:00
CheetoHead 60af640970 Updates to new palette import button 2019-12-18 09:55:15 -05:00
CheetoHead 19f3ba7dab Merge branch 'master' into palette_updates 2019-12-18 09:43:17 -05:00
CheetoHead 9a65960994 Import palette file dialog added 2019-12-18 09:43:11 -05:00
greusser 26ee364751
Merge pull request #8 from Orama-Interactive/master 
Removed "Main Theme" from FrameButton.tscn and LayerContainer.tscn
 2019-12-18 09:42:22 -05:00
OverloadedOrama 0d192c4e49 Removed "Main Theme" from FrameButton.tscn and LayerContainer.tscn 
They inherit the theme anyway from the main Control node when added in the main scene.
 2019-12-18 04:20:55 +02:00
CheetoHead b08452034d Add new empty palette working 2019-12-17 20:04:37 -05:00
CheetoHead 18b9480a00 Merge branch 'master' into palette_updates 2019-12-17 19:49:28 -05:00
CheetoHead 3191e3f8c8 Add new palette updates 1 2019-12-17 19:49:20 -05:00
greusser e8bc12bf7b
Merge pull request #7 from Orama-Interactive/master 
Merge after conflicts
 2019-12-17 19:47:56 -05:00
OverloadedOrama 91698cd8da Made changes to Main.tscn, Dark Theme is the default theme (for now) 2019-12-18 02:43:49 +02:00
OverloadedOrama 329e89451a Added more graphics for the buttons & dark theme 2019-12-18 02:05:23 +02:00
OverloadedOrama 6220ad82bc Frame number labels change color when selected 2019-12-18 00:53:06 +02:00
Overloaded a8119ea392
Merge pull request #71 from Calinou/simplify-cmd-key-mask 
Simplify the Command key mask binding
 2019-12-17 22:48:33 +02:00
Hugo Locurcio 5d912d27f6
Simplify the Command key mask binding 
`KEY_MASK_CMD` is automatically remapped by Godot to `KEY_MASK_CTRL`
or `KEY_MASK_META` depending on the OS.
 2019-12-17 21:45:34 +01:00
Overloaded b9267b51fc
Merge pull request #70 from Calinou/fix-appdata-identifier 
Fix application identifier in the AppStream metadata
 2019-12-17 22:44:01 +02:00
Hugo Locurcio 9e54b71059
Fix application identifier in the AppStream metadata 
The DBus specification forbids `-` in identifiers (except in the
last segment), so we need to replace it with an underscore.
 2019-12-17 21:40:34 +01:00
OverloadedOrama 9289cb350d Replaced sub_key_mask with KEY_MASK_CTRL because it lead to a crash 2019-12-17 22:35:16 +02:00
Overloaded f3c77e30d0
Merge pull request #69 from AndreevAndrei/master 
[hotkeys] Add cmd-key supporting for macOS, closes #67
 2019-12-17 22:28:48 +02:00
Andreev Andrei 545aaf97c1 [hotkeys] Add cmd-key supporting for macOS, closes #67 2019-12-17 23:23:55 +03:00
greusser 7fce473e76
Merge pull request #6 from Orama-Interactive/master 
Merged with d2760c0
 2019-12-17 15:23:13 -05:00
OverloadedOrama d2760c0629 Merge branch 'master' of https://github.com/Orama-Interactive/Pixelorama 2019-12-17 19:52:56 +02:00
OverloadedOrama 7dd67e7130 Put Traditional Chinese to Preferences and changes font when choosing Chinese 2019-12-17 19:52:09 +02:00
Overloaded 2debadaf77
Merge pull request #66 from JunYouIntrovert/patch-2 
Update #Translations.csv
 2019-12-17 17:17:48 +02:00
Overloaded 2cba0afafb
Added the rest of the languages that were missing 2019-12-17 17:17:19 +02:00
JunYouIntrovert 90f1cebdf3
Update #Translations.csv 2019-12-17 22:31:47 +08:00
OverloadedOrama bfcb52a2f0 Put Russian in preferences & in Project Settings 2019-12-17 13:10:42 +02:00
Overloaded 588bce2992
Merge pull request #64 from AndreevAndrei/master 
[languages] Add Russian language, closes #63
 2019-12-17 13:03:07 +02:00
Overloaded c32ad873a6
Merge branch 'master' into master 2019-12-17 13:02:41 +02:00
Andreev Andrei cda19952f5 [languages] Add Russian language, closes #63 2019-12-17 12:05:40 +03:00
OverloadedOrama 3a29a729e9 Re-added Polish in Preferences and in Main.gd's loaded_locales 2019-12-17 04:22:39 +02:00
Overloaded dfc632e8f6
Re-added polish translation and description in project.godot 2019-12-17 04:12:54 +02:00
Overloaded 2d96ed278d
Merge pull request #62 from greusser/palette_updates 
Added edit palette menu
 2019-12-17 04:07:57 +02:00
Overloaded 329099fed4
Merge branch 'master' into palette_updates 2019-12-17 04:07:44 +02:00
OverloadedOrama c9071f30eb Changed brush color interpolation and LightenDarken amount's range from 0-100, instead of 0-1 2019-12-17 04:01:38 +02:00
CheetoHead 73830832ce Update PaletteContainer.gd 2019-12-16 20:47:19 -05:00