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

585 commits

Author SHA1 Message Date
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
d094dced1f fix region map editor ui 2019-04-07 18:33:06 -05: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
garak
2ee3731ed8
Merge branch 'master' into rme 2019-04-06 10:20:35 -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
garak
a475823fee further refine region map editor 2019-03-31 14:57:24 -04:00
Karathan
e305e42e61 rename getTilesets->getTilesetLabels 2019-03-24 15:55:40 -05:00
Karathan
1b62c15ba4 add dialog to add tilesets 2019-03-24 15:55:40 -05:00
garak
545e2134d8 remember changes to region map layout between saves 2019-03-23 16:56:30 -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
8af714a681 Rename 'Reset' actions to 'Clear', and add 'Clear Background Map' to edit history 2019-03-17 11:37:13 -05:00
garak
5b6f658e29 add new convenience features to rme and fix typos 2019-02-25 13:31:34 -05:00
garak
3cef77a174 add map section swap feature and smooth zooming 2019-02-18 13:45:45 -05:00
garak
38cb97793d fix outstanding rme bugs and history 2019-02-16 19:58:13 -05:00
garak
a951fc85da region map ui updates and other fixes 2019-02-16 19:58:13 -05:00
garak
41f3780c8a add region map data to config, fix some bugs 2019-02-16 19:58:13 -05:00
garak
c75ce5db1d resize region map, move map squares 2019-02-16 19:58:13 -05:00
garak
83f3cef52e clean rme UI, undo / redo history, new city maps 2019-02-16 19:58:13 -05:00
garak
d3a16d34df move region map editor to its own window 2019-02-16 19:58:13 -05:00
garak
62009373f7 city map editor 2019-02-16 19:55:58 -05:00
garak
a9098cfd7a add layout view to region map editor 2019-02-16 19:55:58 -05:00
garak
7cffe07579 add region map image editor with basic functionality 2019-02-16 19:54:54 -05:00
garak
5ffd6d84e4 fix unloaded blockdata when creating new map from layout 2019-02-08 16:13:40 -06:00
Marcus Huderle
c4ad0971d0 Support custom fields for all event types 2019-02-04 20:53:35 -06:00
Marcus Huderle
94686e6f0a Support map JSON data 2019-02-04 20:53:35 -06:00
Marcus Huderle
532c32cc00 Don't dynamically flip the tiles image in the tileset editor 2019-01-21 19:18:09 -06:00
Marcus Huderle
9412057f6a Export tileset images as proper 4-bit-depth .png files 2019-01-11 08:52:47 -06:00
Marcus Huderle
a3ecbecd20 Don't show cursor tile outline in event or connection editing tabs 2019-01-11 08:52:44 -06:00
Marcus Huderle
16bbfcb654 Make map tile cursor more responsive according to metatile selection 2019-01-11 08:52:35 -06:00
Marcus Huderle
61b919566a Add option to show an outline around the currently-hovered map tile 2019-01-09 09:35:34 -06:00
Marcus Huderle
4d088766a0 Add player view rectangle option 2019-01-08 18:04:48 -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
b469cc047f Add 'About Porymap' window that contains useful information about the program 2019-01-08 10:28:20 -06:00
garak
d13a4da50a Remember window sizes, add new map popup window (#54) 
* save window state on app close

* new map popup window

* window title, groupItem fix

* fix new map heal location generation

* fix newmappopup form size

* empty map name check, increase max dimensions

* tool tips

* delete new window

* fix mainwindow.ui new map action

* use new config for window state

* clean window restore config settings

* extend "Add New Map" to different MapSortOrders

* fix crash when creating new map from unloaded layout

* fix new map from layout extra files
 2019-01-07 17:14:44 -06:00
Diegoisawesome
aa0709243d Fix crash if layout blockdata size mismatches layout dimensions 2019-01-07 12:28:31 -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
022dc899da Add transparency slider for overlayed collision tiles on the map 2019-01-06 12:53:36 -06:00
Diegoisawesome
7c51f50d76 Fix segfault when using magic fill outside map 2019-01-06 12:42:24 -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
851f8ec813 Add ability to import JASC and A-Map palettes into the tileset palette editor. 2019-01-05 12:06:22 -06:00
Diegoisawesome
060a3e359a Magic fill collision and elevation (#76) 2019-01-04 20:49:21 -06:00
Diegoisawesome
bd9fc001b4 Magic fill Y check fix (#75) 2019-01-04 19:53:46 -06:00
Diegoisawesome
fa0ec02143 Fix fill bug 2019-01-04 18:21:41 -06:00
Diegoisawesome
c6e0d017ea Add magic fill functionality 2019-01-04 18:21:41 -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
08ff21e415 Properly create new emerald map headers. Use 'trigger' instead of coord script, trap, etc. 2018-12-26 15:36:44 -06:00
Marcus Huderle
dcf6b5af6b Fix bug where tilesets were not displaying their bottom row 2018-12-20 18:26:27 -06:00
Marcus Huderle
0c761edb88 Merge branch 'master' of https://github.com/huderlem/porymap 2018-12-20 17:35:11 -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
garak
92b23e515d c define ignore nonexistent values (#56) 2018-11-08 17:55:50 -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
bbfecba1ba Add edit-undo history for tileset palette changes 2018-10-05 18:38:11 -05:00
Marcus Huderle
7a47c64509 Display RGB values in tileset palette editor 2018-10-05 17:57:55 -05:00
Marcus Huderle
74ce9c9a45 Misc cleanup, and 'Sort by Name' -> 'Sort by Area' 2018-10-05 17:42:14 -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
Marcus Huderle
497f069d20 Restructure source tree 2018-09-29 09:10:23 -05:00
Diegoisawesome
02fd5bbea6 Merge branch 'master' into refactor 2018-09-27 13:36:27 -05:00
Diegoisawesome
d93d7c26fe Finish renaming ObjectPropertiesFrame 2018-09-27 11:23:40 -05:00
Marcus Huderle
6102181738 Move files into src/ 2018-09-26 18:33:08 -05:00