atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
1878 commits 5 branches 53 tags 36 MiB
Commit graph

1331 commits

Author SHA1 Message Date
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
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
GriffinR
5cf07c7f91 Close new options windows on project open 2023-09-28 16:26:56 -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
31c5ad6b95 Remove duplicate empty script labels in dropdown 2023-09-19 19:09:24 -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
0c47866e3d Fix some window and scrollbox sizes 2023-09-12 13:51:09 -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
7a399daaff Clean up project settings editor UI 2023-09-08 15:32:33 -04:00
GriffinR
61cbbbf08a Add path override editor 2023-09-08 12:21:56 -04:00
GriffinR
7411ddaeef Ignore empty script paths 2023-09-06 21:52:42 -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
0148580bd2
Merge pull request #539 from GriffinRichards/recent-fail 
Stop misleading error when recent project doesn't exist
 2023-08-19 10:01:27 -04:00
GriffinR
ae68ab3a6f Stop single tile mode on prefab tab 2023-08-19 00:06:21 -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
a366c7cffe Stop misleading error when recent project doesn't exist 2023-08-09 14:42:03 -04:00
GriffinR
1ecb2cc369 Automatically adjust min/max encounter levels 2023-07-31 14:57:42 -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
cdf4556e23 Fix border not updating when tileset is changed 2023-06-30 00:53:14 -04:00
GriffinR
4ec5238abb Fix deleting connections by clearing text 2023-05-29 19:18:38 -04:00
GriffinR
f232de68c9 Fix empty metatile label regression 2023-05-19 02:21:41 -04:00
GriffinR
ea704c8ef7 Fix metatile label saving 2023-05-19 01:41:20 -04:00
GriffinR
0b6d61e3f1 Fix default object sprites 2023-03-15 21:38:58 -04:00
GriffinR
4fbe8bf5ef Add palette editor bit depth to config 2023-02-22 11:21:30 -05:00
GriffinR
420e92e912 Fix color calc in palette editor hex edit 2023-02-22 10:43:45 -05:00
garakmon
777a6c2e18 auto take changelog in porymap about window 2023-02-20 19:09:42 -05:00
GriffinR
49a5600e2d Fix tile limit being used for metatiles 2023-02-20 11:19:56 -05:00
GriffinR
a7ceca47fb
Merge pull request #520 from GriffinRichards/metatile-labels 
Support sharing metatile labels between tilesets
 2023-02-20 11:04:18 -05:00
GriffinR
51b57f9222 Fix map border layering above connections after map switch 2023-02-18 01:21:08 -05:00
GriffinR
26f07add79 Reset Tileset Editor history when tileset changes 2023-02-17 22:27:02 -05:00
GriffinR
096c26b85a Fix label history being ignored if metatile didn't change 2023-02-17 15:40:10 -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
72ae9dfc01 Fix regression in metatile label saving 2023-02-14 11:50:14 -05:00
GriffinR
36363febf7 Remove mistaken field addition to map_groups.json 2023-02-14 11:03:01 -05:00
GriffinR
d88ae2b461
Merge pull request #518 from GriffinRichards/api-warnings 
Add new API warnings
 2023-02-12 14:25:13 -05:00
GriffinR
f4f93f4c98 Remove option to turn off script warning messages 2023-02-12 14:09:25 -05:00
GriffinR
a3a2f3bbcd Fix null characters being written to JSON files 2023-02-12 13:30:33 -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
GriffinR
e710567400 Revert changes to readCIncbin 2023-02-06 19:19:46 -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
63734aec7c
Merge pull request #511 from GriffinRichards/fix-tilemap 
Support 8BPP images for 4BPP tilemaps
 2023-02-05 15:07:07 -05:00
GriffinR
9727af5793
Merge pull request #512 from GriffinRichards/layout-warn 
Improve layout parser warnings/errors
 2023-02-05 15:06:47 -05:00
