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

1337 commits

Author SHA1 Message Date
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
Marcus Huderle
8317dc2276 Add expand-all and collapse-all buttons for map list 2019-01-08 09:30:36 -06:00
Marcus Huderle
48a0d13926 Only create new map text.inc file in pokeruby projects 2019-01-08 08:59:43 -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
Diegoisawesome
fdd5e4851a Prevent autoexpanding all map groups on resort (#78) 
Also fix path separator in status bar text
 2019-01-05 16:38:37 -06:00
Marcus Huderle
f1caa03c6c Add ability to export tileset tiles image 2019-01-05 15:52:55 -06:00
Marcus Huderle
95f712ef6f Explicitly initialize members of Settings class to fix undefined behavior 2019-01-05 14:44:09 -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
Melody
1ccc8f72df write porymap settings and log to writeable path 2018-12-27 07:56:02 -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
d7282ac5c7 Use FLAG_TEMP_1 when creating new hidden item event 2018-12-26 15:38:38 -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
ebdab421cb Pivot map header experience based on base_game_version 2018-12-26 12:20:51 -06:00
Marcus Huderle
6b01d5a942 Add project-specific configuration file. Only contains base_game_version right now. 2018-12-25 15:26:13 -06:00
Marcus Huderle
525ef8c67c Refactor config into generic key-value base class and settings-specific child class 2018-12-25 14:41:57 -06:00
Marcus Huderle
7758124235 Clear existing map layouts when opening a new project 2018-12-25 13:36:39 -06:00
Marcus Huderle
1de1ab94ff Emit MAP_GROUPS_COUNT macro to maps.h 2018-12-25 13:27:02 -06:00
Marcus Huderle
99a21ccf29 Add porymap config file 2018-12-21 09:25:28 -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
220d13c335 Properly select an event after creating it 2018-12-20 17:46:43 -06:00
Marcus Huderle
b2053e593f Merge remote-tracking branch 'diego/tabbed_events' 2018-12-20 17:35:59 -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
Diegoisawesome
9da5d84960 Fix segfault on map switch 2018-12-04 22:16:35 -06:00
Diegoisawesome
2799a3b584 Make sure event of type exists first 2018-12-04 13:36:22 -06:00
Diegoisawesome
1907dcbe1d Remove spinbox from multiple event view 2018-12-04 12:58:49 -06:00
Diegoisawesome
15e16798fc Fix double event select change 2018-11-30 00:24:56 -06:00
Diegoisawesome
68905aae1c Tabbed events mostly working 2018-11-29 21:59:03 -06:00
Diegoisawesome
f0b74ada93 Tabs working 2018-11-27 19:39:57 -06:00
Diegoisawesome
4550f80dc4 Begin tabs properly 2018-11-13 13:32:36 -06:00
Diegoisawesome
db96e33ffd Begin event view overhaul 2018-11-13 12:47:12 -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
2d3a10fdd8 Fix bug where map border became visible after editing the border metatiles when 'show borders' is disabled 2018-10-06 17:11:40 -05: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
Diegoisawesome
7a6354cc0a Redo metatile count fix 2018-10-05 13:43:15 -05:00
Diegoisawesome
8a7a4c1e8e Change filter clearing logic 2018-10-05 11:23:40 -05:00
Diegoisawesome
0e58fed23b Add map list sorting and filtering 2018-10-05 01:02:40 -05:00
Diegoisawesome
54a9d8b23b Merge branch 'master' of github.com:huderlem/porymap 2018-10-04 11:03:33 -05:00
Diegoisawesome
6269d4822a Add filter to UI 2018-10-02 21:46:08 -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
Diegoisawesome
9f55dbfa23 Merge branch 'master' of github.com:huderlem/porymap 2018-09-30 13:59:27 -05:00
Diegoisawesome
f767d257f0 Start work on tileset editor 2018-09-30 13:51:50 -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
fe12e0bde5 Scroll map list to current map 2018-09-29 09:22:50 -05:00
Marcus Huderle
7e6726bef7 Round zoom number display to 1 decimal place 2018-09-29 09:13:54 -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