Commit Graph

1832 Commits

Author SHA1 Message Date
GriffinR
560d204890 Fix duplicated maps writing the wrong name 2025-05-29 22:19:37 -04:00
GriffinR
ba1aa2b1ff Fix some issues with the filewatcher 2025-05-29 01:16:07 -04:00
GriffinR
4816c1c8af Add buttons to change scale when resizing maps 2025-05-28 14:50:47 -04:00
GriffinR
fb3e93be8a Scale map appropriately when resizing 2025-05-28 14:20:54 -04:00
GriffinR
cf84f8aeff Update major version commit hashes 2025-05-27 10:55:48 -04:00
GriffinR
3efd7683ab Fix handling for spritesheets with multiple rows 2025-05-26 20:12:38 -04:00
GriffinR
0ed54d6643 Skip some unnecessary work in layout-only mode 2025-05-26 15:15:46 -04:00
GriffinR
d795a1133d Combine QLineEdit error stylesheets 2025-05-26 14:54:39 -04:00
GriffinR
1c5e75ef01 Use native message window for WildMonChart 2025-05-22 23:03:49 -04:00
GriffinR
658835bebd Simplify graphics file extension replacement 2025-05-22 15:11:11 -04:00
GriffinR
947142e370
Merge pull request #734 from GriffinRichards/config-file
Fix some issues with config loading
2025-05-22 14:28:13 -04:00
GriffinR
d5248c7dbc Sync map list search filter between tabs 2025-05-22 13:16:58 -04:00
GriffinR
e4067bf088 Allow right-clicking border metatiles to select them 2025-05-21 22:57:33 -04:00
GriffinR
55bfcaec19 Fix missing ID handling for warp events 2025-05-21 22:11:51 -04:00
GriffinR
a5d68e6660 Add warning to Configure JSON for encounters 2025-05-21 16:11:01 -04:00
GriffinR
647dcf15d9 Remove old Windows support comments 2025-05-21 15:45:35 -04:00
GriffinR
a31b607128 Fix manual typo 2025-05-21 15:21:48 -04:00
GriffinR
fb92941c39 Add new 'Breaking Changes' manual page 2025-05-21 15:20:41 -04:00
GriffinR
50c845b15a Clear prefab UI when project is closed 2025-05-21 12:48:53 -04:00
GriffinR
d8e3eb6a30 Fix some issues with config loading 2025-05-21 11:53:34 -04:00
GriffinR
8e13c98c5e Fix focus returning to the search bar after project reload 2025-05-19 22:29:22 -04:00
GriffinR
af335b82e2 Combine QImage::flip version checks 2025-05-19 16:15:19 -04:00
Marcus Huderle
e2b28de483 enable update promoter on Windows 2025-05-18 18:50:51 -05:00
GriffinR
83db36f6eb Fix crash when switching projects with the Shortcuts Editor open 2025-05-17 02:34:20 -04:00
GriffinR
8b437281ab Update 'Project Files' manual page 2025-05-17 02:09:45 -04:00
GriffinR
deaf067c50 Fix minor issues with resize layout 2025-05-16 13:04:26 -04:00
GriffinR
760b6119d0 Remove old log statement 2025-05-16 11:31:29 -04:00
GriffinR
156546def6 Use map group order for initial map 2025-05-16 03:09:50 -04:00
GriffinR
d14cca6891 Fix some palette error handling 2025-05-16 03:00:52 -04:00
GriffinR
018ad49ac4 Use Message functions for Tileset Editor 2025-05-12 23:53:02 -04:00
GriffinR
b1f531924f Fix some of the broken native dialogs 2025-05-12 22:50:06 -04:00
GriffinR
7239f6f4a3 Adjust minimum map list size 2025-05-12 22:22:22 -04:00
GriffinR
18b6355072 Add disabled theme for QSlider 2025-05-11 22:58:52 -04:00
GriffinR
dd8486ba34 Fix some tool button issues 2025-05-11 18:15:24 -04:00
GriffinR
b1542f5822 Add missing template types 2025-05-11 16:02:33 -04:00
GriffinR
aaf364248e Simplfy warp warning button connection 2025-05-11 15:09:02 -04:00
GriffinR
6f42f86289 Fix map navigation persisting between projects 2025-05-11 14:38:03 -04:00
GriffinR
77a7acd529 Fix disabled arrow styling on Default theme 2025-05-11 14:28:14 -04:00
GriffinR
c010f95274
Merge branch 'dev' into soften-map-loading 2025-05-11 13:28:55 -04:00
GriffinR
cc547b7cb6
Merge pull request #636 from GriffinRichards/windowsize
Resize main window to fit available screen geometry
2025-05-08 22:29:58 -04:00
GriffinR
96b90dc5e1 Add 'Open in JSON' actions 2025-05-08 22:25:07 -04:00
GriffinR
56722f7359 Don't auto-expand Layout folders when searching map list 2025-05-08 19:50:41 -04:00
GriffinR
c0fb6022f5 Add tool tip for disabled tabs 2025-05-08 19:41:34 -04:00
GriffinR
9d2e3145bb
Merge pull request #726 from GriffinRichards/status-bar-log
Add warning/error messages to status bar
2025-05-08 19:00:17 -04:00
GriffinR
9812f94d12 Add shortcuts for Back/Forward 2025-05-08 16:19:46 -04:00
GriffinR
8e141247bb Soften layout load requirements 2025-05-08 16:04:37 -04:00
GriffinR
d0587f400c Add navigation arrows 2025-05-08 15:20:05 -04:00
GriffinR
9a3b45117b Make map load failure non-destructive 2025-05-08 13:26:30 -04:00
GriffinR
a15daf6c14 Relax remaining MAP_ prefix assumptions 2025-05-07 12:29:43 -04:00
GriffinR
a906783f68 Remove last MAP_ prefix requirement 2025-05-07 12:17:09 -04:00
GriffinR
aa32276381 More message fixes 2025-05-06 16:25:38 -04:00
GriffinR
238a9d1865 Fix regression to cursor single tile mode 2025-05-06 15:30:45 -04:00
GriffinR
ac8a79a7cc Take screen boundaries into account 2025-05-04 23:28:26 -04:00
GriffinR
e710e105c5 Merge branch 'dev' of https://github.com/huderlem/porymap into windowsize 2025-05-04 22:46:19 -04:00
GriffinR
eaceb45592 Add settings to enable/disable status bar logging 2025-05-04 22:28:10 -04:00
GriffinR
7511f445bd Merge branch 'dev' of https://github.com/huderlem/porymap into status-bar-log 2025-05-04 18:49:52 -04:00
GriffinR
6e541b0994
Merge pull request #724 from GriffinRichards/player-icons
Add new player icons for the Events tab
2025-05-04 17:09:00 -04:00
GriffinR
e2371eb1e6 Remove redundant text change for tileset combo boxes 2025-05-04 16:34:43 -04:00
GriffinR
424d2e6457
Merge branch 'dev' into version-check 2025-05-04 15:09:12 -04:00
GriffinR
03a252c241
Merge pull request #723 from GriffinRichards/update-scripts
Update script dropdowns when a map's scripts file is edited
2025-05-04 14:47:24 -04:00
GriffinR
8ab1359d43 Auto-hide warnings/errors after 5 seconds 2025-05-04 03:04:54 -04:00
GriffinR
69482904cc Add log display to status bar, keep log file open 2025-05-04 00:09:29 -04:00
GriffinR
a1d264cd47 Fix regression to status bar message clearing 2025-05-04 00:08:06 -04:00
GriffinR
c8a9e33d40 Allow copy-pasting version info 2025-05-02 11:22:38 -04:00
GriffinR
5c9cf80a03
Merge branch 'dev' into update-scripts 2025-05-02 11:08:26 -04:00
GriffinR
f8f6fe827d Fix missing filewatcher paths 2025-05-01 15:53:16 -04:00
GriffinR
3876b63836 More loading screen messages, include map.json files 2025-05-01 15:53:10 -04:00
GriffinR
6d6b006620 Minor combo box fixes 2025-05-01 15:52:53 -04:00
GriffinR
8245f60e2b Prefer NoScrollComboBox::setTextItem over setCurrentText 2025-05-01 10:30:11 -04:00
GriffinR
91d89a7422 Fix Qt5 build 2025-05-01 00:29:08 -04:00
GriffinR
6d3fd5bc7e Add settings for events tab icon 2025-05-01 00:17:38 -04:00
GriffinR
311b6c8638 Add more player icons 2025-04-30 16:30:43 -04:00
GriffinR
31cf00de8b Update git search error messages 2025-04-30 13:08:02 -04:00
GriffinR
96664e9680 Merge branch 'dev' of https://github.com/huderlem/porymap into version-check 2025-04-30 12:03:13 -04:00
GriffinR
22a36d4664
Merge pull request #721 from GriffinRichards/global-defines
Add global define settings
2025-04-30 11:58:28 -04:00
GriffinR
8b5c2ec792 Fix missing warning for initially incorrect warps 2025-04-30 11:48:39 -04:00
GriffinR
15e2d3cf05 Start fixing some of the Message UI deadlocks 2025-04-30 03:14:30 -04:00
GriffinR
184025aace Reset frames between loading screens 2025-04-29 16:45:09 -04:00
GriffinR
7b7eb221e5 Fix missing first frame of loading screen 2025-04-29 16:43:04 -04:00
garak
7426f47471 clean up 2025-04-29 16:16:10 -04:00
garak
7fb657376d use common version function for splash and about screen 2025-04-29 16:16:10 -04:00
garak
9a0a7865fb show splash screen whenever project is being loaded
... including when switching projects and reloading projects
2025-04-29 16:16:10 -04:00
garak
c2b1f5ab85 fix geometry setting before window exists 2025-04-29 16:16:10 -04:00
garak
134a933d11 create splash screen for loading 2025-04-29 16:16:10 -04:00
GriffinR
79ffe668a3 Update script dropdowns when a map's scripts file is edited 2025-04-28 12:12:19 -04:00
GriffinR
f776a31e4a
Merge pull request #719 from GriffinRichards/local-id
Support local ID strings, misc event fixes
2025-04-24 16:16:31 -04:00
GriffinR
d97fd5b2a6 Update onMapResized 2025-04-23 22:18:45 -04:00
GriffinR
845f93c9e4 Fix Qt 5.14 build 2025-04-23 17:57:22 -04:00
GriffinR
4259e65244 Clean up settings editor changes 2025-04-23 17:35:28 -04:00
GriffinR
715f53731d Parser define maps to hashes 2025-04-23 17:22:14 -04:00
GriffinR
781f965d6b Allow parser to remember defines, globals take precedence 2025-04-23 16:51:57 -04:00
GriffinR
fc0b1b1b58 Fix invalid selections being marginally visible on the collision selector 2025-04-23 14:11:48 -04:00
GriffinR
046f942f41 Fix some issues with player view rectangle visibility 2025-04-23 11:42:57 -04:00
GriffinR
dedf0d3e57 Fix crash on project switch 2025-04-23 02:50:50 -04:00
GriffinR
10aa9a623f Update new tool tips 2025-04-23 02:33:55 -04:00
GriffinR
b7e19a427d Add global constants settings 2025-04-22 23:36:34 -04:00
GriffinR
c3bb051fd5 Fix collision sheet size regression 2025-04-22 21:32:04 -04:00
GriffinR
8fc9e05359 Merge branch 'dev' of https://github.com/huderlem/porymap into global-defines 2025-04-22 15:55:47 -04:00
GriffinR
ed273b9ca0 Add functionality for global constants 2025-04-22 15:54:13 -04:00
GriffinR
eed58e3aff Merge branch 'dev' of https://github.com/huderlem/porymap into local-id 2025-04-22 15:14:08 -04:00
GriffinR
57545eae0a Fix initializer order warning 2025-04-22 15:11:36 -04:00
GriffinR
c26c01aaff Add missing tooltip formatting 2025-04-22 14:48:15 -04:00
GriffinR
c1acf7141d
Merge pull request #718 from GriffinRichards/fix-connection-issues
Fix some issues from the Connections tab redesign
2025-04-22 14:44:40 -04:00
GriffinR
e8ac633700 Save grid settings in config 2025-04-21 18:57:42 -04:00
GriffinR
18f1b95e1a
Merge pull request #716 from GriffinRichards/read-map-offsets
Read MAP_OFFSET_W, MAP_OFFSET_H from project
2025-04-21 17:40:37 -04:00
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
4b3c8abb93 Remove old heal location map tracking, missing assignment in HealLocationEvent::duplicate 2025-04-21 12:58:15 -04:00
GriffinR
c0df85e43b Fix dangling references, other warnings 2025-04-20 20:03:11 -04:00
GriffinR
84882a5fad Prevent dragging events that aren't selected 2025-04-20 13:21:31 -04:00
GriffinR
1d6d0c6dc9 Fix region map tile selector palette differing from selection 2025-04-20 09:43:21 -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
b660ef5d30 Fix Qt5 build 2025-04-17 16:25:44 -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
428693a6c9 Remove now-unnecessary tileset loading 2025-04-16 13:44:46 -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
b6548fd49c Stop zoom behavior from regressing again 2025-04-14 12:40:28 -04:00
GriffinR
e19932b90c Allow custom map connection direction input 2025-04-14 12:40:19 -04:00
GriffinR
168792b9c6 Fix comment typo 2025-04-13 23:10:51 -04:00
GriffinR
366933e2b0
Merge branch 'dev' into read-map-offsets 2025-04-13 22:46:34 -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
c630581453 Add setting for default map size 2025-04-13 22:28:25 -04:00
GriffinR
900ff0afd9 Fix incorrect log comments, update manual 2025-04-13 21:57:40 -04:00
GriffinR
35d5851a8f Read MAP_OFFSET_W, MAP_OFFSET_H from project 2025-04-13 21:40:22 -04:00
GriffinR
55f44a6257 Add project version check via git 2025-04-11 00:58:30 -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
c53e9fcb28 Remove incorrect comment 2025-04-07 21:11:58 -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
374a2b67b8 Remove some redundant event pixmap loading 2025-04-07 16:43:31 -04:00
GriffinR
69efdc34d0 Stop warning when canceling custom filepath dialog 2025-04-07 16:20:18 -04:00
GriffinR
bbd86673c5 Fix uses of QDir::separator, clean and strip root from config paths 2025-04-07 16:17:13 -04:00
GriffinR
17949055f6 Fix local ID being reordered in output JSON 2025-04-07 13:49:26 -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
5c9e84b4c0 Add missing key take 2025-04-04 13:37:15 -04:00
GriffinR
db9e9d6f65 Remove Project::topLevelMapFields 2025-04-04 13:09:14 -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
e1aaf3c18e Speed up opening maps with many warp events 2025-04-03 18:40:39 -04:00
GriffinR
a898791a70 Remove expensive calls to QGraphicsItemGroup::removefromGroup 2025-04-03 16:24:16 -04:00
GriffinR
cdd7e74e7f Fix bug with Hidden Item duplication 2025-04-03 14:51:49 -04:00
GriffinR
011f6196b5 Add setting to keep data only needed for matching 2025-04-03 13:43:54 -04:00
GriffinR
e94fce0c8d Combine the 3 QMaps for MAPSEC data 2025-04-03 13:24:50 -04:00
GriffinR
a4508918a1 Preserve custom global fields in layouts, heal_locations, region_map_sections, and map_groups json files 2025-04-03 11:59:55 -04:00
GriffinR
7c107f3470 Fix timelapse not considering multiple command ID flags 2025-03-30 17:38:05 -04:00
GriffinR
c9b0d139b2 Preserve custom fields in the map_sections, layouts, and connections arrays 2025-03-30 00:20:39 -04:00
GriffinR
d264188ef9 Read wild pokemon table name from project rather than settings 2025-03-29 20:42:08 -04:00
GriffinR
44f3b27f2d Fix older Qt builds 2025-03-29 02:07:48 -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
1f9a836da9 Fix regression for appending new tilesets, add missing tooltip 2025-03-27 13:07:53 -04:00
GriffinR
6e6569634f Fix Qt5 build 2025-03-27 00:00:04 -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
00d79f91fe
Merge pull request #705 from GriffinRichards/map-cache
More fixes from layout split
2025-03-26 21:41:07 -04:00
GriffinR
77330be555 Fix pixmap resizing, speed up stitch rendering 2025-03-24 15:52:20 -04:00
GriffinR
d437dffcd2 Fix transparency when rendering events in timelapse mode 2025-03-22 01:12:52 -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
8b5fa3ac9f
Merge pull request #703 from GriffinRichards/clazy
Fix some clazy warnings
2025-03-21 15:24:18 -04:00
GriffinR
f7781ca5df Render full border in image export 2025-03-21 13:47:13 -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
1adbfcb3ec Fix default name for new encounter groups not guaranteed unique 2025-03-20 12:15:21 -04:00
khbsd
d62b7a416d
Add sorting to encounter group dropdowns (#704) 2025-03-20 12:11:12 -04:00
GriffinR
f3b751f600 Update metatile attribute combo boxes appropriately 2025-03-19 18:54:17 -04:00
GriffinR
969c9d8e5a Read encounter/terrain types 2025-03-19 15:22:06 -04:00
GriffinR
ef6eb69c72 Add file cache to ParserUtil 2025-03-19 14:27:56 -04:00
GriffinR
d555347323 Fix crash when adding first MAPSEC define 2025-03-18 23:51:38 -04:00
GriffinR
d42887e815 Fix regression to loading clone object events 2025-03-18 21:19:59 -04:00
GriffinR
a406f4c210 Restore Dynamic map error checks 2025-03-17 23:56:25 -04:00
GriffinR
77134072da Fix some clazy warnings (container-anti-pattern, incorrect-emit, and unused-non-trivial-variable) 2025-03-17 03:57:55 -04:00
GriffinR
8dcb66ca52 Move map/layout loaded state to Project 2025-03-16 19:29:26 -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
4b1332609e Restore layout selector if left in invalid state 2025-03-14 23:23:40 -04:00
GriffinR
1375572be1 Update map list when MAPSEC/layout is changed 2025-03-14 22:26:15 -04:00
GriffinR
f4d4980aad Fix crash in layout selector 2025-03-14 16:12:35 -04:00
GriffinR
7cfbcda9c2 Create new MAPSECs automatically on save if needed 2025-03-14 15:53:15 -04:00
GriffinR
763382a811 Allow projects with no maps or map groups 2025-03-14 15:00:58 -04:00
GriffinR
a0a8c71096 Replace various map constant arrays with data stored in Map objects 2025-03-14 14:45:28 -04:00
GriffinR
f03d817800
Merge pull request #697 from GriffinRichards/graphics-file-extensions
Expose file extension regex to config
2025-03-14 13:01:16 -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
7ab7f09fe3 Expose file extension regex to config 2025-03-06 01:52:43 -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