GriffinR
b6c97e845b
Merge branch 'master' into fix-tilemap 2023-02-05 14:55:36 -05:00
garakmon
940e7355d0 fix crash resulting from deleting encounter fields with groups present 2023-02-05 14:48:40 -05:00
garakmon
f34aec824e fix map item render when collision tab is active 2023-02-05 10:57:55 -05:00
GriffinR
2ee60f4544 Delete layout when readMapLayouts fails 2023-01-25 23:39:10 -05:00
GriffinR
2fce82d1b4 Improve layout parser warnings/errors 2023-01-25 23:30:54 -05:00
GriffinR
56ba0a8f77 Support 8BPP images for 4BPP tilemaps 2023-01-25 20:40:23 -05:00
garakmon
70980f5e42 fix incbin parsing for multiple matches 2023-01-24 13:37:18 -05:00
GriffinR
44780b2311 Fix connections occluding events 2023-01-24 03:31:04 -05:00
GriffinR
0f814d78bd Fix connection masks not clearing on Connection tab 2023-01-23 15:28:02 -05:00
Marcus Huderle
7d3699457f Fix metatile mask config loading 2023-01-22 11:34:51 -06:00
garak
8ce6c2dfc9 accept single click action for editing encounter table 2023-01-19 15:11:42 -05:00
GriffinR
73d0cb8933 Set transparency on pokemon icons 2023-01-19 15:09:27 -05: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
5c63dc9bbc do not scroll encounter tabs with wheel, set current species combo by index instead of text 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
1ed2f1d206 use static QImage for collision pixmap copying 2023-01-17 13:15:07 -05:00
garak
c7d548bfc3 use a file cache for files that are already read 2023-01-17 13:15:07 -05:00
garak
260517b7ba fix const for dynamic regular expressions 2023-01-17 13:15:07 -05:00
garak
f1b962bdf5 do not convert to stdString expensively when parsing ordered json numbers 2023-01-17 13:15:07 -05:00
garak
4df4e6ddd7 fix metatile label reading 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
37fcfba829 use static (And const where applicable) regular expression objects 
the speed increase here is noticable since the work of creating a regex object is only done once per session
 2023-01-17 13:15:07 -05:00
garak
d1bdbc2741 create temporary timing function 2023-01-17 13:15:07 -05:00
GriffinR
6101899b6d Set unsaved changes when pasting metatiles 2023-01-16 21:47:36 -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
Marcus Huderle
dcbf62e72f Remove inadvertent save to layouts.json 2023-01-16 11:59:21 -06:00
GriffinR
5ef4fbafbc Fix spacing typo 2023-01-16 00:46:30 -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
garakmon
f27c4e9ab4 fix itemfinder checkbox initialization bug 2023-01-10 15:50:30 -05:00
GriffinR
160a9c0713 Resolve shortcuts for Open Project 2023-01-06 12:42:29 -05:00
GriffinR
00a430d208 Fix crash when importing AdvanceMap metatiles 2023-01-06 11:53:42 -05:00
GriffinR
600af6dc72 Fix C parser crashing on #endif at EOF 2022-12-31 12: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
324bc3a517 Fix onMapResized not triggering 2022-12-15 02:13:30 -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
b7ec693533 Sync with some additional dialogs 2022-11-28 03:27:39 -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
254467451f
Merge pull request #489 from GriffinRichards/api-setscale 
Add setScale to the API
 2022-11-18 18:12:59 -05:00
