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

553 commits

Author SHA1 Message Date
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
GriffinR
374da65b7f Clean up tileset C parsing 2022-10-10 11:38:17 -05:00
GriffinR
efd49cd544 Read tileset headers from C data 2022-10-10 11:38:17 -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
Marcus Huderle
1439599079 Fix tooltip to be compatible with Qt 5.14 2022-09-27 18:48:48 -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
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
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
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
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
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
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
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
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
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
21ed9bc140 Add onBorderMetatileChanged, onBorderResized, implement some basic border API 2022-08-29 12:57:20 -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
4feb913fe8 Add setBlock overload, handle collision values of 2 or 3 2022-08-03 15:14:25 -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
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
d1883720c9 Add metatile label copy button 2022-02-10 09:53:04 -05:00
GriffinR
b91914310e Allow warping by double-clicking clone objects 2022-02-09 18:31:55 -06:00
GriffinR
b01581dc4d Add clone objects 2022-02-09 18:31:55 -06:00
GriffinR
31f400e2c9 Add event group constants 2022-02-09 18:31:55 -06:00
GriffinR
9963e4c8aa Move map bounds checking to map.cpp 2022-02-08 17:10:07 -06:00
GriffinR
7d51c11a94 Fix tile rect leaving map grid on paint, cursor rects not updating state on collision tab 2022-02-08 17:10:07 -06:00
GriffinR
cf973710c8 Preserve unused metatile attributes 2022-02-08 16:26:19 -06:00
GriffinR
ddc0f01460 Stop repeated parsing of src/data/object_events 2022-01-29 12:26:39 -06:00
GriffinR
366fb5c8a8 Stop repeated parsing of event_objects.h and songs.h 2022-01-29 12:26:39 -06:00
GriffinR
2f6de2a285 Fix selected collision space not updating during paint 2022-01-14 14:01:10 -06:00
GriffinR
1abdb301c1 Fix 'getBlock' functions use for tiles, add getTilePixels to API 2022-01-05 11:07:27 -06:00
GriffinR
fd88184b47 Add opacity to scripting overlay 2022-01-01 16:39:32 -06:00
GriffinR
05fb6c03b7 Fix timing of onMapShifted 2021-12-26 11:23:45 -06:00
GriffinR
94b2c98308 Fix fallback dimensions in getColoredTileImage 2021-12-26 11:23:45 -06:00
GriffinR
574151aebb Clean up API changes 2021-12-26 11:23:45 -06:00
GriffinR
36dc1c6649 Move map cursor UI and grid to foreground 2021-12-26 11:23:45 -06:00
GriffinR
b39906c03f Add onMapShifted to API 2021-12-26 11:23:45 -06:00
GriffinR
8ed891d501 Add option to bypass the API image cache 2021-12-26 11:23:45 -06:00
GriffinR
a6395eefbb Add overlay x/y, split singular/plural overlay functions 2021-12-26 11:23:45 -06:00
GriffinR
03949d45a4 Add paletteId to createImage 2021-12-26 11:23:45 -06:00
GriffinR
eca84beae0 Add basic image cache to scripting API 2021-12-26 11:23:45 -06:00
GriffinR
b5bdac8d36 Add tile/metatile to image functions to API, more tile->tileId/metatileId 2021-12-26 11:23:45 -06:00
GriffinR
5a5d16bdc6 Add overlay visibility toggle 2021-12-26 11:23:45 -06:00
GriffinR
af4c99537f Add layering to scripting overlay 2021-12-26 11:23:45 -06:00
GriffinR
630febff54 Expand addImage to allow image subsets, transformations, and transparency 2021-12-26 11:23:45 -06:00
GriffinR
6613318900 Disambiguate tile field names to tileId or metatileId 2021-12-26 11:23:45 -06:00
GriffinR
ce12a1e017 Add setMetatile functions to API (layerType, encounterType, terrainType, Behavior, Tile) 2021-12-26 11:23:45 -06:00
GriffinR
67af7e52da Add get/setMetatileLabel to API 2021-12-26 11:23:45 -06:00
GriffinR
9cf0575914 Log error when addImage API function fails 2021-12-26 11:23:45 -06:00
GriffinR
c6cec5f848 Preserve invalid metatile selections 2021-12-26 10:18:25 -06:00
garak
f64b03d684
Merge pull request #306 from ultima-soul/import_amap_map 
Add Import Map from Advance Map 1.92 feature.
 2021-11-08 13:10:44 -05:00
garak
7bf07e72c2 better unsaved changes code, only block whitespace in combos 2021-09-08 17:39:38 -04:00
garak
ef78b7957c validate combos to disallow junk characters 
closes #362
 2021-09-08 17:39:38 -04:00
