Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-24 06:48:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,374 Commits 5 Branches 58 Tags 104 MiB
b498eeec00
Commit Graph

572 Commits

Author SHA1 Message Date
GriffinR
f1a4b78ca9 Fix map duplication 2024-11-26 20:44:43 -05:00
GriffinR
ff04a41db2 Add map list tool tips / copy actions, simplify MapListModel 2024-11-26 15:19:28 -05:00
GriffinR
4671321690 Add item to duplicate map/layouts from list 2024-11-23 22:36:37 -05:00
GriffinR
d0101d807e Finish new layout dialog redesign 2024-11-22 14:22:18 -05:00
GriffinR
e7df829843 Group AdvanceMap parsing together, fix its tileset defaults 2024-11-21 14:11:47 -05:00
GriffinR
bd39bcfdd2 Begin new layout dialog redesign 2024-11-21 12:12:43 -05:00
GriffinR
724f42019c Automatically add new map groups 2024-11-19 13:49:00 -05:00
GriffinR
8bb0100540 Separate layout/header features of new map dialog 2024-11-14 14:43:20 -05:00
GriffinR
4f8224359e Use collapsible section for header data in new map dialog 2024-11-12 14:34:10 -05:00
GriffinR
205bb48c65 Header tab and new map dialog share UI setup 2024-11-12 14:27:35 -05:00
GriffinR
d6a796e3b4 Start new map dialog redesign 2024-11-12 13:46:09 -05:00
GriffinR
9d87ece663 New map popup/prompt to dialog 2024-11-12 13:23:43 -05:00
t
c9695521c7
Merge pull request #515 from garakmon/slam 
Separate Layouts and Maps
 2024-11-11 11:10:00 -05:00
GriffinR
e278d48380 Fix script API undo/redo for layouts, final TODO items 2024-11-08 15:26:43 -05:00
GriffinR
06ece16b93 Finish support for deleting MAPSEC values 2024-11-08 14:46:27 -05:00
GriffinR
d448765d63 Read/write MAPSEC values using the region map json 2024-11-07 22:49:52 -05:00
GriffinR
727cce5d8b
Merge pull request #633 from GriffinRichards/api-images 
Render API images as pixmaps
 2024-11-05 00:29:06 -05:00
GriffinR
7d89031273 Resolve warnings and low-hanging TODO items 2024-11-04 21:35:36 -05:00
GriffinR
f90dae0da0 Set up map list tool bar to record setting states 2024-10-31 16:36:16 -04:00
GriffinR
ab8eb7c7e4 Reimplement disabled Delete key features 2024-10-31 14:58:01 -04:00
GriffinR
23e094d850 Update map list delete functionality 2024-10-31 14:30:56 -04:00
GriffinR
3bd5ddbf2f Simplify saving the map list tab 2024-10-28 16:02:17 -04:00
GriffinR
7da2375998 Refactor map list buttons 2024-10-28 15:36:47 -04:00
GriffinR
d674856b18 Render API images as pixmaps 2024-10-28 11:42:44 -04:00
GriffinR
40d34b2d5b Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-25 14:33:00 -04:00
GriffinR
b5c50e7660 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-16 22:29:03 -04:00
GriffinR
09eaef4dbf Update help buttons, chart help text 2024-10-16 14:23:28 -04:00
GriffinR
e431c161e7
Merge pull request #621 from GriffinRichards/file-dialogs 
Correctly restore window focus for file dialogs
 2024-10-16 10:41:17 -04:00
GriffinR
426faddad7
Merge pull request #619 from GriffinRichards/stitch-preview 
Add actual preview to Export Map Stitch Image
 2024-10-10 13:40:18 -04:00
GriffinR
1ed9b1ee10 Correctly restore window focus for file dialogs 2024-10-09 12:35:12 -04:00
GriffinR
931b471cf1
Merge pull request #617 from GriffinRichards/custom-grid 
Add map grid settings
 2024-10-09 11:10:17 -04:00
GriffinR
a31a014b5d Fix Summary Chart animations stopping prematurely 2024-10-08 01:40:40 -04:00
GriffinR
4dc598455f Improve color slider edit history 2024-10-04 13:53:16 -04:00
GriffinR
bdcfc0467b Fix image exporter reset button 2024-10-04 03:45:47 -04:00
GriffinR
6e79c6c4c3 Add 'All' settings, avoid unnecessary work in a few places 2024-10-03 22:55:12 -04:00
GriffinR
ae6312c131 Add actual preview to Export Map Stitch Image 2024-10-02 02:29:33 -04:00
GriffinR
eefa46a2a2 Fix Qt 5.15 build 2024-10-01 10:19:40 -04:00
GriffinR
932c299935 Refactor palette editor to use new color input widget 2024-10-01 09:03:01 -04:00
GriffinR
44642c347f Add custom dash patterns to grid settings 2024-10-01 01:50:29 -04:00
GriffinR
a277e19334 Add linking buttons to grid settings 2024-09-28 21:43:41 -04:00
GriffinR
274d95eef5 Add color input to grid settings 2024-09-28 18:07:37 -04:00
GriffinR
2cd4cb9334 Add styles to grid settings 2024-09-27 22:42:07 -04:00
GriffinR
16536eb940 Add grid settings window 2024-09-27 22:19:29 -04:00
garak
b622bec2be remove refs to old functions 2024-09-24 12:45:32 -04:00
garak
815a16e8ca Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-09-24 11:31:06 -04:00
GriffinR
a0ebae00c6 Fix a bunch of memory leaks on startup->shutdown 2024-09-11 13:16:54 -04:00
GriffinR
57f74d4b20
Merge pull request #607 from GriffinRichards/triple-layer 
Interpret triple-layer metatiles from NUM_TILES_PER_METATILE
 2024-09-02 23:15:58 -04:00
