atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
1726 commits 5 branches 53 tags 36 MiB
Commit graph

141 commits

Author SHA1 Message Date
GriffinR
441db4274e
Merge branch 'master' into label-copy 2022-06-30 00:41:10 -04:00
GriffinR
c1e3415417 Fix memory leak 2022-06-29 19:13:42 -04:00
GriffinR
73eabc92ca Prevent duplicate metatile pastes in the tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
304b00b0f3 Add copy/paste to tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
d1883720c9 Add metatile label copy button 2022-02-10 09:53:04 -05:00
GriffinR
cf973710c8 Preserve unused metatile attributes 2022-02-08 16:26:19 -06:00
GriffinR
6613318900 Disambiguate tile field names to tileId or metatileId 2021-12-26 11:23:45 -06:00
GriffinR
ce12a1e017 Add setMetatile functions to API (layerType, encounterType, terrainType, Behavior, Tile) 2021-12-26 11:23:45 -06:00
GriffinR
67af7e52da Add get/setMetatileLabel to API 2021-12-26 11:23:45 -06:00
garak
df724a4682 find unused tiles 2021-07-22 12:23:21 -04:00
garak
601e671fc8 add options to count metatiles to tileset editor 
- count the total number of usages across all maps of specific metatiles
- display the count and/or display unused metatiles
- this does not account for metatiles used in code (most of these are labeled)
 2021-07-22 12:23:21 -04:00
Marcus Huderle
6f394ce39c Code fixes for Qt 6 2021-07-07 18:11:35 -05:00
BigBahss
c3718e28be Convert MetatileParser into a namespace 2021-02-18 03:38:34 -05:00
BigBahss
bc2cc7d089 Convert PaletteUtil into a namespace 2021-02-18 03:25:26 -05:00
BigBahss
cc7a5f5819 Fix memory leaks in Tileset 2021-02-16 21:45:54 -05:00
BigBahss
6a825d0b39 Use implicit copy constructor/assignment for Metatile 2021-02-16 13:22:41 -05:00
BigBahss
8187b2d4bb Plug leaks in Metatile 2021-02-16 12:14:27 -05:00
BigBahss
7937c3fe98 Upgrade signal/slot connections in all other files 2021-02-14 11:09:39 -06:00
garak
3bf4aaf964 fix palette editor crash 2021-01-16 10:34:09 -06:00
BigBahss
bb6786f24e Add extra shortcuts to main window and sub-editors 2020-11-12 23:48:03 -05:00
BigBahss
f044672d2e Add support for sub-editor shortcut customization 2020-11-09 05:50:15 -05:00
BigBahss
eabd2d6618 Convert QShortcut's to Shortcut's and add them to config 2020-11-03 05:58:10 -05:00
BigBahss
f47e8b1903 Refactor TilesetEditor 2020-10-22 18:44:22 -05:00
BigBahss
e4095130c5 Fix closing tileset editor not closing palette editor 2020-10-22 18:44:22 -05:00
BigBahss
8b7f4069cd Save & restore palette editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
5624de750b Save & restore tileset editor geometry & state from config 2020-10-22 18:44:22 -05:00
ExpoSeed
18cb48f806 Fix typo 
editing from github is poggers
 2020-10-04 21:47:57 -04:00
