Commit Graph

1697 Commits

Author SHA1 Message Date
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
GriffinR
d37864fa82 Fix empty metatile labels being disallowed 2025-03-03 13:51:57 -05:00
GriffinR
7efc3e3421
Merge pull request #692 from GriffinRichards/utility
Add utility file, more project load speed improvements
2025-03-02 20:11:51 -05:00
GriffinR
14a949a1ec
Merge pull request #693 from GriffinRichards/layout-image-cache
Cache metatile images for each render pass
2025-03-02 20:10:01 -05:00
GriffinR
36aac9304f Add Layout::setClean 2025-03-02 19:27:25 -05:00
GriffinR
7cfd9fa0f8 Fix changing tilesets not marking layouts as unsaved 2025-03-02 19:23:19 -05:00
GriffinR
4df7b9319b Remove erroneous comment, add missing static 2025-03-02 18:33:50 -05:00
GriffinR
75dbd25630 Fix events not being cleared 2025-03-02 18:20:18 -05:00
GriffinR
edd2cce110 New event button refactor 2025-03-02 18:05:33 -05:00
GriffinR
87193158ae Fix crash when launching in layout-only mode 2025-02-28 15:17:36 -05:00
GriffinR
e0de7fa73f Stop unnecessary full redraws of metatile selectors 2025-02-28 14:17:29 -05:00
GriffinR
8f7e6b94b6 Cache metatile images for each render pass 2025-02-27 21:47:03 -05:00
GriffinR
e260c642b0 Speed improvements for Project::readSpeciesIconPaths 2025-02-27 16:23:05 -05:00
GriffinR
6d8b4f21d8 Move hex string conversions to Util 2025-02-27 13:36:13 -05:00
GriffinR
ded9f724dc Parser filter lists to QSet 2025-02-27 13:10:57 -05:00
GriffinR
75b8b2c16c Merge branch 'dev' of https://github.com/huderlem/porymap into utility 2025-02-26 16:05:04 -05:00
GriffinR
36b4ffa02d Fix changes for unsaved new maps applying to map groups 2025-02-26 13:23:26 -05:00
GriffinR
3e15487888 Add missing map group error check 2025-02-26 13:13:23 -05:00
GriffinR
cdd233f7d5 Consider 'shared_scripts_map' when reading map scripts 2025-02-26 12:38:33 -05:00
GriffinR
2e8422d80c
Merge pull request #689 from GriffinRichards/event-speed-improvements
Event speed improvements
2025-02-26 11:56:07 -05:00
GriffinR
c6c64aae15 Stop automatically saving maps/layouts on creation 2025-02-25 18:51:58 -05:00
GriffinR
b78f23f259 Make Duplicate Map/Layout more accessible 2025-02-25 18:51:51 -05:00
GriffinR
dff7fae040
Merge pull request #681 from GriffinRichards/in-game-reload-message
Add in-game reload message
2025-02-25 00:02:15 -05:00
GriffinR
de703b4634
Merge pull request #679 from GriffinRichards/better-parse-errors
Combine parsing error messages
2025-02-24 23:59:15 -05:00
GriffinR
ae55d64e5b Stop rendering map connections twice on load 2025-02-22 19:38:32 -05:00
GriffinR
7637dc5ad6 Fix Qt5 build 2025-02-22 19:00:12 -05:00
GriffinR
491b003f2f Make use of the dimension fields in ObjectEventGraphicsInfo 2025-02-22 18:05:51 -05:00
GriffinR
9afaa4ae3e Add setting to re-enable global script autocomplete 2025-02-22 17:48:42 -05:00
GriffinR
880e5847c7 Remove global scripts from autocomplete 2025-02-22 17:48:33 -05:00
GriffinR
eef9a37d16 Cache event pixmaps 2025-02-22 17:47:57 -05:00
GriffinR
bf5ead848d Only load event sprites when requested 2025-02-22 17:46:59 -05:00
GriffinR
a2a8e27504
Merge pull request #682 from GriffinRichards/event-loading
Limit the maximum number of events
2025-02-22 17:44:49 -05:00
garak
a7ae458468 add support for drag+dropping multiple map groups 2025-02-22 16:36:46 -05:00
garak
632eeef53f fix dropping groups beyond end of group list
The issue was that the end-of-list drop zone is quite small
    and groups were being dropped outside of the bounds of the mapList
2025-02-22 16:36:46 -05:00
garak
29f88e6b76 fix drag+drop on groups moved upward in list 2025-02-22 16:36:46 -05:00
GriffinR
11d9d7b795 Add layout prefix to config, fix species prefix hardcoded length 2025-02-22 15:15:04 -05:00