Commit Graph

479 Commits

Author SHA1 Message Date
GriffinR
c49470c47e Fix some memory leaks 2025-02-07 23:15:18 -05:00
GriffinR
6b9a4d73e9 Read/write heal locations using new JSON data 2025-02-06 13:46:42 -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
be02424f1c Reduce diff noise when saving maps 2025-02-05 15:59:13 -05:00
GriffinR
05c07e5a00 Keep metatile images on separate rows, fix metatile usage count 2025-02-05 15:01:32 -05:00
GriffinR
fe38e42591 Port changes from Custom Attributes redesign 2025-01-31 10:45:59 -05:00
GriffinR
3bbb81e436 Add search feature to wild pokemon tab 2025-01-28 14:09:24 -05:00
GriffinR
0cf7a45890 Don't automatically create empty MAPSEC display names 2025-01-22 15:49:20 -05:00
GriffinR
a00636260c Remove old layout suffix function 2025-01-22 15:29:11 -05:00
GriffinR
f4c0cb2d2d Use placeholder text for new map/layout names 2025-01-22 13:24:09 -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
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
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
4209c3e3f8 Fix checkerboard pattern for secondary tilesets 2024-12-12 16:38:51 -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
9c40b04ad5 Redesign new tileset dialog 2024-12-06 10:39:50 -05:00
GriffinR
c2cf3cc9c7 Fix tileset palette saving crash 2024-12-04 15:41:29 -05:00
GriffinR
ba4a43d595 Reserve MAP_UNDEFINED 2024-12-03 15:46:25 -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
b230f21e8d Automatically add new MAPSEC values from New Map dialog 2024-11-23 23:19:49 -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
7d7db3857d Clean up new map dialog redesign 2024-11-12 15:06:14 -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
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
18308fa9de Stop writing map_groups.h 2024-11-11 18:42:26 -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
23e094d850 Update map list delete functionality 2024-10-31 14:30:56 -04:00
GriffinR
b89c1ddc80 Show unsaved changes warning for map list and layout-only edits 2024-10-29 21:51:05 -04:00
GriffinR
785ac958a5 Fix crash when file watcher message triggers 2024-10-29 20:09:01 -04:00
GriffinR
40d34b2d5b Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-25 14:33:00 -04:00
GriffinR
10aa6f6c3f Fix new name regexes, some assumptions about MAPSEC_NONE, memory leak 2024-10-17 15:56:05 -04:00
GriffinR
728355d202 Fix some missing constant usage 2024-10-17 12:12:33 -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
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
a0ebae00c6 Fix a bunch of memory leaks on startup->shutdown 2024-09-11 13:16:54 -04:00
GriffinR
bb33d48ea1 Remove unused Qt class variables 2024-09-11 12:02:18 -04:00
GriffinR
3178f20804 Clean up warnings 2024-09-11 12:02:09 -04:00
GriffinR
11bd41d000
Merge pull request #606 from GriffinRichards/parse-enum
Support for parsing enums
2024-09-08 21:38:10 -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
f7fc899627
Merge branch 'master' into parse-enum 2024-09-02 20:37:41 -04:00
GriffinR
d41d4d53e7 Interpret triple-layer metatiles from NUM_TILES_PER_METATILE 2024-08-29 12:44:50 -04:00
GriffinR
b1ad6d83f4 Replace 'prefix' names where we were actually using regex 2024-08-28 16:06:28 -04:00
GriffinR
0e9dacd159 Read MAX_ENCOUNTER_RATE from project 2024-08-27 16:14:02 -04:00
GriffinR
a7272191f4 Fix some species name issues for encounter table 2024-08-27 15:38:49 -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
9b09637b47 Summary chart adjustments 2024-08-22 01:31:46 -04:00
GriffinR
1686167714 Fix more minor map connection issues 2024-08-13 14:59:41 -04:00
GriffinR
4af1c4d463 Take advantage of MapConnection as QObject 2024-08-08 17:25:23 -04:00
GriffinR
4e04e57c05 MapConnection to QObject 2024-08-04 17:21:30 -04:00
GriffinR
c8434c85b3 Clean up project close for connections tab 2024-07-24 13:52:46 -04:00
GriffinR
3bf237ff45 Merge branch 'master' of https://github.com/huderlem/porymap into connections 2024-07-24 13:08:06 -04:00
GriffinR
96b5fb1617 Performance & bug clean up 2024-07-17 16:48:37 -04:00
GriffinR
9efe67a72f Add sanity check to project opening 2024-07-16 14:19:47 -04:00
GriffinR
db598a43db Write config files on close / save, not on modification 2024-07-15 20:03:37 -04:00
GriffinR
7c6b33da1b Add selection highlight to connections list 2024-07-08 11:07:16 -04:00
GriffinR
391285aee8 Add buttons to open Dive/Emerge maps 2024-06-28 22:01:13 -04:00
garak
34478e69d9 cleanup: resolve remaining (outdated) TODOs 2024-04-19 18:41:52 -04:00
garak
6520189352 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-02-22 16:31:16 -05:00
garak
879bb44bc0 functions to remove map groups and map sections 2024-02-17 22:47:48 -05:00
garak
74e4e2647c add new area (map section) functionality 2024-02-16 19:17:56 -05:00
garak
22b4108a7f create 'add layout' button 2024-02-15 22:19:49 -05:00
GriffinR
42a95b32a2 Restore Project::defaultSong 2024-01-19 15:18:14 -05:00
GriffinR
3ebc7a93d4 Soften launch requirements, fix some potential crashes 2024-01-19 14:05:20 -05:00
GriffinR
3505251ad2 Stop changing settings if their features fail to load 2024-01-18 12:00:18 -05:00
garak
858c807856 fix bad merge 2024-01-12 19:22:54 -05:00
garak
0296c22845 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-12 15:57:56 -05:00
GriffinR
07f68f6ab7
Merge pull request #581 from GriffinRichards/script-completer
Sort script dropdown, minor fixes
2024-01-11 22:59:21 -05:00
garak
c0f32c6a17 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-09 15:34:31 -05:00
garak
0f9c5873a2 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-09 15:28:01 -05:00
GriffinR
1212d7dfd8 Sort script dropdown, minor fixes 2024-01-06 17:40:59 -05:00
GriffinR
ef165e29df Stop enforcing heal locations table name 2024-01-04 12:22:06 -05:00
GriffinR
a0069b6a3f Add truncation warnings for Block masks 2024-01-03 14:24:14 -05:00
GriffinR
2c61df578a Support relative paths in image API functions, combine projectDir calls 2024-01-03 12:13:53 -05:00
GriffinR
d126a2b589
Merge pull request #575 from GriffinRichards/map-scripts
Add labels from scripts file to Script dropdowns
2024-01-02 00:56:51 -05:00
GriffinR
ced402a4c6 Add labels from scripts file to Script dropdowns 2023-12-29 21:54:37 -05:00
GriffinR
945201026e Set reasonable defaults for wild encounter rates 2023-12-29 00:15:51 -05:00
GriffinR
c543cc0899 Store warp behaviors as values, add version defaults 2023-12-21 23:33:36 -05:00
GriffinR
93fb8cf471 Allow empty behavior names, simplify fieldmap parsing 2023-12-19 15:46:10 -05:00
GriffinR
ee6d6c7bcc Fix metatile behavior value displays 2023-12-19 13:42:07 -05:00
GriffinR
e0c6621abc Add truncation warning for metatile labels 2023-12-19 12:29:16 -05:00
GriffinR
902beeedcf Fix shuffled attributes 2023-12-19 00:23:32 -05:00
GriffinR
6d995cee9b Add identifier config settings 2023-12-18 20:48:40 -05:00
GriffinR
bfb827b736 Add by-name and recursive define evaluation 2023-12-17 20:47:28 -05:00
GriffinR
8d274c013f Merge branch 'master' of https://github.com/huderlem/porymap into custom-images 2023-12-17 16:18:16 -05:00
GriffinR
144b835c53
Merge pull request #531 from GriffinRichards/fix-label-saving
Fix metatile label saving
2023-12-17 02:05:34 -05:00
GriffinR
fc1e192087 Add warp behavior list to settings 2023-12-17 02:03:33 -05:00
GriffinR
60fb1a246e Clean up custom Block layouts 2023-12-16 17:54:06 -05:00
GriffinR
5a3907bf56 Use Block masks to update value limits, parse fieldmap.c 2023-12-16 01:48:13 -05:00
GriffinR
f0310d4a63 Generalize bit packing utility for Block 2023-12-15 14:33:01 -05:00
GriffinR
c4adcc2963 Stop unnecessary evaluation when parsing constant names 2023-12-11 16:49:27 -05:00
GriffinR
06ff213691 Sturdier pokemon icon search, add icon override settings 2023-12-11 03:08:25 -05:00
GriffinR
61b1789d4b Custom collision/event graphics cleanup 2023-12-08 14:50:00 -05:00
GriffinR
4f0e8716f2 Update Collision tab UI 2023-12-08 12:18:21 -05:00
GriffinR
49cb69f2b8 Fix issues when user supplies incorrect number of encounters 2023-11-07 13:05:10 -05:00
GriffinR
56d53d2693 Relax spacing requirements in heal location data table 2023-09-30 18:39:14 -04:00
garak
f4cd57c988 some code cleanup 2023-09-28 19:02:11 -04:00
garak
ac83e0fbe3 no need to manually crop map tab icon 2023-09-28 19:02:10 -04:00
garak
ff086a6fe6 remove redundant mapsceneeventfilter file 2023-09-28 19:02:10 -04:00
garak
2ea0590f6e save changes to layouts 2023-09-28 19:02:10 -04:00
garak
a14e70ef53 update map lists when new maps and layouts are added 2023-09-28 19:02:10 -04:00
garak
f8c7ada585 fix layout undo history 2023-09-28 19:02:10 -04:00
garak
72eb8f873f create dynamic map tab icon 2023-09-28 19:02:10 -04:00
garak
f7f06dab29 fix change dimensions for layouts 2023-09-28 19:02:10 -04:00
garak
18eb3ceb1e setLayout to create layout-only edit mode 2023-09-28 19:02:10 -04:00
garak
2bc51f1c29 move map pixmap item and metatile rendering from Map to Layout 2023-09-28 19:02:10 -04:00
GriffinR
c42909d028 Merge branch 'master' into fix-label-saving 2023-09-25 10:50:07 -04:00
GriffinR
22fe7f2963 Use spin boxes for border metatile settings if using default size 2023-09-19 14:30:48 -04:00
GriffinR
9bed66ecfc Write config with project settings editor 2023-08-28 16:48:27 -04:00
GriffinR
ff6a51ffa4 Support 8BPP tileset tile images 2023-06-30 01:49:43 -04:00
GriffinR
f232de68c9 Fix empty metatile label regression 2023-05-19 02:21:41 -04:00
GriffinR
ea704c8ef7 Fix metatile label saving 2023-05-19 01:41:20 -04:00
GriffinR
44dba9edc5 Set shared metatile labels as placeholders 2023-02-14 22:44:13 -05:00
GriffinR
16e5e9fad8 Update metatile label copy button 2023-02-14 15:28:18 -05:00
GriffinR
dbd6afb0c3 Move metatile labels to tilesets 2023-02-14 14:43:05 -05:00
GriffinR
72ae9dfc01 Fix regression in metatile label saving 2023-02-14 11:50:14 -05:00
GriffinR
36363febf7 Remove mistaken field addition to map_groups.json 2023-02-14 11:03:01 -05:00
GriffinR
2ee60f4544 Delete layout when readMapLayouts fails 2023-01-25 23:39:10 -05:00
GriffinR
2fce82d1b4 Improve layout parser warnings/errors 2023-01-25 23:30:54 -05:00
garak
6b47d350a0 read multiple incbins and C arrays at once for situations where the same file could be opened many times 2023-01-17 13:15:07 -05:00
garak
9cc55ef2f7 add option to copy mon info from another tab [closes #469] 2023-01-17 13:15:07 -05:00
garak
06948a97b0 fix issue with fileCache invalidating certain changes in files 2023-01-17 13:15:07 -05:00
garak
4df4e6ddd7 fix metatile label reading 2023-01-17 13:15:07 -05:00
garak
f9bb6196e2 do less work reading C defines while loading tileset labels 2023-01-17 13:15:07 -05:00
garak
37fcfba829 use static (And const where applicable) regular expression objects
the speed increase here is noticable since the work of creating a regex object is only done once per session
2023-01-17 13:15:07 -05:00
t
d29506d755
Merge pull request #495 from GriffinRichards/keep-import-path
Preserve import/export path in file dialogs
2023-01-16 14:19:31 -05:00
Marcus Huderle
dcbf62e72f Remove inadvertent save to layouts.json 2023-01-16 11:59:21 -06:00
GriffinR
f507b3e8a3 Preserve import/export path in file dialogs 2022-11-27 21:24:55 -05:00
GriffinR
d475286249
Merge branch 'master' into metatile-attr 2022-11-18 18:13:21 -05:00
GriffinR
97b8bb96cb Remove unused function 2022-11-07 01:02:33 -05:00
GriffinR
567a6d92e5 Enforce indexed tile images 2022-11-04 13:06:50 -04:00
GriffinR
eb80ee86f6
Merge branch 'master' into metatile-attr 2022-10-29 11:43:00 -04:00
GriffinR
c16a6d5d23 Better support for parsing hex values 2022-10-28 13:29:33 -04:00
GriffinR
9cd8777246 Remove last base game version difference 2022-10-26 04:01:01 -04:00
GriffinR
fa2b4d3edb Allow custom metatile attribute layouts 2022-10-25 22:35:26 -04:00