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

277 commits

Author SHA1 Message Date
garak
22b4108a7f create 'add layout' button 2024-02-15 22:19:49 -05:00
garak
23b55a1074 fix bug disabling map edits after tab switches 2024-02-04 12:58:41 -05:00
garak
0f9c5873a2 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-09 15:28:01 -05:00
GriffinR
2c61df578a Support relative paths in image API functions, combine projectDir calls 2024-01-03 12:13:53 -05:00
GriffinR
ced402a4c6 Add labels from scripts file to Script dropdowns 2023-12-29 21:54:37 -05:00
GriffinR
c543cc0899 Store warp behaviors as values, add version defaults 2023-12-21 23:33:36 -05:00
GriffinR
ee6d6c7bcc Fix metatile behavior value displays 2023-12-19 13:42:07 -05:00
GriffinR
2cdbd029b6 Move warp behavior warning setting to porymap.cfg 2023-12-19 12:57:45 -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
5a3907bf56 Use Block masks to update value limits, parse fieldmap.c 2023-12-16 01:48:13 -05:00
GriffinR
f0310d4a63 Generalize bit packing utility for Block 2023-12-15 14:33:01 -05:00
GriffinR
2228f78117 Privatize Block members 2023-12-12 18:32:54 -05:00
GriffinR
61b1789d4b Custom collision/event graphics cleanup 2023-12-08 14:50:00 -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
garak
f4cd57c988 some code cleanup 2023-09-28 19:02:11 -04:00
garak
f485ebdd3e preserve layout in config 2023-09-28 19:02:11 -04:00
garak
ff086a6fe6 remove redundant mapsceneeventfilter file 2023-09-28 19:02:10 -04:00
garak
2ea0590f6e save changes to layouts 2023-09-28 19:02:10 -04:00
garak
f8c7ada585 fix layout undo history 2023-09-28 19:02:10 -04:00
garak
f7f06dab29 fix change dimensions for layouts 2023-09-28 19:02:10 -04:00
garak
9918159caa ui to change map's assigned layout id 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
GriffinR
d6d27ae8b3 Add Custom Scripts Editor window 2023-09-05 16:45:53 -04:00
GriffinR
9bed66ecfc Write config with project settings editor 2023-08-28 16:48:27 -04:00
GriffinR
cdf4556e23 Fix border not updating when tileset is changed 2023-06-30 00:53:14 -04: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
dbd6afb0c3 Move metatile labels to tilesets 2023-02-14 14:43:05 -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
0f814d78bd Fix connection masks not clearing on Connection tab 2023-01-23 15:28:02 -05:00
garak
a2aa5c0129 add buttons for encounter tab actions 2023-01-19 13:26:05 -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
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
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
8594c2ce36 Display message when hovering on border metatiles 2022-11-28 23:08:57 -05:00
GriffinR
fa859a691f Fix minimum connection bounds 2022-10-29 10:57:08 -04:00
GriffinR
8137388364 Fix QPalette highlights not working for all macOS themes 2022-10-25 02:00:00 -04:00
GriffinR
4c3a508534 Better type conversion custom event attributes 2022-10-18 19:52:35 -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
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
73ccc3d89d fix bug preventing selection of last event from spinner 2022-10-16 19:16:37 -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
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
ec626a59a7 Display custom header values according to type 2022-10-15 11:40:04 -04:00
garak
d433641bee allow numbers for gfx constants, code cleanup 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
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
85a5f07695 Display behavior in the bottom bar 2022-10-10 11:37:03 -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
GriffinR
e9ac799ed2
Merge branch 'master' into handle-collision 2022-09-03 12:09:14 -04:00
GriffinR
be4a5e8528 Add onBorderVisibilityToggled callback 2022-08-30 12:53:33 -04:00
GriffinR
4feb913fe8 Add setBlock overload, handle collision values of 2 or 3 2022-08-03 15:14:25 -04:00
GriffinR
d9b37ecb0b Prevent paste exceeding object limit, warn when copying healspots 2022-07-05 14:38:23 -04: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
ddc0f01460 Stop repeated parsing of src/data/object_events 2022-01-29 12:26:39 -06:00
GriffinR
b79ba466e0 Fix paint edit history 2022-01-14 14:01:10 -06:00
GriffinR
611e787122 Fix cursor tile rect not updating for selections 2022-01-08 08:26:05 -06:00
GriffinR
5f79f15554 Add onBlockHoverChanged and onBlockHoverCleared 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
6518ba36b3 Fix crash switching between projects 2021-12-26 11:23:45 -06:00
GriffinR
6bae415fc1 Add onTilesetUpdated to scripting callbacks 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
7368f443f0 Add config options for showing border/grid 2021-11-08 13:11:16 -05:00
garak
7bf07e72c2 better unsaved changes code, only block whitespace in combos 2021-09-08 17:39:38 -04:00
garak
0b63c438dd mark unsaved changes to map for heaeder and event edits 
closes #305
closes #337
closes #347
 2021-09-08 17:39:38 -04:00
garak
6c3ee3c46d order wild encounter json reading 2021-08-12 20:24:46 -04:00
Marcus Huderle
b35e1d9af9 Use more sensible zoom levels, which eliminates zoom rendering artifacts 2021-07-07 18:11:35 -05:00
BigBahss
820b514f26 Change many pointer members in Project to values 2021-02-17 16:34:46 -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
51dccf7773 Upgrade signal/slot connections in Editor 2021-02-14 11:09:39 -06:00
BigBahss
6335151c39 Add option to open log file 2021-02-03 16:01:54 -06:00
BigBahss
a924938b9b Fix text editor commands for file-paths containing spaces 2020-12-30 18:13:12 -06:00
BigBahss
3a04f59cb0 Fix QProcess::splitCommand() dependency on Qt 5.15. 
Fix shortcut for Open Map Scripts (Due to merge).
 2020-12-13 04:00:00 -05:00
BigBahss
520bd7e6c8 Fix external processes on Windows 2020-12-13 00:06:50 -05:00
BigBahss
7a4de9f3d9 Add support for finding and opening any event script 2020-12-04 09:29:38 -05:00
BigBahss
afc0c0c501 Add button next to script combo-box to open file to that script. 
Revert the behavior of Open Map Scripts button.
 2020-12-02 03:39:08 -05:00
BigBahss
789fe7d00c Merge remote-tracking branch 'origin/master' into script-editing 2020-12-01 16:43:53 -05:00