Commit graph

743 commits

Author SHA1 Message Date
GriffinR
ced402a4c6 Add labels from scripts file to Script dropdowns 2023-12-29 21:54:37 -05:00
GriffinR
06ed730cd1 Support vertical spritsheets for overworld graphics 2023-12-29 00:34:52 -05:00
GriffinR
945201026e Set reasonable defaults for wild encounter rates 2023-12-29 00:15:51 -05:00
GriffinR
6fedab9a22 Add 'Open Recent Project' menu 2023-12-28 01:00:12 -05:00
GriffinR
c543cc0899 Store warp behaviors as values, add version defaults 2023-12-21 23:33:36 -05:00
GriffinR
a2d230666b Add grids to tileset editor 2023-12-20 13:11:57 -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
2cdbd029b6 Move warp behavior warning setting to porymap.cfg 2023-12-19 12:57:45 -05:00
GriffinR
e0c6621abc Add truncation warning for metatile labels 2023-12-19 12:29:16 -05:00
GriffinR
cd1c3fef94 Fix settings window crash on close 2023-12-19 11:42:46 -05:00
GriffinR
b74b007186 Add identifiers to the settings window 2023-12-18 21:07:36 -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
5d4d88d11e Add warning for warp behaviors 2023-12-16 20:35:28 -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
19e5e681e5 Add block layout to config 2023-12-13 00:06:37 -05:00
GriffinR
2228f78117 Privatize Block members 2023-12-12 18:32:54 -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
571ff8e328 Expose new settings, add tabs to settings editor 2023-12-09 12:52:51 -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
d5210cf230 Support custom collision graphics 2023-12-07 13:43:24 -05:00
GriffinR
1b9b980121 Support custom event icons 2023-12-06 15:02:19 -05:00
GriffinR
dcba9ececd Update custom scripts editor 2023-11-03 02:40:03 -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
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
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
61cbbbf08a Add path override editor 2023-09-08 12:21:56 -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
d28849a533
Merge pull request #536 from GriffinRichards/4bpp
Support 8BPP tileset tile images
2023-08-13 22:33:07 -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
ea704c8ef7 Fix metatile label saving 2023-05-19 01:41:20 -04:00
vinnydiehl
9f06dcf9ac Include cstdint in lexer.h
Build was failing due to missing `uint32_t` type.
2023-05-12 00:24:08 -04:00
GriffinR
4fbe8bf5ef Add palette editor bit depth to config 2023-02-22 11:21:30 -05:00
garakmon
508e5f85f1 fix crash on project close from deleting events 2023-02-20 19:09:42 -05:00
GriffinR
26f07add79 Reset Tileset Editor history when tileset changes 2023-02-17 22:27:02 -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
f4f93f4c98 Remove option to turn off script warning messages 2023-02-12 14:09:25 -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
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
garakmon
5de1bbd44c fix nonexistant font issues 2023-02-05 18:26:35 -05:00
GriffinR
56ba0a8f77 Support 8BPP images for 4BPP tilemaps 2023-01-25 20:40:23 -05:00
Marcus Huderle
7d3699457f Fix metatile mask config loading 2023-01-22 11:34:51 -06: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
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
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
d1bdbc2741 create temporary timing function 2023-01-17 13:15:07 -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
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
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
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
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
97b8bb96cb Remove unused function 2022-11-07 01:02:33 -05:00
GriffinR
3770efd6c5 Add setScale to the API 2022-11-03 13:19:57 -04: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
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
c50b8d0668 Restore last settings for new map popup 2022-10-24 16:54:34 -04:00
GriffinR
d451aaa8c0 Simplify new map popup internal 2022-10-24 16:54:27 -04:00
GriffinR
8fbcee7f21 Insert new tilesets in sorted order 2022-10-24 09:33:51 -04:00
GriffinR
09ce5b5913 Drop path_ from path config options 2022-10-24 08:03:51 -04:00
GriffinR
5ba3720405 is_secondary to bool 2022-10-24 00:02:27 -04:00
GriffinR
f8a92c071c Add default tileset config options 2022-10-23 19:43:16 -04:00
GriffinR
35da77ca94 Treat tileset lists separately 2022-10-23 18:59:59 -04:00
Marcus Huderle
1697f55b6c
Merge pull request #480 from GriffinRichards/combos
Display values for missing items in combo boxes
2022-10-22 13:08:38 -05:00
Marcus Huderle
7b66537d01
Merge pull request #479 from GriffinRichards/fix-json
Better type conversion for JSON data
2022-10-22 12:57:17 -05:00
GriffinR
9277a2313f Display values for missing items in combo boxes 2022-10-19 14:28:45 -04:00
GriffinR
4c3a508534 Better type conversion custom event attributes 2022-10-18 19:52:35 -04:00
GriffinR
5f3efdc7a4 Rewrite heal location data writing 2022-10-18 17:14:46 -05:00
GriffinR
43d0dc1e7b Rewrite heal location data reading 2022-10-18 17:14:46 -05:00
GriffinR
8e6585bbb2 Treat warp IDs as strings, stop deleting invalid warps 2022-10-18 13:44:45 -04:00
GriffinR
0e0da77c07 NONE_MAP -> DYNAMIC_MAP 2022-10-18 12:39:37 -04:00
GriffinR
e2a31336c5 Merge branch 'master' of https://github.com/huderlem/porymap into fix-json 2022-10-17 22:20:06 -04:00
Marcus Huderle
f5c050828e
Merge pull request #447 from garakmon/and-i-oop--
Internal Event Rewrite
2022-10-17 17:41:00 -07:00
Marcus Huderle
3de8e88b8e Add optional forceRedraw argument to palette API functions 2022-10-17 19:03:11 -05:00
garak
265340eed0 add local script labels to event combos for drop down 2022-10-16 18:47:35 -04:00
GriffinR
a0eff32f36 Remove more internal type conversions 2022-10-16 02:49:42 -04:00
GriffinR
67945cb297 Preserve custom header arrays and objects 2022-10-16 02:30:13 -04:00
GriffinR
6b55dc935d Add custom header value type selection 2022-10-16 02:29:44 -04:00
GriffinR
463a7e01f6 Save custom header values by type 2022-10-15 18:29:55 -04:00
GriffinR
a2795d089b get/setAngle -> get/setRotation 2022-10-15 11:22:55 -07:00
Marcus Huderle
ad01ba0feb Fix Qt6 build and overloaded addPath ordering 2022-10-15 11:22:55 -07:00
GriffinR
d88d6a828e Scale to qreal, draw path border over fill 2022-10-15 11:22:55 -07:00
GriffinR
82dcecf8f2 Add addPath overload 2022-10-15 11:22:55 -07:00
GriffinR
47f6723bd2 Clean up rotation functions 2022-10-15 11:22:55 -07:00
GriffinR
ad5eea2293 Add rotation and scale to overlay API 2022-10-15 11:22:55 -07:00
GriffinR
67bec313a5 Add rounding to addRect, add fill color to addPath 2022-10-15 11:22:55 -07:00
GriffinR
77d04bb6de Combine addRect and addRectFilled, add color checking 2022-10-15 11:22:55 -07:00
GriffinR
385c17fd23 Add path drawing to the API 2022-10-15 11:22:55 -07:00
GriffinR
ec626a59a7 Display custom header values according to type 2022-10-15 11:40:04 -04:00
GriffinR
6ffcb58e5e Convert JSON values by type, except events 2022-10-15 03:22:13 -04:00
GriffinR
239f3935bf Stop treating map header bools as strings 2022-10-14 18:11:11 -04:00
GriffinR
614242f1fe Update project files page 2022-10-14 12:42:07 -04:00
garak
00504817db add methods for updating frame ui 2022-10-13 22:30:07 -04:00
garak
af9c0192e0 hide heal location z spinner, and label every event type in frames 2022-10-13 22:30:07 -04:00
garak
cb6d1a4220 indicate map edited when event data is modified 2022-10-13 22:30:07 -04:00