Commit graph

1132 commits

Author SHA1 Message Date
GriffinR
b88d62ecc1
Merge pull request #554 from GriffinRichards/fix-encounters
Fix issues when user supplies incorrect number of encounters
2023-12-02 14:32:54 -05:00
GriffinR
49cb69f2b8 Fix issues when user supplies incorrect number of encounters 2023-11-07 13:05:10 -05:00
GriffinR
1454714343 Fix focus issue in custom scripts editor 2023-11-03 14:34:41 -04:00
GriffinR
c3c9936c67 Avoid Qt quick compiler for script_template 2023-11-03 10:48:20 -04:00
GriffinR
dcba9ececd Update custom scripts editor 2023-11-03 02:40:03 -04:00
GriffinR
6ee76f80d1 Fix project settings editor regression 2023-10-01 02:48:32 -04:00
GriffinR
56d53d2693 Relax spacing requirements in heal location data table 2023-09-30 18:39:14 -04:00
GriffinR
ae1c7e8d9a Simplify closeSupplementaryWindows for QPointer use 2023-09-28 19:47:50 -04:00
GriffinR
5cf07c7f91 Close new options windows on project open 2023-09-28 16:26:56 -04:00
GriffinR
c42909d028 Merge branch 'master' into fix-label-saving 2023-09-25 10:50:07 -04:00
GriffinR
f9a14c0d56
Merge pull request #543 from GriffinRichards/options
Add Project Settings Editor
2023-09-25 10:45:16 -04:00
GriffinR
31c5ad6b95 Remove duplicate empty script labels in dropdown 2023-09-19 19:09:24 -04:00
GriffinR
4f459f5a06 Improve speed of setMetatileTiles 2023-09-19 15:49:56 -04:00
GriffinR
22fe7f2963 Use spin boxes for border metatile settings if using default size 2023-09-19 14:30:48 -04:00
GriffinR
0c47866e3d Fix some window and scrollbox sizes 2023-09-12 13:51:09 -04:00
GriffinR
a508677b1d Move remaining Porymap config settings to Preferences 2023-09-11 16:54:15 -04:00
GriffinR
30a01b7061 Use UIntSpinBox for metatile attribute settings 2023-09-11 16:32:15 -04:00
GriffinR
603df4defa Add UIntSpinBox class 2023-09-11 16:31:44 -04:00
GriffinR
1c081f2011 Connect custom script editor to shortcuts editor 2023-09-10 17:04:44 -04:00
GriffinR
a5a864926a Enforce project folder for custom filepaths 2023-09-10 13:33:18 -04:00
GriffinR
7a399daaff Clean up project settings editor UI 2023-09-08 15:32:33 -04:00
GriffinR
61cbbbf08a Add path override editor 2023-09-08 12:21:56 -04:00
GriffinR
7411ddaeef Ignore empty script paths 2023-09-06 21:52:42 -04:00
GriffinR
885695e705 Clean up for new editor windows 2023-09-06 16:41:34 -04:00
GriffinR
2aa18da255 Implement script engine reload 2023-09-06 13:40:55 -04:00
GriffinR
40e8824eca Add option to turn custom scripts on/off 2023-09-06 12:58:39 -04:00
GriffinR
d6d27ae8b3 Add Custom Scripts Editor window 2023-09-05 16:45:53 -04:00
GriffinR
143e5cf79b Add button to import default prefabs 2023-08-31 14:23:03 -04:00
GriffinR
871a6ed9b7 Add prompts to project settings editor 2023-08-29 14:43:50 -04:00
GriffinR
9bed66ecfc Write config with project settings editor 2023-08-28 16:48:27 -04:00
GriffinR
4d8f5ef150 Add project settings window 2023-08-23 21:06:14 -04:00
GriffinR
0148580bd2
Merge pull request #539 from GriffinRichards/recent-fail
Stop misleading error when recent project doesn't exist
2023-08-19 10:01:27 -04:00
GriffinR
ae68ab3a6f Stop single tile mode on prefab tab 2023-08-19 00:06:21 -04:00
GriffinR
d28849a533
Merge pull request #536 from GriffinRichards/4bpp
Support 8BPP tileset tile images
2023-08-13 22:33:07 -04:00
GriffinR
a366c7cffe Stop misleading error when recent project doesn't exist 2023-08-09 14:42:03 -04:00
GriffinR
1ecb2cc369 Automatically adjust min/max encounter levels 2023-07-31 14:57:42 -04:00
GriffinR
0b293d2af0 Stop tileset editor from scrolling to map's selection when saving 2023-06-30 13:40:11 -04:00
GriffinR
ff6a51ffa4 Support 8BPP tileset tile images 2023-06-30 01:49:43 -04:00
GriffinR
cdf4556e23 Fix border not updating when tileset is changed 2023-06-30 00:53:14 -04:00
GriffinR
4ec5238abb Fix deleting connections by clearing text 2023-05-29 19:18:38 -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
0b6d61e3f1 Fix default object sprites 2023-03-15 21:38:58 -04:00
GriffinR
4fbe8bf5ef Add palette editor bit depth to config 2023-02-22 11:21:30 -05:00
GriffinR
420e92e912 Fix color calc in palette editor hex edit 2023-02-22 10:43:45 -05:00
garakmon
777a6c2e18 auto take changelog in porymap about window 2023-02-20 19:09:42 -05:00
GriffinR
49a5600e2d Fix tile limit being used for metatiles 2023-02-20 11:19:56 -05:00
GriffinR
a7ceca47fb
Merge pull request #520 from GriffinRichards/metatile-labels
Support sharing metatile labels between tilesets
2023-02-20 11:04:18 -05:00
GriffinR
51b57f9222 Fix map border layering above connections after map switch 2023-02-18 01:21:08 -05:00
GriffinR
26f07add79 Reset Tileset Editor history when tileset changes 2023-02-17 22:27:02 -05:00
GriffinR
096c26b85a Fix label history being ignored if metatile didn't change 2023-02-17 15:40:10 -05:00
GriffinR
6508fd10af Reimplement metatile label edit history 2023-02-17 14:59:03 -05: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
d88ae2b461
Merge pull request #518 from GriffinRichards/api-warnings
Add new API warnings
2023-02-12 14:25:13 -05:00
GriffinR
f4f93f4c98 Remove option to turn off script warning messages 2023-02-12 14:09:25 -05:00
GriffinR
a3a2f3bbcd Fix null characters being written to JSON files 2023-02-12 13:30:33 -05:00
GriffinR
bc256053d0 Add registerToggleAction 2023-02-10 11:52:08 -05:00
GriffinR
314e6fff53 Allow script actions with the same name 2023-02-09 13:55:25 -05:00
GriffinR
880dabade3 Add script action warning 2023-02-09 13:15:02 -05:00
GriffinR
7dacfeb52b Add script load warning 2023-02-09 12:05:57 -05:00
GriffinR
e710567400 Revert changes to readCIncbin 2023-02-06 19:19:46 -05:00
garakmon
62a6fe8515 allow copy/paste from mainwindow actions in encounter tab 2023-02-05 18:26:35 -05:00
garakmon
7973c91bcd change encounter copy behavior 2023-02-05 18:26:35 -05:00
GriffinR
63734aec7c
Merge pull request #511 from GriffinRichards/fix-tilemap
Support 8BPP images for 4BPP tilemaps
2023-02-05 15:07:07 -05:00
GriffinR
9727af5793
Merge pull request #512 from GriffinRichards/layout-warn
Improve layout parser warnings/errors
2023-02-05 15:06:47 -05:00
GriffinR
b6c97e845b
Merge branch 'master' into fix-tilemap 2023-02-05 14:55:36 -05:00
garakmon
940e7355d0 fix crash resulting from deleting encounter fields with groups present 2023-02-05 14:48:40 -05:00
garakmon
f34aec824e fix map item render when collision tab is active 2023-02-05 10:57:55 -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
GriffinR
56ba0a8f77 Support 8BPP images for 4BPP tilemaps 2023-01-25 20:40:23 -05:00
garakmon
70980f5e42 fix incbin parsing for multiple matches 2023-01-24 13:37:18 -05:00
GriffinR
44780b2311 Fix connections occluding events 2023-01-24 03:31:04 -05:00
GriffinR
0f814d78bd Fix connection masks not clearing on Connection tab 2023-01-23 15:28:02 -05:00
Marcus Huderle
7d3699457f Fix metatile mask config loading 2023-01-22 11:34:51 -06:00
garak
8ce6c2dfc9 accept single click action for editing encounter table 2023-01-19 15:11:42 -05:00
GriffinR
73d0cb8933 Set transparency on pokemon icons 2023-01-19 15:09:27 -05:00
garak
a2aa5c0129 add buttons for encounter tab actions 2023-01-19 13:26:05 -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
5c63dc9bbc do not scroll encounter tabs with wheel, set current species combo by index instead of text 2023-01-17 13:15:07 -05:00
garak
f4e7eb3e49 clean up timing functions 2023-01-17 13:15:07 -05:00
garak
23d790cc4a use custom model for encounter tables 2023-01-17 13:15:07 -05:00
garak
5309eb5f0e call updateSelectedEvents only once at a time 2023-01-17 13:15:07 -05:00
garak
1ed2f1d206 use static QImage for collision pixmap copying 2023-01-17 13:15:07 -05:00
garak
c7d548bfc3 use a file cache for files that are already read 2023-01-17 13:15:07 -05:00
garak
260517b7ba fix const for dynamic regular expressions 2023-01-17 13:15:07 -05:00
garak
f1b962bdf5 do not convert to stdString expensively when parsing ordered json numbers 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
55c97a45d9 render collision apart from metatiles, using graphics item layering to display 2023-01-17 13:15:07 -05:00
garak
07caad3fce add bounds to map render to prevent doing extra work when rendering only pieces of the map (eg, connections) 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
garak
d1bdbc2741 create temporary timing function 2023-01-17 13:15:07 -05:00
GriffinR
6101899b6d Set unsaved changes when pasting metatiles 2023-01-16 21:47:36 -05:00
GriffinR
c233e3cd59 Fix tileset change not updating border 2023-01-16 20:23:58 -05:00
t
debf9d99f0
Merge pull request #505 from GriffinRichards/connection-warp
Allow navigating to connected maps from any tab
2023-01-16 15:46:49 -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
5ef4fbafbc Fix spacing typo 2023-01-16 00:46:30 -05:00
GriffinR
d5d0d64310 Fix new connections not appearing 2023-01-15 23:49:08 -05:00
GriffinR
0556afaf98 Only allow moving connections on connection tab 2023-01-15 23:18:19 -05:00
GriffinR
ca0c667135 Always allow connection warps 2023-01-15 22:47:27 -05:00
GriffinR
ab6d035ad8
Merge pull request #485 from GriffinRichards/metatile-attr
Allow reorganization of metatile attributes
2023-01-15 18:55:42 -05:00
GriffinR
d9324368a2 Fix Region Map Editor being opened by Shortcuts Editor 2023-01-15 00:26:40 -05:00
garakmon
f27c4e9ab4 fix itemfinder checkbox initialization bug 2023-01-10 15:50:30 -05:00
GriffinR
160a9c0713 Resolve shortcuts for Open Project 2023-01-06 12:42:29 -05:00
GriffinR
00a430d208 Fix crash when importing AdvanceMap metatiles 2023-01-06 11:53:42 -05:00
GriffinR
600af6dc72 Fix C parser crashing on #endif at EOF 2022-12-31 12:26:40 -05:00
GriffinR
5af662a49e
Merge pull request #496 from GriffinRichards/config-checkerboard
Add option to turn off the checkerboard fill for new tilesets
2022-12-15 17:12:22 -05:00
GriffinR
324bc3a517 Fix onMapResized not triggering 2022-12-15 02:13:30 -05:00
GriffinR
5ca3906f55
Merge branch 'master' into keep-import-path 2022-12-14 16:10:23 -05:00
GriffinR
b60e8cd732
Merge branch 'master' into border-hover 2022-12-03 08:51:58 -05:00
GriffinR
4065572ede
Merge branch 'master' into keep-import-path 2022-12-03 08:51:37 -05:00
GriffinR
32903e0d18 Set default New Map settings when switching projects 2022-12-03 08:49:08 -05:00
GriffinR
8594c2ce36 Display message when hovering on border metatiles 2022-11-28 23:08:57 -05:00
GriffinR
9d82a7af68 Add option to turn off checkerboard fill for new tilesets 2022-11-28 14:58:33 -05:00
GriffinR
b7ec693533 Sync with some additional dialogs 2022-11-28 03:27:39 -05:00
GriffinR
f507b3e8a3 Preserve import/export path in file dialogs 2022-11-27 21:24:55 -05:00
GriffinR
3a4ce68232 Remove old event label functions 2022-11-27 13:15:52 -05:00
GriffinR
d475286249
Merge branch 'master' into metatile-attr 2022-11-18 18:13:21 -05:00
GriffinR
254467451f
Merge pull request #489 from GriffinRichards/api-setscale
Add setScale to the API
2022-11-18 18:12:59 -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
3770efd6c5 Add setScale to the API 2022-11-03 13:19:57 -04:00
GriffinR
bf9e670d4c Merge branch 'master' of https://github.com/huderlem/porymap into metatile-attr 2022-10-30 11:42:52 -04:00
GriffinR
01cbb52341 Preserve null custom attributes 2022-10-29 17:16:52 -04:00
Marcus Huderle
16926144da Fix event offsets in map image exporting 2022-10-29 11:29:38 -05:00
GriffinR
eb80ee86f6
Merge branch 'master' into metatile-attr 2022-10-29 11:43:00 -04:00
GriffinR
f0c793424c Allow number values in the Metatile Behavior field 2022-10-29 11:41:09 -04:00
GriffinR
fa859a691f Fix minimum connection bounds 2022-10-29 10:57:08 -04:00
GriffinR
c16a6d5d23 Better support for parsing hex values 2022-10-28 13:29:33 -04:00
GriffinR
15e69dc9e7 Enforce border max for new maps 2022-10-28 13:25:04 -04:00
GriffinR
37b5656376 Fix some crashes on project close 2022-10-28 12:46:52 -04:00
GriffinR
d2fa68ba18 Allow number values for behavior in editor, add mask warning 2022-10-27 12:58:12 -04:00
GriffinR
577dc2fce2 Simplify metatile attribute layouts 2022-10-26 21:30:25 -04:00
GriffinR
9cd8777246 Remove last base game version difference 2022-10-26 04:01:01 -04:00
GriffinR
1283f5c19d Use custom attribute masks in API and Tileset Editor 2022-10-26 03:28:30 -04:00
GriffinR
1641ac00b0 Combine attribute shift/mask data 2022-10-26 00:39:46 -04:00
GriffinR
fa2b4d3edb Allow custom metatile attribute layouts 2022-10-25 22:35:26 -04:00
GriffinR
ce6abb0a81 Default to No for file watcher prompt 2022-10-25 17:53:12 -04:00
GriffinR
4187732baa Default to Cancel for reload warning 2022-10-25 17:40:40 -04:00
GriffinR
3656c3082f Fix Open Config Folder 2022-10-25 08:07:14 -04:00
GriffinR
8137388364 Fix QPalette highlights not working for all macOS themes 2022-10-25 02:00:00 -04:00
GriffinR
69c1ae678d Ignore empty deletes for custom attributes 2022-10-24 23:01:26 -04:00