garak
6c3ee3c46d order wild encounter json reading 2021-08-12 20:24:46 -04:00
ultima-soul
2d87a6222a Merge branch 'master' of github.com:huderlem/porymap into import_amap_map 2021-07-23 23:35:56 -07:00
ultima-soul
cdcf535894 Address review comments. 2021-07-23 16:20:41 -07:00
garak
2ee5676925 fix metatile selector filter draw 2021-07-23 12:11:35 -04:00
garak
fc0c404836 remove some commented old code 2021-07-22 12:23:21 -04:00
garak
df724a4682 find unused tiles 2021-07-22 12:23:21 -04:00
garak
601e671fc8 add options to count metatiles to tileset editor 
- count the total number of usages across all maps of specific metatiles
- display the count and/or display unused metatiles
- this does not account for metatiles used in code (most of these are labeled)
 2021-07-22 12:23:21 -04:00
garak
4c4e6dbcbf fix rebase error 2021-07-07 18:11:35 -05:00
Marcus Huderle
6f394ce39c Code fixes for Qt 6 2021-07-07 18:11:35 -05:00
BigBahss
a9c7691a2e Rename DraggablePixmapItem::move() overload as moveTo to avoid confusion 2021-03-24 19:11:49 -04:00
hjk321
09cfde8280 Song Option in New Map Popup 2021-03-06 22:19:38 -05:00
BigBahss
f166652ccc Revert 80c5f74368 and validate map group 2021-02-21 08:47:03 -06:00
BigBahss
c3718e28be Convert MetatileParser into a namespace 2021-02-18 03:38:34 -05:00
BigBahss
bc2cc7d089 Convert PaletteUtil into a namespace 2021-02-18 03:25:26 -05:00
Marcus Huderle
c351f069ff Merge remote-tracking branch 'origin/master' into metatile-leaks 2021-02-17 16:56:15 -06:00
BigBahss
9a9143500f Convert remaing pointers in Project to values 2021-02-17 16:34:46 -06:00
BigBahss
820b514f26 Change many pointer members in Project to values 2021-02-17 16:34:46 -06:00
BigBahss
cc7a5f5819 Fix memory leaks in Tileset 2021-02-16 21:45:54 -05:00
BigBahss
c1303d98c3 Scriptapi: fix segfault in shift(), add missing flag to the caller of shift() 2021-02-16 16:51:00 -06:00
BigBahss
a3326a764b Simplify some usages of Blockdata 2021-02-16 16:51:00 -06:00
BigBahss
f09e28f06c Convert usages of Blockdata pointers 2021-02-16 16:51:00 -06:00
BigBahss
42b56edc9d Begin refactoring Blockdata to simply inherit QVector<Block> 2021-02-16 16:51:00 -06:00
BigBahss
6a825d0b39 Use implicit copy constructor/assignment for Metatile 2021-02-16 13:22:41 -05:00
BigBahss
8187b2d4bb Plug leaks in Metatile 2021-02-16 12:14:27 -05:00
BigBahss
7937c3fe98 Upgrade signal/slot connections in all other files 2021-02-14 11:09:39 -06:00
Marcus Huderle
e9c4d5b73f Fix getBlock() memory leak 2021-02-13 15:16:52 -06:00
Marcus Huderle
3c2aa5d2e9 Fix out-of-bounds array access in bucket fill 2021-02-12 17:23:45 -06:00
Marcus Huderle
9439dc76d2 Only include relevant frames in the timelapse animation 2021-01-20 19:27:50 -06:00
Marcus Huderle
c354142f1b Add ability to export map timelapse GIFs 2021-01-20 19:27:50 -06:00
garak
3bf4aaf964 fix palette editor crash 2021-01-16 10:34:09 -06:00
BigBahss
1d29a53237 Merge remote-tracking branch 'origin/master' into script-editing 2020-12-13 00:30:22 -05:00
GriffinR
6b6ad558b6 Remove unnecessary assignment 2020-12-11 16:24:18 -06:00
GriffinR
8261ad5bea Strip leading digits from new map names 2020-12-11 16:24:18 -06:00
BigBahss
c0eb0503e2 Update CHANGELOG and docs. 
Merge remote-tracking branch 'origin/master' into shortcuts-editor
 2020-12-05 20:33:45 -05:00
