Commit graph

1279 commits

Author SHA1 Message Date
garak
70c6e414f1 reopen porymap on layout view when applicable 2024-03-28 10:21:35 -04:00
GriffinR
6fe8539461 Fix number->string conversion in struct parsing 2024-03-21 15:24:08 -04:00
GriffinR
56e4955c54 Fix struct parsing using multiple methods to re-read a single member 2024-03-21 15:22:53 -04:00
garak
6520189352 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-02-22 16:31:16 -05:00
garak
05beed21ca disable deletion of map sections and layouts 2024-02-18 19:56:52 -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
JakobDev
a960456c6e Remove include limits 2024-02-08 13:19:12 -05:00
JakobDev
ab108f8a60 Add missing include 2024-02-08 13:19:12 -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
dc0d6fe267 Remove leftover comment 2024-02-07 16:20:09 -05:00
GriffinR
73b5c0501d Only alert user at most once per new release 2024-02-07 15:35:11 -05:00
GriffinR
e76729ce62 Limit update promoter to Windows/macOS 2024-02-06 16:15:56 -05:00
GriffinR
5def0e8be1 Reenable Retry button for parsing errors 2024-02-05 11:54:35 -05:00
garak
ad1b651f96 clear selection sticking when edits toggled for map list 2024-02-04 14:59:03 -05:00
garak
23b55a1074 fix bug disabling map edits after tab switches 2024-02-04 12:58:41 -05:00
GriffinR
582fb101cf Minor network fixes 2024-02-02 10:31:11 -05:00
GriffinR
ae341d144e Fix new maps parsing scripts file too early 2024-01-29 14:07:13 -05:00
GriffinR
d7f25f9ae5 More selection image fixes 2024-01-27 17:27:51 -05:00
GriffinR
895c9466d7 Center selection when zooming 2024-01-26 15:38:12 -05:00
GriffinR
4cb7e8a9aa Fix selectors jumping when zooming 2024-01-26 15:38:03 -05:00
GriffinR
140b66862a Remove some unnecessary redrawing 2024-01-26 15:37:49 -05:00
GriffinR
a5ed554c68 Better client etiquette 2024-01-25 02:12:32 -05:00
GriffinR
34b2f9d881 Allow update checking with no project 2024-01-21 19:18:26 -05:00
GriffinR
58e4a21aa6 Revert oversimplified version check 2024-01-21 18:41:23 -05:00
GriffinR
fec1d1fdd4 Remove debug log 2024-01-21 12:09: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
662ada181a Remove leftover TODO 2024-01-16 13:30:22 -05:00
GriffinR
783fd0b304 Fix some issues with the Tileset Editor zoom sliders 2024-01-16 13:28:40 -05:00
GriffinR
43747bd8a1 Fix Tileset Editor UI briefly shrinking after window is shown 2024-01-12 23:05:44 -05:00
GriffinR
e873e4c665 Save states of new splitters in config 2024-01-12 22:47:50 -05:00
GriffinR
86d0200441 Add scrolling to border metatiles, splitter for Metatiles tab 2024-01-12 22:11:07 -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
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
3d3811f3b1 Set focus to map on launch 2024-01-05 14:12:37 -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
db1aabe3c2 Fix shortcuts editor clear buttons 2024-01-05 00:29:36 -05:00
GriffinR
941174d0ea Reduce redundant work in metatile selector 2024-01-04 21:36:14 -05:00
GriffinR
8c85209d53 Fix metatile selector rectangle jumping 2024-01-04 21:22:10 -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
d2a0d9299f Add some constants to the API 2024-01-03 16:34:55 -05:00
GriffinR
0b2a526e3d Fix event group tab selection 2024-01-03 15:09:12 -05:00
GriffinR
a0069b6a3f Add truncation warnings for Block masks 2024-01-03 14:24:14 -05:00
GriffinR
59f0d9fe11 Automatically adjust metatile ID strings 2024-01-03 13:36:42 -05:00
GriffinR
513e63193e Restore error interrupted silencing 2024-01-03 12:18:02 -05:00
GriffinR
2c61df578a Support relative paths in image API functions, combine projectDir calls 2024-01-03 12:13:53 -05:00
GriffinR
d1c25a8eca Fix API error reporting 2024-01-03 10:42:49 -05:00
GriffinR
2088a5ec1c Fix some typos / confusing text 2024-01-02 14:20:56 -05:00
GriffinR
3a98ba9012 Fix right-click not updating selector if only collision changed 2024-01-02 12:06:18 -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
43ffc0bd36 Simplify recent projects config 2023-12-28 09:16:23 -05:00
GriffinR
6fedab9a22 Add 'Open Recent Project' menu 2023-12-28 01:00:12 -05:00
GriffinR
6a8d3a8197
Merge pull request #559 from GriffinRichards/custom-images
Update settings window
2023-12-27 23:05:22 -05:00
GriffinR
fb868a2d77 Stop reporting interruption errors 2023-12-27 01:28:59 -05:00
GriffinR
91b2ade693 Review changes 2023-12-25 01:57:31 -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
59f365b16d Fix project reload not disabling window on failure 2023-12-19 12:46:47 -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
902beeedcf Fix shuffled attributes 2023-12-19 00:23:32 -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
8164aae151 Custom image setting cleanup, update manual 2023-12-12 15:57: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
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
garak
a00558a0d1 drop gMapGroup_ prefix necessity for renaming groups 2023-10-27 14:19:29 -04:00
garak
263e45fe20 fix new map popup population issue 2023-10-27 11:16:21 -04:00
garak
6041c46abf fix scripting api usage of map/layout pointers 2023-10-26 14:14:57 -04:00
garak
46ada32733 fix map tab icon 2023-10-25 12:25:19 -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
garak
95c21a4572 do not show nonexistent map sections 2023-09-28 19:56:54 -04:00
GriffinR
ae1c7e8d9a Simplify closeSupplementaryWindows for QPointer use 2023-09-28 19:47:50 -04:00
garak
3f7913b694 fix segfault in map image exporter 2023-09-28 19:02:11 -04:00
garak
c0a46ae054 fix layout redraw when changing used tileset 2023-09-28 19:02:11 -04:00
garak
f4cd57c988 some code cleanup 2023-09-28 19:02:11 -04:00
garak
2d2b7f723b api util setMainTab ignores command when in layout only mode 2023-09-28 19:02:11 -04:00
garak
f485ebdd3e preserve layout in config 2023-09-28 19:02:11 -04:00
garak
e79b6e2fca add placeholder text for mapgroup label 2023-09-28 19:02:10 -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
5d98f8e2f8 fix crash in model data function 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
de8b005d77 gray out map icons until map is open
... because the color of the icon does not mean anything until map has been loaded into memory

for example, if the map's layout has changed then it should be marked as modified but
that wouldn't happen if the map is unloaded
2023-09-28 19:02:10 -04:00
garak
1497f42ab0 save progress 2023-09-28 19:02:10 -04:00