Commit Graph

611 Commits

Author SHA1 Message Date
GriffinR
8375e7e3fe
Merge pull request #717 from GriffinRichards/write-errors
Better error handling if saving fails
2025-04-21 17:27:20 -04:00
GriffinR
2df722ab4c Fix region map tile selector swapping h/vflip 2025-04-20 09:43:48 -04:00
GriffinR
e26be84d91 Fix z value for events, separate EventPixmapItem from Editor 2025-04-19 23:21:27 -04:00
GriffinR
0f4028ab92 Add missing event frame invalidation 2025-04-18 12:25:39 -04:00
GriffinR
d992a29e36 Add input fields for LOCALID 2025-04-18 11:10:02 -04:00
GriffinR
8b85057ca5 Fix connection pixmaps being sensitive to focus 2025-04-17 15:55:47 -04:00
GriffinR
b1d85d32c1 Prevent weird diving map behavior 2025-04-17 15:55:12 -04:00
GriffinR
5d475513d5 Allow off-center player view size 2025-04-17 13:18:02 -04:00
GriffinR
a6ec91724f Replace BORDER_DISTANCE with actual view distance 2025-04-16 15:54:44 -04:00
GriffinR
db24687360 Add player view size settings 2025-04-16 15:54:33 -04:00
GriffinR
ee0f5923ce Better error handling if saving fails 2025-04-15 17:10:32 -04:00
GriffinR
d30be0b9af Fix some inputs moving user's cursor while typing 2025-04-15 13:49:23 -04:00
GriffinR
d014eef9e8 Add NoScrollComboBox::editingFinished, disable diving map buttons with no map 2025-04-14 13:41:57 -04:00
GriffinR
e19932b90c Allow custom map connection direction input 2025-04-14 12:40:19 -04:00
GriffinR
fa4ecf4842 Merge branch 'dev' of https://github.com/huderlem/porymap into local-id 2025-04-13 22:45:39 -04:00
GriffinR
d350d10cfd
Merge pull request #713 from GriffinRichards/custom-json-data
Preserve custom JSON data
2025-04-13 22:40:46 -04:00
GriffinR
c6e94eb6ab Replace stateChanged/checkStateChanged with toggled 2025-04-10 14:34:04 -04:00
GriffinR
41d0b4261f Fix deprecated code as of Qt 6.9 2025-04-10 13:39:52 -04:00
GriffinR
3d47d6b7e7 Remove some Editor usage from EventPixmapItem 2025-04-09 22:01:03 -04:00
GriffinR
714cce670f DraggaglePixmapItem -> EventPixmapItem 2025-04-08 12:42:23 -04:00
GriffinR
33c66f272e Merge branch 'dev' of https://github.com/huderlem/porymap into local-id 2025-04-07 16:47:04 -04:00
GriffinR
2256ded6c2 Some event frame updates for local IDs 2025-04-07 13:39:13 -04:00
GriffinR
2d827f62f7 Support event lookup by ID name 2025-04-07 13:38:54 -04:00
GriffinR
ecad60843c Remove old DraggablePixmapItem signals/slots 2025-04-07 13:38:11 -04:00
GriffinR
06c971360b
Merge pull request #709 from GriffinRichards/image-exporter
Update map image exporter
2025-04-07 13:04:34 -04:00
GriffinR
f3a28848b9 Preserve custom fields in wild_encounters.json 2025-04-04 13:00:28 -04:00
GriffinR
029e959bfe Simplify fromQJsonValue loops 2025-04-03 22:33:43 -04:00
GriffinR
e94fce0c8d Combine the 3 QMaps for MAPSEC data 2025-04-03 13:24:50 -04:00
GriffinR
cf51ca1fc4 Fix some issues with settings, canvas size, connections rendering 2025-03-29 01:15:07 -04:00
GriffinR
243a6064c2 Fix more timelapse bugs, clean up 2025-03-28 15:51:24 -04:00
GriffinR
c6a389b9cb Add raw metatile attributes editor 2025-03-26 23:45:01 -04:00
GriffinR
5cd53be057
Merge branch 'dev' into tileset-types 2025-03-26 21:42:37 -04:00
GriffinR
77330be555 Fix pixmap resizing, speed up stitch rendering 2025-03-24 15:52:20 -04:00
GriffinR
f28088af3c Add live preview of gif export 2025-03-22 01:03:18 -04:00
GriffinR
c8dc7d0eb9 Prevent crash in Timelapse mode, sync editor with exporter 2025-03-21 19:39:26 -04:00
GriffinR
ee1d6ac481 Allow exporting connections with no border 2025-03-21 16:10:22 -04:00
GriffinR
d1eaf6cfd2 Refactor image export settings, fix event occlusion 2025-03-21 13:39:29 -04:00
GriffinR
52a06d5b32 Separate MapImageExporter from Editor 2025-03-21 11:30:39 -04:00
GriffinR
f3b751f600 Update metatile attribute combo boxes appropriately 2025-03-19 18:54:17 -04:00
GriffinR
854880f9f8 Save map list settings in config 2025-03-16 17:53:09 -04:00
GriffinR
e6f4e64aa4 Add onLayoutOpened API callback 2025-03-16 16:05:56 -04:00
GriffinR
21b823792d Remove redundant key sequence list 2025-03-11 15:07:18 -04:00
GriffinR
89bdd03a0e
Merge pull request #696 from GriffinRichards/new-event-button
New event button refactor
2025-03-06 21:21:49 -05:00
GriffinR
d43252506f
Merge pull request #694 from GriffinRichards/metatile-selector-speed
Stop unnecessary full redraws of metatile selectors
2025-03-03 14:23:25 -05:00
GriffinR
edd2cce110 New event button refactor 2025-03-02 18:05:33 -05:00
GriffinR
e0de7fa73f Stop unnecessary full redraws of metatile selectors 2025-02-28 14:17:29 -05:00
GriffinR
6d8b4f21d8 Move hex string conversions to Util 2025-02-27 13:36:13 -05:00
GriffinR
9afaa4ae3e Add setting to re-enable global script autocomplete 2025-02-22 17:48:42 -05:00
GriffinR
5ea071d581
Merge pull request #684 from garakmon/res663
Update Tile / Metatile Usage When Painting
2025-02-19 23:38:59 -05:00
garak
089d90c9cb update tile & metatile usage counts automatically when painting 2025-02-19 16:39:29 -05:00
GriffinR
5feb391a9d Read colorpicker screen using cursor position 2025-02-13 11:17:05 -05:00
GriffinR
e8f2713952
Merge branch 'dev' into heal-locations 2025-02-11 14:26:15 -05:00
GriffinR
165d49f7da
Merge pull request #670 from GriffinRichards/tileset-division
Keep metatile images on separate rows, fix metatile usage count
2025-02-11 14:24:55 -05:00
GriffinR
ac6750de44 Keep search focus when changing map list tabs 2025-02-07 13:43:10 -05:00
GriffinR
6b9a4d73e9 Read/write heal locations using new JSON data 2025-02-06 13:46:42 -05:00
garak
51773926d2 resolve some goofiness 2025-02-06 13:06:30 -05:00
garak
1e7d5144b9 add back metatile limit upper bound check and popup 2025-02-06 13:06:30 -05:00
garak
035c326348 reset button working for change dimension dialog 2025-02-06 13:06:30 -05:00
garak
e4a4fb5ab1 add limits for resizing layouts 2025-02-06 13:06:30 -05:00
garak
54e41b0c20 redesign layout dimension change window 2025-02-06 13:06:30 -05:00
GriffinR
6dcbe45051
Merge pull request #669 from GriffinRichards/port-custom-attr
Port changes from Custom Attributes redesign
2025-02-06 10:11:14 -05:00
GriffinR
7173503f59 Fix Qt5 build, misc warnings 2025-02-05 23:35:25 -05:00
GriffinR
05c07e5a00 Keep metatile images on separate rows, fix metatile usage count 2025-02-05 15:01:32 -05:00
GriffinR
2aa2f8dbd4 Fix shortcuts editor crash 2025-02-05 11:07:37 -05:00
GriffinR
fe38e42591 Port changes from Custom Attributes redesign 2025-01-31 10:45:59 -05:00
GriffinR
9bdf396679 Fix some lexical sorting of names with numbers 2025-01-30 12:07:25 -05:00
GriffinR
09694891f3
Merge pull request #665 from GriffinRichards/wild-enc-search
Add search feature to wild pokemon tab
2025-01-30 11:48:28 -05:00
GriffinR
5a6d5ea929 Fix some issues with map connections after layout split 2025-01-29 13:48:03 -05:00
GriffinR
3bbb81e436 Add search feature to wild pokemon tab 2025-01-28 14:09:24 -05:00
GriffinR
cfb6f70580 Fix freeze when creating a new tileset 2025-01-22 14:38:49 -05:00
GriffinR
90c904ecb9 Make it easier to edit MAPSEC names, Area -> Location 2025-01-22 13:12:22 -05:00
GriffinR
72f37d8983
Merge branch 'master' into new-map-dialog 2024-12-28 01:47:02 -05:00
GriffinR
7a36fcc2ba
Merge pull request #655 from GriffinRichards/fix-transparency
Add setting for how to render fully transparent pixels
2024-12-28 01:34:26 -05:00
GriffinR
3ca1ee1650 Remove config diff noise from hashed containers changing order 2024-12-28 01:22:46 -05:00
GriffinR
8bd71a3860 Merge branch 'master' of https://github.com/huderlem/porymap into new-map-dialog 2024-12-23 15:06:22 -05:00
GriffinR
9efbe53238
Merge pull request #609 from GriffinRichards/commit-version
Include latest commit hash in version info
2024-12-23 14:58:06 -05:00
GriffinR
0d939772bf Add QMessageBox convenience classes 2024-12-22 23:58:59 -05:00
GriffinR
486d1b7335 Add config settings for rendering transparency 2024-12-19 16:28:53 -05:00
GriffinR
12dba1a8b3 Add Qt version to About, remove changelog 2024-12-18 15:04:22 -05:00
GriffinR
64a9e2cacb Add dividing line for tilesets in Tileset Editor 2024-12-18 14:27:12 -05:00
GriffinR
4f6291a3f6 Support non-Windows builds without QtCharts 2024-12-18 13:33:29 -05:00
GriffinR
8f1e112858 Combine tile image export functions 2024-12-16 16:23:52 -05:00
GriffinR
bf3820745a Add new QValidator classes 2024-12-16 14:34:45 -05:00
GriffinR
52a7cd4f56 Combine minor creation dialogs 2024-12-12 15:46:13 -05:00
GriffinR
391f7b1685 Reserve MAP_DYNAMIC, fix some MAPSEC displays not updating, new error messages/handling 2024-12-09 21:43:36 -05:00
GriffinR
435d22c63a Fix layouts list sorting by ID rather than name 2024-12-06 11:02:38 -05:00
GriffinR
9c40b04ad5 Redesign new tileset dialog 2024-12-06 10:39:50 -05:00
GriffinR
83ef14a242 Fix some problems with layout directory creation 2024-12-03 15:22:37 -05:00
GriffinR
06a263c689 Fix regression to map stitch images from layout split 2024-11-27 02:41:57 -05:00
GriffinR
f1a4b78ca9 Fix map duplication 2024-11-26 20:44:43 -05:00
GriffinR
ff04a41db2 Add map list tool tips / copy actions, simplify MapListModel 2024-11-26 15:19:28 -05:00
GriffinR
4671321690 Add item to duplicate map/layouts from list 2024-11-23 22:36:37 -05:00
GriffinR
d0101d807e Finish new layout dialog redesign 2024-11-22 14:22:18 -05:00
GriffinR
e7df829843 Group AdvanceMap parsing together, fix its tileset defaults 2024-11-21 14:11:47 -05:00
GriffinR
bd39bcfdd2 Begin new layout dialog redesign 2024-11-21 12:12:43 -05:00
GriffinR
724f42019c Automatically add new map groups 2024-11-19 13:49:00 -05:00
GriffinR
8bb0100540 Separate layout/header features of new map dialog 2024-11-14 14:43:20 -05:00
GriffinR
4f8224359e Use collapsible section for header data in new map dialog 2024-11-12 14:34:10 -05:00
GriffinR
205bb48c65 Header tab and new map dialog share UI setup 2024-11-12 14:27:35 -05:00
GriffinR
d6a796e3b4 Start new map dialog redesign 2024-11-12 13:46:09 -05:00
GriffinR
9d87ece663 New map popup/prompt to dialog 2024-11-12 13:23:43 -05:00
t
c9695521c7
Merge pull request #515 from garakmon/slam
Separate Layouts and Maps
2024-11-11 11:10:00 -05:00
GriffinR
e278d48380 Fix script API undo/redo for layouts, final TODO items 2024-11-08 15:26:43 -05:00
GriffinR
06ece16b93 Finish support for deleting MAPSEC values 2024-11-08 14:46:27 -05:00
GriffinR
d448765d63 Read/write MAPSEC values using the region map json 2024-11-07 22:49:52 -05:00
GriffinR
727cce5d8b
Merge pull request #633 from GriffinRichards/api-images
Render API images as pixmaps
2024-11-05 00:29:06 -05:00
GriffinR
7d89031273 Resolve warnings and low-hanging TODO items 2024-11-04 21:35:36 -05:00
GriffinR
f90dae0da0 Set up map list tool bar to record setting states 2024-10-31 16:36:16 -04:00
GriffinR
ab8eb7c7e4 Reimplement disabled Delete key features 2024-10-31 14:58:01 -04:00
GriffinR
23e094d850 Update map list delete functionality 2024-10-31 14:30:56 -04:00
GriffinR
3bd5ddbf2f Simplify saving the map list tab 2024-10-28 16:02:17 -04:00
GriffinR
7da2375998 Refactor map list buttons 2024-10-28 15:36:47 -04:00
GriffinR
d674856b18 Render API images as pixmaps 2024-10-28 11:42:44 -04:00
GriffinR
40d34b2d5b Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-25 14:33:00 -04:00
GriffinR
b5c50e7660 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-16 22:29:03 -04:00
GriffinR
09eaef4dbf Update help buttons, chart help text 2024-10-16 14:23:28 -04:00
GriffinR
e431c161e7
Merge pull request #621 from GriffinRichards/file-dialogs
Correctly restore window focus for file dialogs
2024-10-16 10:41:17 -04:00
GriffinR
426faddad7
Merge pull request #619 from GriffinRichards/stitch-preview
Add actual preview to Export Map Stitch Image
2024-10-10 13:40:18 -04:00
GriffinR
1ed9b1ee10 Correctly restore window focus for file dialogs 2024-10-09 12:35:12 -04:00
GriffinR
931b471cf1
Merge pull request #617 from GriffinRichards/custom-grid
Add map grid settings
2024-10-09 11:10:17 -04:00
GriffinR
a31a014b5d Fix Summary Chart animations stopping prematurely 2024-10-08 01:40:40 -04:00
GriffinR
4dc598455f Improve color slider edit history 2024-10-04 13:53:16 -04:00
GriffinR
bdcfc0467b Fix image exporter reset button 2024-10-04 03:45:47 -04:00
GriffinR
6e79c6c4c3 Add 'All' settings, avoid unnecessary work in a few places 2024-10-03 22:55:12 -04:00
GriffinR
ae6312c131 Add actual preview to Export Map Stitch Image 2024-10-02 02:29:33 -04:00
GriffinR
eefa46a2a2 Fix Qt 5.15 build 2024-10-01 10:19:40 -04:00
GriffinR
932c299935 Refactor palette editor to use new color input widget 2024-10-01 09:03:01 -04:00
GriffinR
44642c347f Add custom dash patterns to grid settings 2024-10-01 01:50:29 -04:00
GriffinR
a277e19334 Add linking buttons to grid settings 2024-09-28 21:43:41 -04:00
GriffinR
274d95eef5 Add color input to grid settings 2024-09-28 18:07:37 -04:00
GriffinR
2cd4cb9334 Add styles to grid settings 2024-09-27 22:42:07 -04:00
GriffinR
16536eb940 Add grid settings window 2024-09-27 22:19:29 -04:00
garak
b622bec2be remove refs to old functions 2024-09-24 12:45:32 -04:00
garak
815a16e8ca Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-09-24 11:31:06 -04:00
GriffinR
a0ebae00c6 Fix a bunch of memory leaks on startup->shutdown 2024-09-11 13:16:54 -04:00
GriffinR
57f74d4b20
Merge pull request #607 from GriffinRichards/triple-layer
Interpret triple-layer metatiles from NUM_TILES_PER_METATILE
2024-09-02 23:15:58 -04:00
GriffinR
d7e41e7190
Merge pull request #605 from GriffinRichards/encounter-graph
Add encounter charts
2024-09-02 20:30:33 -04:00
GriffinR
0b4f02779b Fix regression for dragging multiple events 2024-08-30 23:32:46 -04:00
GriffinR
1a456bc47b Save config in custom scripts editor, stop accidental 'refreshed' popup 2024-08-30 11:56:35 -04:00
GriffinR
d41d4d53e7 Interpret triple-layer metatiles from NUM_TILES_PER_METATILE 2024-08-29 12:44:50 -04:00
GriffinR
8240cf55ef Exclude charts features for our Windows builds 2024-08-27 21:39:33 -04:00
GriffinR
325757d4ee Clean up in wildmonchart 2024-08-27 19:05:44 -04:00
GriffinR
d8d196b79d Connect wild mon chart to editor 2024-08-27 15:30:46 -04:00
GriffinR
dba3e524b3 Merge branch 'master' of https://github.com/huderlem/porymap into encounter-graph 2024-08-26 23:52:34 -04:00
GriffinR
6b5d191746 Fix level distribution max, theme issue 2024-08-24 01:36:16 -04:00
GriffinR
76e5fd4834 Add summary charts help button 2024-08-23 18:21:44 -04:00
GriffinR
2ec9012c07 Save summary chart settings in config 2024-08-23 16:00:42 -04:00
GriffinR
6f74909a3c Fixes for some visuals in chart window 2024-08-23 15:00:00 -04:00
GriffinR
7c9fcb6616 Add chart theme selector 2024-08-23 14:10:42 -04:00
GriffinR
8f6871dae0 Add grouped level distribution chart 2024-08-23 12:22:15 -04:00