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

63 commits

Author SHA1 Message Date
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