GriffinR
3312280287 Fix 1x1 layer tile selection not highlighting 2020-07-23 19:30:48 -05:00
Marcus Huderle
45cfb3aabd Allow 6-wide selections in tileset editor when triple layer is enabled 2020-07-14 17:54:56 -05:00
GriffinR
70b8806737 Fix layer flip to work on all incomplete metatile selections 2020-07-14 17:40:53 -05:00
GriffinR
b5b227a6a0 Respect x/y flip for selections with different flip states 2020-07-14 17:40:53 -05:00
ultima-soul
38bbb2c4c8 Fix increasing metatileset size in tileset editor crashing when triple layer is enabled. 2020-07-09 13:07:48 -04:00
GriffinR
8b600fb59c Ignore invalid metatiles in selection calls to metatile selectors 2020-07-08 17:35:59 -04:00
GriffinR
0e04d2250b Ignore invalid metatiles in tileset editor when syncing 2020-07-08 17:35:59 -04:00
GriffinR
257405f451 Unsaved changes prompt for tileset editor when switching tilesets or maps 2020-07-02 16:01:07 -05:00
GriffinR
016c65448e Track unsaved changes to metatile attributes and labels 2020-07-02 16:01:07 -05:00
Marcus Huderle
dac4a0e8f7 Add scripting api for metatile layer draw order 2020-07-01 20:19:08 -05:00
GriffinR
08bc85dde0 Open tileset editor with selected metatile 2020-07-01 13:38:27 -05:00
Marcus Huderle
cc16440336 Allow Ctrl+Shift+Z to redo in the tileset editor 2020-06-30 18:55:13 -05:00
GriffinR
16f7373816 Fix crash when reducing tileset metatiles past current selection 2020-06-30 10:24:03 -05:00
ultima-soul
9183a297d4 Change layer slot labels when Triple Metatile Layers is enabled. 2020-06-26 16:22:15 -05:00
ultima-soul
4cc3d60dc4 Revert unecessary changes and hide Layer Type for Triple Metatile Layers. 2020-06-26 16:22:15 -05:00
ultima-soul
debb1c66ac Implement proper triple metatile layer support. 2020-06-26 16:22:15 -05:00
Marcus Huderle
0ef3c6a898 Add palette preview scripting commands 2020-05-03 10:31:44 -05:00
GriffinR
e9210f96aa
Merge branch 'master' into pokefirered 2020-03-29 13:15:23 -04:00
GriffinR
0fb483b5d3 Editable trainer type, minor fixes 2020-03-26 15:11:42 -04:00
GriffinR
3ff5483267 Correctly initialize palette for palette editor 2020-03-23 21:12:56 -05:00
GriffinR
bf72ecede9 Parse remaining pokefirered metatile attributes, allow editing/saving them 2020-03-16 16:31:08 -04:00
garak
22fe92840f
Merge pull request #108 from Phlosioneer/metatile-labels 
Add a way to name metatiles, for use in c code
 2019-09-08 20:15:00 -04:00
Marcus Huderle
e501a92c30 Fix exporting tileset images with duplicate-color palettes 2019-06-17 12:00:31 -05:00
garak
358732aa00 fix bug in tileset editor where selection is drawn at improper coordinates 2019-05-23 16:45:06 -05:00
Phlosioneer
edcb8f9285 Only commit metatile label if it changes 2019-04-08 00:17:30 -04:00
Phlosioneer
03186e4591 Fix metatile label bug while saving 
The metatile label only saved when the text field lost focus. But
saving doesn't cause the lineEdit to lose focus. This forces a
check whenever the tileset is saved.
 2019-04-08 00:13:55 -04:00
Phlosioneer
6b661db952 Fix incorrect regex validator 
This fixes the bug where an empty line wouldn't clear the metatile
label. It also removes the '.' and '-' characters.
 2019-04-07 20:46:53 -04:00
garak
fe22a2fbbc Merge branch 'rme' of https://github.com/garakmon/porymap into rme 2019-04-06 18:12:21 -04:00
garak
5bfc32fb7f write palette of region map image, fix ruby city map render 2019-04-06 18:11:56 -04:00
Phlosioneer
01c6d09bc2 Add a way to name metatiles, for use in c code 
Metatiles can be given a name. The name becomes a constant in
includes/contstants/metatile_labels.h.

The plan is to be able to reference metatiles in code using a macro
like `METATILE(Building, TV_ON, Primary)`, which will evaluate to the
value 0x003, or `METATILE(BrendansMaysHouse, MOVING_BOX_OPEN, Secondary)`,
which will evaluate to the value 0x270.
 2019-04-04 01:44:31 -04:00
