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

346 Commits

Author SHA1 Message Date
GriffinR
ee986b8e56 Remove unnecessary const qualifier, unused variable 2025-02-12 15:54:18 -05:00
GriffinR
e8f2713952
Merge branch 'dev' into heal-locations 2025-02-11 14:26:15 -05:00
GriffinR
c20de521b8 Add event selection settings 2025-02-10 16:06:33 -05:00
GriffinR
2100aaac93 Fix some internal use of 'objects' when referring to events 2025-02-09 17:06:30 -05:00
GriffinR
c49470c47e Fix some memory leaks 2025-02-07 23:15:18 -05:00
GriffinR
df861b59ad Shift events if map moves when resized 2025-02-07 14:59:00 -05:00
GriffinR
184f04202f Fix cursor and improperly-disabled edits when switching to Events tab 2025-02-07 13:22:21 -05:00
GriffinR
6b9a4d73e9 Read/write heal locations using new JSON data 2025-02-06 13:46:42 -05:00
GriffinR
fe38e42591 Port changes from Custom Attributes redesign 2025-01-31 10:45:59 -05:00
GriffinR
09694891f3
Merge pull request #665 from GriffinRichards/wild-enc-search 
Add search feature to wild pokemon tab
 2025-01-30 11:48:28 -05:00
GriffinR
5a6d5ea929 Fix some issues with map connections after layout split 2025-01-29 13:48:03 -05:00
GriffinR
3bbb81e436 Add search feature to wild pokemon tab 2025-01-28 14:09:24 -05:00
GriffinR
40adedef34 Fix editor's map/layout clearing if a map/layout fails to load 2024-12-23 15:02:14 -05:00
GriffinR
59464aa89c Fix possible crash when layout fails to open 2024-12-16 14:39:23 -05:00
GriffinR
bf3820745a Add new QValidator classes 2024-12-16 14:34:45 -05:00
GriffinR
b7d78b0263 Make Map members private 2024-11-12 12:44:33 -05:00
GriffinR
ab8eb7c7e4 Reimplement disabled Delete key features 2024-10-31 14:58:01 -04:00
GriffinR
2ce5c3fcc5 Fix crash on tileset save, bugs with map resizing 2024-10-29 16:16:35 -04:00
GriffinR
5e9ab4c7c7 Reopen Porymap to last-opened map/layout 2024-10-17 11:46:47 -04:00
GriffinR
b5c50e7660 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-16 22:29:03 -04:00
garak
eed641f5ff fix connection mask in layout display 2024-10-03 11:06:40 -04:00
garak
7bfb064e80 fix main tab icon initialization 2024-10-02 02:50:41 -04:00
GriffinR
44642c347f Add custom dash patterns to grid settings 2024-10-01 01:50:29 -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
d7e41e7190
Merge pull request #605 from GriffinRichards/encounter-graph 
Add encounter charts
 2024-09-02 20:30:33 -04:00
GriffinR
9ae336080e Consolidate event constructor calls 2024-08-30 23:33:46 -04:00
GriffinR
0b4f02779b Fix regression for dragging multiple events 2024-08-30 23:32:46 -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
b1814e0e3f Initial wild pokemon summary chart 2024-08-21 13:08:06 -04:00
GriffinR
4f4e8105cd
Merge branch 'master' into connections 2024-08-21 02:18:49 -04:00
GriffinR
baaf9c8c9d Fix group Event selections not clearing 2024-08-21 02:13:41 -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
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
edb4a67994 Simplify map list icon updating 2024-08-08 17:26:42 -04:00
GriffinR
4af1c4d463 Take advantage of MapConnection as QObject 2024-08-08 17:25:23 -04:00
GriffinR
b5c7f9f86b Save mirroring in config 2024-08-04 17:39:56 -04:00
GriffinR
4e04e57c05 MapConnection to QObject 2024-08-04 17:21:30 -04:00
GriffinR
7eb3c17f4a Some connection TODO cleanup 2024-08-03 20:52:10 -04:00
GriffinR
2bb01a9988 Add dive map toggle under View 2024-07-25 16:32:26 -04:00
GriffinR
a07517be83 Preserve selection when deleting connections 2024-07-25 15:15:02 -04:00
GriffinR
13252f98f3 Add dive/emerge map overlay 2024-07-25 14:58:36 -04:00
GriffinR
c8434c85b3 Clean up project close for connections tab 2024-07-24 13:52:46 -04:00
GriffinR
3bf237ff45 Merge branch 'master' of https://github.com/huderlem/porymap into connections 2024-07-24 13:08:06 -04:00
GriffinR
80497805a1 Save project config on close 2024-07-24 12:00:34 -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
4c25813bd3 Add project close option 2024-07-17 12:16:02 -04:00
GriffinR
db598a43db Write config files on close / save, not on modification 2024-07-15 20:03:37 -04:00
GriffinR
b60e54c07c Close subwindows gracefully, prompt save on quit 2024-07-15 14:15:56 -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
0aa7ddf27d Add tab enums 2024-07-03 13:41:00 -04:00
GriffinR
6b0034e523 Fix border visibility in API 2024-07-03 13:33:55 -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
391285aee8 Add buttons to open Dive/Emerge maps 2024-06-28 22:01:13 -04:00
GriffinR
db35ec2c79 Initial connections tab UI redesign 2024-06-28 22:00:44 -04:00
garak
89fb4019a5 cleanup shortcuts 2024-04-18 12:21:09 -04:00
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