GriffinR
97b8bb96cb Remove unused function 2022-11-07 01:02:33 -05:00
GriffinR
567a6d92e5 Enforce indexed tile images 2022-11-04 13:06:50 -04:00
GriffinR
3770efd6c5 Add setScale to the API 2022-11-03 13:19:57 -04:00
GriffinR
bf9e670d4c Merge branch 'master' of https://github.com/huderlem/porymap into metatile-attr 2022-10-30 11:42:52 -04:00
GriffinR
01cbb52341 Preserve null custom attributes 2022-10-29 17:16:52 -04:00
Marcus Huderle
16926144da Fix event offsets in map image exporting 2022-10-29 11:29:38 -05: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
fa859a691f Fix minimum connection bounds 2022-10-29 10:57:08 -04:00
GriffinR
c16a6d5d23 Better support for parsing hex values 2022-10-28 13:29:33 -04:00
GriffinR
15e69dc9e7 Enforce border max for new maps 2022-10-28 13:25:04 -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
ce6abb0a81 Default to No for file watcher prompt 2022-10-25 17:53:12 -04:00
GriffinR
4187732baa Default to Cancel for reload warning 2022-10-25 17:40:40 -04:00
GriffinR
3656c3082f Fix Open Config Folder 2022-10-25 08:07:14 -04:00
GriffinR
8137388364 Fix QPalette highlights not working for all macOS themes 2022-10-25 02:00:00 -04:00
GriffinR
69c1ae678d Ignore empty deletes for custom attributes 2022-10-24 23:01:26 -04:00
GriffinR
ea19b3a08c Sort asm tileset lists 2022-10-24 19:55:06 -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
GriffinR
c9d244bf9b Add missing object event defaults 2022-10-23 18:06:55 -04:00
GriffinR
469ea40984 Automatically convert enable_object_event_in_connection 2022-10-23 17:22:19 -04:00
Marcus Huderle
6fc82c9487 Fix overlay clipping by applying clipping before painter transformations 2022-10-23 10:08:59 -05:00
Marcus Huderle
6332e74d1f Fix typo in region map layout save 2022-10-22 14:31:38 -05: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
2f93caff14 Fix metatile behaviors with no constant not displaying 2022-10-19 00:33:53 -04:00
GriffinR
4c3a508534 Better type conversion custom event attributes 2022-10-18 19:52:35 -04:00
GriffinR
7bb5eea7fa Use new config filepaths 2022-10-18 17:14:46 -05:00
GriffinR
55f7b73b9b Fix id names of new heal locations 2022-10-18 17:14:46 -05:00
GriffinR
5f3efdc7a4 Rewrite heal location data writing 2022-10-18 17:14:46 -05:00
GriffinR
3e1d26f0ce Make heal location constants prefix-agnostic 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
551a771798 Fix some build warnings from event rewrite 2022-10-18 12:29:07 -04:00
GriffinR
75788ed3f9 Convert event JSON values by type 2022-10-18 01:20:53 -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
4b565208f7 Fix one-frame EventFrame jank 2022-10-17 19:37:26 -05:00
Marcus Huderle
3de8e88b8e Add optional forceRedraw argument to palette API functions 2022-10-17 19:03:11 -05:00
GriffinR
5e83c1f716 WIP Adjust custom attributes table 2022-10-17 14:52:12 -04:00
garak
33014830cd set map early when creating new events because some types need map info for defaults 2022-10-16 22:15:48 -04:00
garak
c3a5e05f49 update clone sprite text 2022-10-16 21:04:29 -04:00
garak
715c37572e update clone object sprite icon with target change 2022-10-16 19:45:12 -04:00
garak
73ccc3d89d fix bug preventing selection of last event from spinner 2022-10-16 19:16:37 -04:00
garak
265340eed0 add local script labels to event combos for drop down 2022-10-16 18:47:35 -04:00
garak
3f2fea0980 event updates 
- select first event in order of tabs and lowest index
  (prev: select top left event)
