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

520 commits

Author SHA1 Message Date
garak
9cc55ef2f7 add option to copy mon info from another tab [closes #469] 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
23d790cc4a use custom model for encounter tables 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
55c97a45d9 render collision apart from metatiles, using graphics item layering to display 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
GriffinR
6101899b6d Set unsaved changes when pasting metatiles 2023-01-16 21:47:36 -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
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
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
5ca3906f55
Merge branch 'master' into keep-import-path 2022-12-14 16:10:23 -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
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
bf9e670d4c Merge branch 'master' of https://github.com/huderlem/porymap into metatile-attr 2022-10-30 11:42: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
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
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
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
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
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
Marcus Huderle
6fc82c9487 Fix overlay clipping by applying clipping before painter transformations 2022-10-23 10:08:59 -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
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
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
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
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
GriffinR
d88d6a828e Scale to qreal, draw path border over fill 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
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
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
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