Commit graph

440 commits

Author SHA1 Message Date
GriffinR
367198f98f Sync changes between connection list and map 2024-07-03 11:08:38 -04:00
GriffinR
1f78fb9c4f Remove strict offset limitations 2024-07-01 19:16:20 -04:00
GriffinR
2fa3a9b398 Connection reorganization 2024-07-01 13:58:58 -04:00
GriffinR
db35ec2c79 Initial connections tab UI redesign 2024-06-28 22:00:44 -04:00
GriffinR
1c2be70ff0 Allow users to fix faulty region map settings 2024-06-17 14:31:37 -04:00
GriffinR
0954fe26ff Fix confusing error logging during region map setup 2024-06-17 11:26:45 -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
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
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
783fd0b304 Fix some issues with the Tileset Editor zoom sliders 2024-01-16 13:28:40 -05:00
garak
0296c22845 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-12 15:57:56 -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
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
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
6682233079 Fix tileset editor desyncing with API changes 2024-01-02 00:54:54 -05:00
GriffinR
2fc906b5ae Fix tileset editor grid layering 2023-12-31 14:06:47 -05:00
GriffinR
a2d230666b Add grids to tileset editor 2023-12-20 13:11:57 -05:00
GriffinR
ee6d6c7bcc Fix metatile behavior value displays 2023-12-19 13:42:07 -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
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
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
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
ff086a6fe6 remove redundant mapsceneeventfilter file 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
e2ff93e5e7 add areaList model and filtering, scrolling for all trees 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
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
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
6508fd10af Reimplement metatile label edit history 2023-02-17 14:59:03 -05:00
GriffinR
dbd6afb0c3 Move metatile labels to tilesets 2023-02-14 14:43:05 -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
56ba0a8f77 Support 8BPP images for 4BPP tilemaps 2023-01-25 20:40:23 -05:00
garak
a2aa5c0129 add buttons for encounter tab actions 2023-01-19 13:26:05 -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
GriffinR
0556afaf98 Only allow moving connections on connection tab 2023-01-15 23:18:19 -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
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
d475286249
Merge branch 'master' into metatile-attr 2022-11-18 18:13:21 -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
1283f5c19d Use custom attribute masks in API and Tileset Editor 2022-10-26 03:28:30 -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
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
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
8e6585bbb2 Treat warp IDs as strings, stop deleting invalid warps 2022-10-18 13:44:45 -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
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
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
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
8ac556c0de properly hide configurable event ui 2022-10-13 22:30:07 -04:00
garak
43960d4e9e add open script button next to script labels 2022-10-13 22:30:07 -04:00
garak
582405d68b change Event class design in favor of polymorphism 2022-10-13 22:30:07 -04:00
GriffinR
2b78330660 Improve API text rendering speed 2022-10-13 09:55:48 -07:00
Marcus Huderle
47b6669feb Add clipping capabilities to overlay scripting api 2022-10-10 11:22:38 -05:00
Marcus Huderle
fc2f91023f Move default prefab prompt to when the user selects the prefab tab, rather than app startup 2022-10-09 14:36:12 -05:00
GriffinR
564d24c4f3 Simplify TilesetEditorMetatileSelector::buildImage 2022-10-05 18:53:31 -05:00
GriffinR
b0e12170fb Add image export for metatileset 2022-10-05 18:53:31 -05:00
GriffinR
3181523799 Add convenience functions for triple layer metatiles 2022-10-04 17:50:39 -05:00
GriffinR
eb8b9b0352 Add Cut to Tileset Editor 2022-10-04 17:50:39 -05:00
GriffinR
1b743f9625 Replace offset in createImage with x/y offset 2022-10-01 17:43:50 -05:00
Marcus Huderle
ddf0fe4e11 Display 'prefab selected' tooltip when selecting a prefab for painting 2022-09-27 18:22:08 -05:00
Marcus Huderle
c81829cd3f Merge remote-tracking branch 'griffin/api-redesign' 2022-09-24 15:48:42 -05:00
Marcus Huderle
71a34c6b22 Add prompt to import default prefabs for each game version 2022-09-24 15:28:31 -05:00
Marcus Huderle
a081af85c4 Fix bug where dimensions of current selection would be incorrect after a prefab was selected 2022-09-24 11:16:03 -05:00
GriffinR
126d264982
Merge branch 'master' into api-redesign 2022-09-12 13:01:22 -04:00
Marcus Huderle
7957bbf7e7 Save prefabs file whenever one is added or deleted 2022-09-09 20:48:08 -05:00
Marcus Huderle
32cba33326 Properly filter available prefabs based on current map's tilesets 2022-09-09 20:09:28 -05:00
Marcus Huderle
4232410a79 Add ability to delete a prefab item from the list 2022-09-09 19:37:25 -05:00
Marcus Huderle
96ad32c6db Properly paint prefabs and create them from dialog box 2022-09-07 20:38:30 -05:00
Marcus Huderle
bc4cbbabfa Clicking on a prefab will make it the current selection for painting 2022-09-06 20:42:19 -05:00
Marcus Huderle
3046a4d3ae Load and display prefabs in UI 2022-09-05 20:52:03 -05:00
Marcus Huderle
a943b6b260 Add prefab tab and refactor metatile selection data 2022-09-05 11:35:17 -05:00
GriffinR
a3dadadd5b Reorganize overlay functions under MapView 2022-09-04 22:36:35 -04:00
GriffinR
268cc9b30b Add getPorymapVersion 2022-08-31 13:38:07 -04:00
GriffinR
af2f1b6f7d Replace xflip/yflip in createImage with hScale/vScale 2022-08-31 11:00:17 -04:00
garak
12d5f22475 improve palette editor ui
- remove redundant RGB label
- in color picker, instruct user to press SPACE
- add toggle between 15 and 24 bit depth displaying
2022-07-11 22:06:17 -04:00
garak
635f1325a2 cleanup palette editor code 2022-07-11 22:06:17 -04:00
garak
725c601a06 fix slider rounding 2022-07-11 22:06:17 -04:00