- maintain current event selection between tab changes
 2022-10-16 18:37:55 -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
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
Marcus Huderle
37022c2b38 Adjust layout of events tab 2022-10-15 13:02:28 -05:00
Marcus Huderle
36de7b63ff Fix event frame window visibility issue 2022-10-15 12:49:29 -05:00
garakmon
2fa2fc52e8 fix save for region map layout new format 2022-10-15 12:08:42 -04: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
d433641bee allow numbers for gfx constants, code cleanup 2022-10-13 22:30:07 -04:00
garak
00504817db add methods for updating frame ui 2022-10-13 22:30:07 -04:00
garak
511c6ddb03 fix bug related to event id spinner 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
garak
8ac556c0de properly hide configurable event ui 2022-10-13 22:30:07 -04:00
garak
679f2419b7 fix event tabs not updating with group size changes 2022-10-13 22:30:07 -04:00
garak
9e54537ba2 fix nonstandard use of pointer casting 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
garakmon
dd66f967f8 support current pokeemerald region map layout format 2022-10-13 22:20:19 -04:00
GriffinR
2b78330660 Improve API text rendering speed 2022-10-13 09:55:48 -07:00
GriffinR
fbe5427c0b Prevent some script edit feedback loops 2022-10-11 22:50:08 -04:00
GriffinR
c953a15523 Move error logging out of gameStringToBool 2022-10-10 11:38:17 -05:00
GriffinR
d7894f8399 Ignore unused map header fields for pokeruby 2022-10-10 11:38:17 -05:00
GriffinR
c58162be96 Support C tileset data without initializers 2022-10-10 11:38:17 -05:00
GriffinR
487cc8d367 Add config options to remove unnecessary tileset fields 2022-10-10 11:38:17 -05:00
GriffinR
374da65b7f Clean up tileset C parsing 2022-10-10 11:38:17 -05:00
GriffinR
9b4c55106b Read tileset graphics paths from C 2022-10-10 11:38:17 -05:00
GriffinR
70528bbc56 Write tilesets data in C 2022-10-10 11:38:17 -05:00
GriffinR
efd49cd544 Read tileset headers from C data 2022-10-10 11:38:17 -05:00
GriffinR
ebdf22145d Generalize C struct parsing 2022-10-10 11:38:17 -05:00
GriffinR
85a5f07695 Display behavior in the bottom bar 2022-10-10 11:37:03 -05: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
2fc4b6b53b Fix tileset editor including unused primary metatiles 2022-10-06 02:09:49 -04:00
GriffinR
e70b049887 Remove unnecessary null checks 2022-10-05 18:53:31 -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
c27ea49fcd Raise supplemental windows when reactivated 2022-10-05 11:55:43 -04:00
GriffinR
c3b9de61de Adjust width calculation in metatilelayersitem 2022-10-04 17:50:39 -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
691ab2b9cf Fix metatile render not updating when layer type is changed 2022-10-03 12:23:45 -04:00
GriffinR
5b5d6ddf25 Give metatile label copy feedback, skip empty labels 2022-10-03 10:14:41 -04:00
GriffinR
1b743f9625 Replace offset in createImage with x/y offset 2022-10-01 17:43:50 -05:00
GriffinR
4b1498d059 Add name list functions to API 2022-10-01 08:41:14 -05:00
Marcus Huderle
1439599079 Fix tooltip to be compatible with Qt 5.14 2022-09-27 18:48:48 -05:00
GriffinR
d353164244 Suppress errors for unneeded defines 2022-09-27 18:22:41 -05:00
Marcus Huderle
ddf0fe4e11 Display 'prefab selected' tooltip when selecting a prefab for painting 2022-09-27 18:22:08 -05:00
GriffinR
fa76e22508 Add missing project file path usage 2022-09-27 18:22:54 -04:00
GriffinR
4f5d98b81a Write configs on load 2022-09-26 13:31:10 -04:00
Marcus Huderle
54be7a18a9 Merge remote-tracking branch 'tustin/path-in-config' 
# Conflicts:
#	docsrc/manual/settings-and-options.rst
#	include/config.h
#	src/config.cpp
#	src/scriptapi/apimap.cpp
#	src/scriptapi/scripting.cpp
 2022-09-25 10:02:24 -05:00
Marcus Huderle
c81829cd3f Merge remote-tracking branch 'griffin/api-redesign' 2022-09-24 15:48:42 -05:00
Marcus Huderle
9c7d2e49b2 Fix build break with new getConfigBool() usage 2022-09-24 15:47:21 -05:00
Marcus Huderle
07f1dd7a62 Merge branch 'master' into new-map-config 2022-09-24 15:40:08 -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
tustin2121
e241cdd104 Fixed path composing bug with goto script 2022-09-22 12:05:19 -04:00
GriffinR
126d264982
Merge branch 'master' into api-redesign 2022-09-12 13:01:22 -04:00
GriffinR
7777eac9f4 Silence errors about SECRET_BASE_GROUP 2022-09-12 11:54:44 -04:00
GriffinR
856624addf Remove region map dimensions from config 2022-09-12 11:33:51 -04:00
GriffinR
089e214d2e Add new map config options 2022-09-12 11:31:35 -04:00
tustin2121
4c68c3cd77
Merge branch 'master' into path-in-config 2022-09-11 13:56:09 -04:00
Marcus Huderle
9f69e433f0 Merge branch 'master' of https://github.com/huderlem/porymap 2022-09-11 10:52:02 -05:00
Marcus Huderle
9e4a143b3a Properly use project root as base path for relative prefab filepaths 2022-09-11 10:19:55 -05:00
GriffinR
981888799c Fix prefab error log typo 2022-09-11 00:11:58 -04:00
Marcus Huderle
b14d8b8a88 Add vlidation for metatile id range 2022-09-10 12:33:25 -05:00
Marcus Huderle
b715e43ba8 Fix prefab UI lag by attaching prefab widgets to separate wrapper frame 2022-09-10 09:14:52 -05:00
Marcus Huderle
4eeff2ed21 Set default prefabs config filepath 2022-09-10 08:54:16 -05:00
Marcus Huderle
300fde4b86 Add confirmation dialog for prefab deletion 2022-09-09 20:53:07 -05: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
GriffinR
60a665642f Drop useless object freezes 2022-09-06 12:22:22 -04: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
6757d8afdb Standardize API file names 2022-09-05 12:17:27 -04:00
GriffinR
bd5446a40b Move script utility functions to own object 2022-09-05 12:13:03 -04:00
GriffinR
31b22bfcc1 Add constants object to API 2022-09-05 01:52:12 -04:00
GriffinR
a3dadadd5b Reorganize overlay functions under MapView 2022-09-04 22:36:35 -04:00
GriffinR
b25dbb849e Reorganize API files 2022-09-04 20:35:18 -04:00
Marcus Huderle
6f68e7e9de
Merge pull request #456 from GriffinRichards/api-scale 
Add scale to API's createImage, add getPorymapVersion
 2022-09-03 12:52:27 -05:00