BigBahss
789fe7d00c Merge remote-tracking branch 'origin/master' into script-editing 2020-12-01 16:43:53 -05:00
BigBahss
dbafb99fd4 Add action to open the project root in a text editor 2020-12-01 07:12:32 -05:00
BigBahss
b9aaef24c6 MapRuler: Fix artifacting, fix centering for other thickness values 2020-11-22 08:37:16 -06:00
BigBahss
6ca4802948 Use QGraphicsObject's signalling to enable/disable MapRuler 2020-11-22 08:37:16 -06:00
BigBahss
bc0127430b Fix MapRuler dimensions tooltip and refactor 2020-11-22 08:37:16 -06:00
BigBahss
3478846b60 Add Project::getMapScriptsFilePath() and rename text editor config members 2020-11-21 17:33:16 -05:00
BigBahss
662fb2a367 Move themes to PreferenceEditor 2020-11-16 09:35:55 -05:00
BigBahss
ea9cfa47e5 Add basic prefences window with text editor command field 2020-11-16 07:39:42 -05:00
BigBahss
300a41c149 Add clear button to MultiKeyEdit 2020-11-13 02:52:37 -05:00
BigBahss
bb6786f24e Add extra shortcuts to main window and sub-editors 2020-11-12 23:48:03 -05:00
BigBahss
f044672d2e Add support for sub-editor shortcut customization 2020-11-09 05:50:15 -05:00
BigBahss
9a3609ee6d Fix MultiKeyEdit clear action not re-aligning key sequences 2020-11-09 02:56:22 -05:00
BigBahss
2fb3bf4e26 Redesign ShortcutsEditor to take an obj list and refactor config to reflect that 2020-11-08 12:03:44 -05:00
BigBahss
f5964fbe7f Refactor ActionShortcutEdit into MultiKeyEdit 2020-11-06 10:20:31 -05:00
BigBahss
43d3257d89 Extract functions in ShortcutsConfig 2020-11-05 06:32:31 -05:00
BigBahss
eabd2d6618 Convert QShortcut's to Shortcut's and add them to config 2020-11-03 05:58:10 -05:00
BigBahss
ed2f8bf180 Add custom Shortcut class 2020-11-03 03:18:34 -05:00
BigBahss
88fbf9f28b Add ShortcutsEditor to customize shortcuts for QAction's 2020-11-01 09:16:27 -05:00
BigBahss
9c57a5bc46 Refactor MapRuler event handling 2020-10-24 07:45:08 -04:00
BigBahss
40a155329e Merge branch 'master' into ruler-tool 2020-10-24 03:28:29 -04:00
Tyler
de43c64118
Merge branch 'master' into fix-window-size-issue 2020-10-22 19:59:11 -04:00
BigBahss
f47e8b1903 Refactor TilesetEditor 2020-10-22 18:44:22 -05:00
BigBahss
e4095130c5 Fix closing tileset editor not closing palette editor 2020-10-22 18:44:22 -05:00
BigBahss
8b7f4069cd Save & restore palette editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
daae6fe52b Save & restore region map editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
5624de750b Save & restore tileset editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
bb61dc9b51 Add dynamic FlowLayout class 2020-10-20 14:41:51 -04:00
ExpoSeed
18cb48f806 Fix typo 
editing from github is poggers
 2020-10-04 21:47:57 -04:00
BigBahss
273dbaa94f Prevent ruler activation when right-clicking event in paint mode 2020-10-02 22:31:44 -04:00
BigBahss
fb5e35bd5f Use Metatile::coordFromPixmapCoord() in all remaining cases 2020-10-02 15:32:22 -04:00
BigBahss
39aa420265 Turn MapRuler dimensions into a mouse-tracking tooltip, and show in status bar 2020-10-02 12:12:19 -04:00
BigBahss
9565b677d2 Add tick marks to MapRuler 2020-09-25 11:56:02 -04:00
BigBahss
ca6969564f Add MapRuler (right-click & drag in events view) 2020-09-25 11:53:07 -04:00
ultima-soul
8575b83212 Add support for FRLG .map files and border importing for pokefirered and custom border size supporting projects. 2020-09-21 14:26:58 -07:00
ultima-soul
38e7951f3e Add Import Map from Advance Map 1.92 feature. 2020-09-19 12:05:27 -07:00
BigBahss
698e4e38e7 Add clear buttons to all QLineEdit text boxes 2020-09-13 08:34:36 -05:00
BigBahss
bc788b6caa Fix reintroduction of issue fixed by 79e384ef76 2020-09-07 14:54:34 -04:00
BigBahss
6251da65b2 Retain external selection on map change (closes #291) 2020-09-07 14:54:34 -04:00
GriffinR
4b5b84ed36 Fix status bar not updating while dragging events 2020-09-07 14:12:26 -04:00
garak
40078888f8 show or hide rects immediately with shortcuts 2020-09-07 14:06:07 -04:00
BigBahss
939ec2520d Simplify lockNondominantAxis() and add comment 2020-09-07 13:12:15 -04:00
BigBahss
2fd3df9734 Remove straight paths checkbox and refactor 2020-09-07 13:12:15 -04:00
BigBahss
de2246e2fd Simplify some straight paths logic 2020-09-07 13:12:15 -04:00
BigBahss
27c9fec0b4 Fix collision straight paths and general improvement 2020-09-07 13:12:15 -04:00
BigBahss
713ded1754 Add straight paths for map shifting 2020-09-07 13:12:15 -04:00