Commit Graph

408 Commits

Author SHA1 Message Date
GriffinR
d992a29e36 Add input fields for LOCALID 2025-04-18 11:10:02 -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
ee0f5923ce Better error handling if saving fails 2025-04-15 17:10:32 -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
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
2d827f62f7 Support event lookup by ID name 2025-04-07 13:38:54 -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
e1aaf3c18e Speed up opening maps with many warp events 2025-04-03 18:40:39 -04:00
GriffinR
e94fce0c8d Combine the 3 QMaps for MAPSEC data 2025-04-03 13:24:50 -04:00
GriffinR
c9b0d139b2 Preserve custom fields in the map_sections, layouts, and connections arrays 2025-03-30 00:20:39 -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
5cd53be057
Merge branch 'dev' into tileset-types 2025-03-26 21:42:37 -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
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
8dcb66ca52 Move map/layout loaded state to Project 2025-03-16 19:29:26 -04:00
GriffinR
1375572be1 Update map list when MAPSEC/layout is changed 2025-03-14 22:26:15 -04:00
GriffinR
7cfbcda9c2 Create new MAPSECs automatically on save if needed 2025-03-14 15:53:15 -04:00
GriffinR
a0a8c71096 Replace various map constant arrays with data stored in Map objects 2025-03-14 14:45:28 -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
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
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
edd2cce110 New event button refactor 2025-03-02 18:05:33 -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
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
de703b4634
Merge pull request #679 from GriffinRichards/better-parse-errors
Combine parsing error messages
2025-02-24 23:59:15 -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
1b510b6a6e Add utility.cpp, fix bug when map/layout name is just underscores 2025-02-22 15:00:06 -05:00
GriffinR
88f5a90b2f Convert selected_events from DraggablePixmapItem to Event 2025-02-19 14:26:18 -05:00
GriffinR
a2aa20ec46 Generalize event loading 2025-02-19 13:24:54 -05:00
GriffinR
17c35a8d98 Condense parser error messages 2025-02-18 15:18:07 -05:00
GriffinR
ee986b8e56 Remove unnecessary const qualifier, unused variable 2025-02-12 15:54:18 -05:00
GriffinR
e8f2713952
Merge branch 'dev' into heal-locations 2025-02-11 14:26:15 -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
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
fe38e42591 Port changes from Custom Attributes redesign 2025-01-31 10:45:59 -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
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
486d1b7335 Add config settings for rendering transparency 2024-12-19 16:28:53 -05:00
GriffinR
bf3820745a Add new QValidator classes 2024-12-16 14:34:45 -05:00
GriffinR
bdd64a6c6b Use applicationName() for window titles, clean up some remaining TODO items 2024-12-14 16:22:28 -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
f1a4b78ca9 Fix map duplication 2024-11-26 20:44:43 -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
8bb0100540 Separate layout/header features of new map dialog 2024-11-14 14:43:20 -05:00
GriffinR
205bb48c65 Header tab and new map dialog share UI setup 2024-11-12 14:27:35 -05:00
GriffinR
acaed90d65 Read map.json constants on project open 2024-11-12 13:13:09 -05:00
GriffinR
b7d78b0263 Make Map members private 2024-11-12 12:44:33 -05:00
GriffinR
d448765d63 Read/write MAPSEC values using the region map json 2024-11-07 22:49:52 -05:00
GriffinR
b89c1ddc80 Show unsaved changes warning for map list and layout-only edits 2024-10-29 21:51:05 -04:00
GriffinR
2ce5c3fcc5 Fix crash on tileset save, bugs with map resizing 2024-10-29 16:16:35 -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
70807fba3a Stop leaking tileset metatiles 2024-10-16 11:57:47 -04:00
GriffinR
f192b745dd Add additional static functions to filedialog 2024-10-10 01:43:35 -04:00
GriffinR
1ed9b1ee10 Correctly restore window focus for file dialogs 2024-10-09 12:35:12 -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
2f5f401a37 Construct regex to filter defines beforehand 2024-09-11 15:04:06 -04:00
GriffinR
a0ebae00c6 Fix a bunch of memory leaks on startup->shutdown 2024-09-11 13:16:54 -04:00
GriffinR
f7fc899627
Merge branch 'master' into parse-enum 2024-09-02 20:37:41 -04:00
GriffinR
d7e41e7190
Merge pull request #605 from GriffinRichards/encounter-graph
Add encounter charts
2024-09-02 20:30:33 -04:00
GriffinR
9ae336080e Consolidate event constructor calls 2024-08-30 23:33:46 -04:00
GriffinR
5c9a1d4140 Fix enum comma parsing 2024-08-29 00:05:05 -04:00
GriffinR
b1ad6d83f4 Replace 'prefix' names where we were actually using regex 2024-08-28 16:06:28 -04:00
GriffinR
869d0c7dec Restore display order for unevaluated defines 2024-08-28 15:38:41 -04:00
GriffinR
4b0d30fbc4 Initial enum support 2024-08-28 15:01:21 -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
2c65c22b30 Summary chart to horizontal percent bar chart 2024-08-21 18:34:54 -04:00
GriffinR
f70e77ab66 Final MapConnection testing fixes 2024-08-20 13:23:46 -04:00
GriffinR
cbd75dc20b Map connection edit history 2024-08-19 14:54:08 -04:00
GriffinR
1686167714 Fix more minor map connection issues 2024-08-13 14:59:41 -04:00