Marcus Huderle
fe02c7ea70
Merge pull request #448 from GriffinRichards/handle-collision 
Various minor API improvements
 2022-09-03 12:49:07 -05:00
Marcus Huderle
a5136849b8
Merge pull request #455 from GriffinRichards/api-border 
Add map border to the scripting API
 2022-09-03 12:48:35 -05:00
Marcus Huderle
cd697df23d
Merge pull request #452 from GriffinRichards/rewrite-loadmetatiles 
Clean up loadTilesetMetatiles
 2022-09-03 11:33:57 -05:00
GriffinR
e9ac799ed2
Merge branch 'master' into handle-collision 2022-09-03 12:09:14 -04:00
Marcus Huderle
41dfa13de9
Merge pull request #445 from GriffinRichards/api-windows 
Add message boxes and user input windows to API
 2022-09-03 11:05:08 -05:00
tustin2121
d97ed4b64f Removing optional 
- C++11 compliance: there's no optional, so use invalid enum value instead.
 2022-09-01 13:29:05 -04:00
tustin2121
09a590e01a Fixing integration failure 
- Apparently Qt 5.15 operations are not allowed.
 2022-09-01 13:03:11 -04:00
tustin2121
3d9cd2ad0d Moving paths to project config 
- Replaced all instances of hardcoded paths with requesting a path from the new project config file properties for "path/".
- As a result, all default paths hardcoded into porymap are now in one place.
- When reading the config file, it now trims out white space around the key and value.
 2022-09-01 12:14:47 -04:00
tustin2121
8e83daac84 Split project config 
- Project config is now split into project and user config.
- Backwards compatibility with the old project config included, porting old project items over to the new user config.
 2022-09-01 00:57:31 -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
GriffinR
be4a5e8528 Add onBorderVisibilityToggled callback 2022-08-30 12:53:33 -04:00
GriffinR
3e7bfe126a Add edit history for border edits via script 2022-08-29 20:20:09 -04:00
GriffinR
46b4b51302 Handle negative coordinates in Map::setBlock 2022-08-29 13:14:06 -04:00
GriffinR
21ed9bc140 Add onBorderMetatileChanged, onBorderResized, implement some basic border API 2022-08-29 12:57:20 -04:00
GriffinR
8f90ca64b4 Add basic border functions to API 2022-08-28 21:45:57 -04:00
GriffinR
778257ccd9 Add get/setMetatileAttributes 2022-08-26 19:37:07 -04:00
GriffinR
aad1266e91 Tile properties to bitfield 2022-08-26 19:30:40 -04:00
GriffinR
fd4ba874d2 Fix unused layer rendering for METATILE_LAYER_MIDDLE_TOP 2022-08-26 19:29:48 -04:00
GriffinR
d22aab9b10 Fix setOverlayOpacity setting the opacity of the cursor rect and map grid 2022-08-26 18:55:41 -04:00
GriffinR
778cc2ba47 Fix API crashes on bad palette ids / tile numbers 2022-08-26 18:55:19 -04:00
GriffinR
b8636548dc Move function call outside loop 2022-08-20 16:08:53 -04:00
GriffinR
774c60cc88 Clean up loadTilesetMetatiles 2022-08-20 12:14:11 -04:00
GriffinR
4feb913fe8 Add setBlock overload, handle collision values of 2 or 3 2022-08-03 15:14:25 -04:00
GriffinR
c8b28be0b4 Add message boxes and user input windows to API 2022-07-14 16:47:08 -04:00
GriffinR
c05e03a576
Merge branch 'master' into event-paste 2022-07-11 22:45:38 -04:00
garak
26319cef9f reselect old metatile after tileset save 2022-07-11 22:06:17 -04:00
garak
0e3b07201a document tileset and palette editors 2022-07-11 22:06:17 -04:00
garak
ca0229f444 fix 15 bit depth hex value update 2022-07-11 22:06: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
ab6aa01973 use zoom_box_dimensions constant for color picker preview window 2022-07-11 22:06:17 -04:00
garak
1d596023c6 remove palette editor frame shadows 2022-07-11 22:06:17 -04:00
garak
7f24e5c9ee fix spinbox signal ambiguity 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
garak
48baf627e8 palette editor: color hex boxes, spinboxes for sliders 2022-07-11 22:06:17 -04:00
garak
45cb2a19af add a color picker dialog to palette editor 2022-07-11 22:06:17 -04:00
GriffinR
22a42eaac1 Select newly-pasted events 2022-07-05 14:50:17 -04:00
GriffinR
d9b37ecb0b Prevent paste exceeding object limit, warn when copying healspots 2022-07-05 14:38:23 -04:00
GriffinR
2bdc8024f7 Add reopen on launch setting to UI 2022-07-04 16:22:52 -05:00
GriffinR
a407fa9e17 Add reopen on launch config option 2022-07-04 16:22:52 -05:00
GriffinR
4a41858e5b Condense config bool code 2022-07-04 16:22:52 -05:00
Marcus Huderle
02b0bc94c5 Make obj event gfx parsing backwards compatible 2022-07-03 11:28:24 -05:00
Marcus Huderle
0b0c588c64 Read object event gfx info by parsing its C file, rather than relying on regex 2022-07-03 11:28:24 -05:00
Marcus Huderle
ed30115d2e
Merge pull request #413 from GriffinRichards/label-copy 
Add metatile label copy button
 2022-07-03 10:46:50 -05:00
