Commit graph

815 commits

Author SHA1 Message Date
GriffinR
6fe8539461 Fix number->string conversion in struct parsing 2024-03-21 15:24:08 -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
garak
963b09c866 create buttons to add items to map trees 2024-02-13 20:23:23 -05:00
GriffinR
b228c4e76c
Merge pull request #590 from GriffinRichards/update-promoter
Add update promoter
2024-02-12 13:27:49 -05:00
GriffinR
142b5de5af
Merge pull request #592 from GriffinRichards/fix-zoom
Misc fixes for selection images
2024-02-07 16:30:40 -05:00
GriffinR
73b5c0501d Only alert user at most once per new release 2024-02-07 15:35:11 -05:00
GriffinR
5def0e8be1 Reenable Retry button for parsing errors 2024-02-05 11:54:35 -05:00
GriffinR
ae341d144e Fix new maps parsing scripts file too early 2024-01-29 14:07:13 -05:00
GriffinR
13f14757be Smooth out scrolling for graphics views nested in scroll areas 2024-01-28 14:15:45 -05:00
GriffinR
895c9466d7 Center selection when zooming 2024-01-26 15:38:12 -05:00
GriffinR
a5ed554c68 Better client etiquette 2024-01-25 02:12:32 -05:00
GriffinR
58e4a21aa6 Revert oversimplified version check 2024-01-21 18:41:23 -05:00
GriffinR
c04a89396c Add update promoter dialog 2024-01-21 12:01:31 -05:00
GriffinR
97b485284e Move version info to porymap.pro 2024-01-21 00:14:40 -05:00
GriffinR
09c2ed6b30 Add check for updates setting 2024-01-20 23:02:43 -05:00
GriffinR
d6dfab1805 Add update promoter network functions 2024-01-20 22:09:42 -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
GriffinR
783fd0b304 Fix some issues with the Tileset Editor zoom sliders 2024-01-16 13:28:40 -05:00
GriffinR
e873e4c665 Save states of new splitters in config 2024-01-12 22:47:50 -05:00
garak
0296c22845 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-12 15:57:56 -05:00
garak
b620e3d816 add button to lock group edits 2024-01-12 15:48:51 -05:00
garak
abc433bc78 allow dragging and dropping to rearrange map groups 2024-01-12 14:39:49 -05:00
GriffinR
1428b250e6
Merge pull request #582 from GriffinRichards/tileset-zoom
Add zoom sliders to the Tileset Editor
2024-01-11 23:11:00 -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
99eb92c3b2 timelapse replay layout edits then map edits 2024-01-10 14:34:48 -05:00
garak
cd5b1f98d2 add toggleable button to hide empty map folders 2024-01-09 21:50:22 -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
c67835d350
Merge pull request #580 from GriffinRichards/open-proj
Fix minor issues with project opening
2024-01-08 21:29:03 -05:00
GriffinR
9538097a6f
Merge pull request #579 from GriffinRichards/hover-te
Display tile ID when hovering over Tileset Editor layer view
2024-01-07 21:17:15 -05:00
GriffinR
8e9e887344
Merge pull request #578 from GriffinRichards/heal-loc-name
Stop enforcing heal locations table name
2024-01-07 21:01:23 -05:00
GriffinR
bcba146be9 Add zoom sliders to the Tileset Editor 2024-01-07 18:01:59 -05:00
GriffinR
1212d7dfd8 Sort script dropdown, minor fixes 2024-01-06 17:40:59 -05:00
GriffinR
4df8b1e6fd Fix minor issues with project opening 2024-01-05 02:49:22 -05:00
GriffinR
c9d8de8971 Display tile ID when hovering over Tileset Editor layer view 2024-01-05 02:47:23 -05:00
GriffinR
941174d0ea Reduce redundant work in metatile selector 2024-01-04 21:36:14 -05:00
GriffinR
ef165e29df Stop enforcing heal locations table name 2024-01-04 12:22:06 -05:00
GriffinR
28831a7ff0 Add get/setMetatileBehaviorName 2024-01-03 16:58:50 -05:00
GriffinR
0b2a526e3d Fix event group tab selection 2024-01-03 15:09:12 -05:00
GriffinR
59f0d9fe11 Automatically adjust metatile ID strings 2024-01-03 13:36:42 -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
6682233079 Fix tileset editor desyncing with API changes 2024-01-02 00:54:54 -05:00
GriffinR
ecfc521a87
Merge pull request #573 from GriffinRichards/enc-rate
Set reasonable defaults for wild encounter rates
2024-01-01 23:05:50 -05:00
GriffinR
dc290652e0
Merge pull request #574 from GriffinRichards/vert-spritesheet
Support vertical spritesheets for overworld graphics
2023-12-31 17:53:05 -05:00
GriffinR
63102eccd6
Merge pull request #569 from GriffinRichards/recent-projects
Add 'Open Recent Project' menu
2023-12-31 17:39:43 -05:00
GriffinR
2fc906b5ae Fix tileset editor grid layering 2023-12-31 14:06:47 -05:00
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
garak
f4cd57c988 some code cleanup 2023-09-28 19:02:11 -04:00
garak
f485ebdd3e preserve layout in config 2023-09-28 19:02:11 -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
d6f3bb1008 allow editing map group names 2023-09-28 19:02:10 -04:00
garak
0ec8f4fee5 add drag-drop reordering for maps in groups 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
a4fdb0de64 fix new map popup window to allow layout selection 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
e2ff93e5e7 add areaList model and filtering, scrolling for all trees 2023-09-28 19:02:10 -04:00
garak
9918159caa ui to change map's assigned layout id 2023-09-28 19:02:10 -04:00
garak
1497f42ab0 save progress 2023-09-28 19:02:10 -04:00
garak
e2253939fc use enum class for edit modes 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
90f8218c32 fix edit commands and ui things to use layout instead of map 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
garak
917e61b98a add different tabs for map list views 2023-09-28 19:02:10 -04:00
garak
61256d39ca reorganize some class data 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
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