Commit Graph

1112 Commits

Author SHA1 Message Date
GriffinR
156546def6 Use map group order for initial map 2025-05-16 03:09:50 -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
dd8486ba34 Fix some tool button issues 2025-05-11 18:15:24 -04:00
GriffinR
6f42f86289 Fix map navigation persisting between projects 2025-05-11 14:38:03 -04:00
GriffinR
c010f95274
Merge branch 'dev' into soften-map-loading 2025-05-11 13:28:55 -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
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
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
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
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
424d2e6457
Merge branch 'dev' into version-check 2025-05-04 15:09:12 -04:00
GriffinR
69482904cc Add log display to status bar, keep log file open 2025-05-04 00:09:29 -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
8245f60e2b Prefer NoScrollComboBox::setTextItem over setCurrentText 2025-05-01 10:30:11 -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
15e2d3cf05 Start fixing some of the Message UI deadlocks 2025-04-30 03:14:30 -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
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
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
046f942f41 Fix some issues with player view rectangle visibility 2025-04-23 11:42:57 -04:00
GriffinR
b7e19a427d Add global constants settings 2025-04-22 23:36:34 -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
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
d33f0fc6f0 Stop QTextEdit from stealing scroll focus 2025-04-22 11:21:48 -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
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
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
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
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
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
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
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
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
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
khbsd
d62b7a416d
Add sorting to encounter group dropdowns (#704) 2025-03-20 12:11:12 -04:00