GriffinR
3a2d2ef3c2 Add sanity checks to setMetatileLayerOrder 2022-07-03 07:57:09 -05:00
GriffinR
44bbef6105 Render unused metatile layer as it appears in-game 2022-07-03 07:57:09 -05:00
GriffinR
87b43080ba Fix auto-merge 2022-06-30 00:47:31 -04:00
GriffinR
441db4274e
Merge branch 'master' into label-copy 2022-06-30 00:41:10 -04:00
garak
5f3653e7b0 remove unused city map code 2022-06-29 22:15:21 -04:00
garak
13603901e2 fix config update crash, add real swap & rename old swap to replace 2022-06-29 22:15:21 -04:00
garak
04ef5c5b7c expose config dialog to users after setup (File>Update Config) 2022-06-29 22:15:21 -04:00
garak
813845e0da address feedback, fix oversights 2022-06-29 22:15:21 -04:00
garak
c76f6a8049 code cleanup: finish rme update core 2022-06-29 22:15:21 -04:00
garak
aeb56e579c support ruby in rme 2022-06-29 22:15:21 -04:00
garak
80909734c2 fix build for Qt5 2022-06-29 22:15:21 -04:00
garak
f7a0e02f95 resize region map tilemaps 2022-06-29 22:15:21 -04:00
garak
cff77ad58e update swap section feature for rme 2022-06-29 22:15:21 -04:00
garak
4334e5b2e9 save / load from the config 2022-06-29 22:15:21 -04:00
garak
e82ff92b2b add/remove map section entry in region map editor 2022-06-29 22:15:21 -04:00
garak
fa01768962 add history for region map layout size and mapsec entry edits 2022-06-29 22:15:21 -04:00
garak
2b152ce64e create edit history for region map tilemap and layout 2022-06-29 22:15:21 -04:00
garak
43ebeb1662 region maps: save layouts, save tilemaps 2022-06-29 22:15:21 -04:00
garak
1334369906 begin overhaul of region map editor 
- use a configurator to give users more options
- support firered (tilemaps, layout layers)
- add support for 4bpp and 8bpp tilemaps
- use new region map entries json format
- temporarily disabled city tilemap editor code
 2022-06-29 22:15:21 -04:00
GriffinR
c1e3415417 Fix memory leak 2022-06-29 19:13:42 -04:00
GriffinR
73eabc92ca Prevent duplicate metatile pastes in the tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
304b00b0f3 Add copy/paste to tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
553da9a115 Fix missing music when importing from Advance Map 2022-06-28 13:22:34 -04:00
GriffinR
096a66067d Automatically disable encounters if JSON is missing 2022-06-28 13:20:02 -04:00
GriffinR
b20df82358 Assume objects with no type field are not clones 2022-06-24 23:47:43 -04:00