GriffinR
d7e41e7190
Merge pull request #605 from GriffinRichards/encounter-graph 
Add encounter charts
 2024-09-02 20:30:33 -04:00
GriffinR
0b4f02779b Fix regression for dragging multiple events 2024-08-30 23:32:46 -04:00
GriffinR
1a456bc47b Save config in custom scripts editor, stop accidental 'refreshed' popup 2024-08-30 11:56:35 -04:00
GriffinR
d41d4d53e7 Interpret triple-layer metatiles from NUM_TILES_PER_METATILE 2024-08-29 12:44:50 -04:00
GriffinR
8240cf55ef Exclude charts features for our Windows builds 2024-08-27 21:39:33 -04:00
GriffinR
325757d4ee Clean up in wildmonchart 2024-08-27 19:05:44 -04:00
GriffinR
d8d196b79d Connect wild mon chart to editor 2024-08-27 15:30:46 -04:00
GriffinR
dba3e524b3 Merge branch 'master' of https://github.com/huderlem/porymap into encounter-graph 2024-08-26 23:52:34 -04:00
GriffinR
6b5d191746 Fix level distribution max, theme issue 2024-08-24 01:36:16 -04:00
GriffinR
76e5fd4834 Add summary charts help button 2024-08-23 18:21:44 -04:00
GriffinR
2ec9012c07 Save summary chart settings in config 2024-08-23 16:00:42 -04:00
GriffinR
6f74909a3c Fixes for some visuals in chart window 2024-08-23 15:00:00 -04:00
GriffinR
7c9fcb6616 Add chart theme selector 2024-08-23 14:10:42 -04:00
GriffinR
8f6871dae0 Add grouped level distribution chart 2024-08-23 12:22:15 -04:00
GriffinR
c33e72f404 Add level distribution chart, more adjustments 2024-08-23 02:28:53 -04:00
GriffinR
9b09637b47 Summary chart adjustments 2024-08-22 01:31:46 -04:00
GriffinR
2c65c22b30 Summary chart to horizontal percent bar chart 2024-08-21 18:34:54 -04:00
GriffinR
b1814e0e3f Initial wild pokemon summary chart 2024-08-21 13:08:06 -04:00
GriffinR
f70e77ab66 Final MapConnection testing fixes 2024-08-20 13:23:46 -04:00
GriffinR
7a0ae53143 Final MapConnection UI updates 2024-08-19 18:50:15 -04:00
GriffinR
cbd75dc20b Map connection edit history 2024-08-19 14:54:08 -04:00
GriffinR
0b800c1201 Skip unnecessary dive map rendering, fix rendering small connections 2024-08-14 02:11:11 -04:00
GriffinR
63b77a1fdc Ignore scrolling for connection map combo boxes 2024-08-13 21:43:23 -04:00
GriffinR
7c73161ad0 Merge branch 'master' of https://github.com/huderlem/porymap into connections 2024-08-13 21:21:45 -04:00
GriffinR
256f6eed54 Preserve NoScrollComboBox focus policy on macOS 2024-08-13 20:36:37 -04:00
GriffinR
1686167714 Fix more minor map connection issues 2024-08-13 14:59:41 -04:00
GriffinR
6fbc6d8d86 Prompt for new map connections 2024-08-08 21:24:15 -04:00
GriffinR
4af1c4d463 Take advantage of MapConnection as QObject 2024-08-08 17:25:23 -04:00
GriffinR
4e04e57c05 MapConnection to QObject 2024-08-04 17:21:30 -04:00
GriffinR
13252f98f3 Add dive/emerge map overlay 2024-07-25 14:58:36 -04:00
GriffinR
9ca5f6bc15 More map connection bug fixes 2024-07-18 15:14:52 -04:00
GriffinR
96b5fb1617 Performance & bug clean up 2024-07-17 16:48:37 -04:00
GriffinR
1e09d08c9c Reimplement connection mirroring 2024-07-11 16:44:51 -04:00
GriffinR
f1cfc3c78e Connections tab UI adjustments 2024-07-08 12:50:12 -04:00
GriffinR
7c6b33da1b Add selection highlight to connections list 2024-07-08 11:07:16 -04:00
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