Marcus Huderle
4dc9ebada9 Preserve x/y flip status when selecting a single tile from the metatile picker 2019-03-17 11:56:47 -05:00
Marcus Huderle
9412057f6a Export tileset images as proper 4-bit-depth .png files 2019-01-11 08:52:47 -06:00
Marcus Huderle
3f88072981 Add ability to import metatiles from Advance Map (.bvd files) 2019-01-08 18:04:41 -06:00
Marcus Huderle
d58918a554 Read tiles image data from buffer, rather than auto-detecting format from file extension 2019-01-07 09:32:10 -06:00
Marcus Huderle
fa61663465 Allow importing tileset tiles from un-indexed images, by also uploading a palette with it 2019-01-07 09:32:10 -06:00
Marcus Huderle
36b7f361cf Fix crash that could occur when shrinking the number of metatiles in a tileset 2019-01-06 10:39:00 -06:00
Marcus Huderle
cd37192657 Fix palette editor crash 2019-01-06 09:43:54 -06:00
Marcus Huderle
f1caa03c6c Add ability to export tileset tiles image 2019-01-05 15:52:55 -06:00
Marcus Huderle
8b843855f0 Fix tileset editor crash caused by the TilesetEditor instance being destroyed while still running 2018-12-26 16:49:43 -06:00
Marcus Huderle
40257193a4 Don't crash on startup if recent map can't be loaded. Write logs to porymap.log file 2018-12-20 17:30:35 -06:00
Marcus Huderle
761c25ee4c Don't reload metatiles from disk when importing tileset image 2018-10-10 18:14:43 -05:00
Marcus Huderle
62c1ed2dc7 Clarify save prompt when closing tileset editor 2018-10-10 18:07:55 -05:00
Marcus Huderle
e8d33c04db
Merge pull request #48 from phase/master 
Add installation instructions and fix compile issues
 2018-10-10 17:04:45 -05:00
Marcus Huderle
1c3e0b96bd Fix index out of bound error with tileset editing 2018-10-09 17:31:12 -05:00
Diegoisawesome
41a0c1d2d2 Change 2x2 limit to 4x2 on tileset editor selection 2018-10-08 21:10:57 -05:00
Diegoisawesome
c102a2b7d0 Scroll to selected tile and metatile 2018-10-08 14:46:46 -05:00
Jadon Fowler
4c371517e6
Add installation instructions and fix compile issues 
By changing the call to QString#chopped to QString#left, we remove the
Qt 10 dependency.

I also changed the C++ version to C++11 as that's what the code is
using my compiler (and others) didn't default to it.

Ref #2

Signed-off-by: Jadon Fowler <jadonflower@gmail.com>
 2018-10-07 21:59:34 -07:00
Marcus Huderle
e42c2e1a81 Add edit-undo history to tileset metatile editing 2018-10-06 17:07:36 -05:00
Marcus Huderle
888270f3ef Add right-click selection to tileset editor metatile layer item 2018-10-06 15:49:26 -05:00
Marcus Huderle
61ec1af0fb Add tileset palette editor 2018-10-02 19:01:41 -05:00
Marcus Huderle
303f31f3d4 Add ability to change tileset metatile counts 2018-10-02 19:01:37 -05:00
Marcus Huderle
8db57f3e0c Cleanup tileset editor ui 2018-10-02 19:01:34 -05:00
Marcus Huderle
cf150f3ce9 Ask user about unsaved changes when closing tileset editor window 2018-10-02 19:01:31 -05:00
Marcus Huderle
da13b8ea5e Enable multi-tile selections in tileset editor 2018-10-02 19:01:27 -05:00
Marcus Huderle
3ca284d5f3 Add ability to import new tiles 2018-10-02 19:01:24 -05:00
Marcus Huderle
a77b76988b Fix small UI bugs in tileset editor 2018-10-02 19:01:21 -05:00
Marcus Huderle
0c7ecebe0b Keep tileset editor in sync with currently opened map 2018-10-02 19:01:18 -05:00
Marcus Huderle
8d38783833 Add ability to save tileset changes 2018-10-02 19:01:15 -05:00
Marcus Huderle
428548b7e1 Add metatile attribute editing, and add tileset saving 2018-10-02 19:01:09 -05:00
Marcus Huderle
322238c7b8 Add metatile layer item 2018-09-30 16:15:04 -05:00
Marcus Huderle
ffd769f7ed Add palette and flip selectors to tileset editor 2018-09-30 14:54:38 -05:00
Marcus Huderle
0bc3513b15 Add tile selector to Tileset Editor window 2018-09-30 12:33:58 -05:00
Marcus Huderle
990a4aafb7 Add metatile selector in tileset editor window 2018-09-29 15:24:35 -05:00
Marcus Huderle
9abda07c48 Add Tileset Editor window 2018-09-29 14:13:07 -05:00