Commit Graph

1026 Commits

Author SHA1 Message Date
GriffinR
1b510b6a6e Add utility.cpp, fix bug when map/layout name is just underscores 2025-02-22 15:00:06 -05:00
GriffinR
67c3a4befd Fix config appending 0s to saved window geometry/state 2025-02-22 12:45:17 -05:00
GriffinR
5ea071d581
Merge pull request #684 from garakmon/res663
Update Tile / Metatile Usage When Painting
2025-02-19 23:38:59 -05:00
garak
089d90c9cb update tile & metatile usage counts automatically when painting 2025-02-19 16:39:29 -05:00
GriffinR
88f5a90b2f Convert selected_events from DraggablePixmapItem to Event 2025-02-19 14:26:18 -05:00
GriffinR
ac8db41299 Add event group limit 2025-02-19 13:53:05 -05:00
GriffinR
a2aa20ec46 Generalize event loading 2025-02-19 13:24:54 -05:00
GriffinR
c987cb322d Fix default save argument 2025-02-19 11:47:13 -05:00
GriffinR
1ab8b830d8 Add in-game reload message 2025-02-19 11:39:45 -05:00
GriffinR
43d5e32b96 Fix Save All after layout split changes 2025-02-19 11:39:31 -05:00
GriffinR
007d11a337
Add events overlay to map view (#678) 2025-02-19 10:16:53 -05:00
GriffinR
8668504949
Merge pull request #677 from GriffinRichards/quiet-filewatcher
Only show the file watcher warning when Porymap is active
2025-02-19 10:14:09 -05:00
GriffinR
17c35a8d98 Condense parser error messages 2025-02-18 15:18:07 -05:00
GriffinR
d421862ced
Merge pull request #673 from GriffinRichards/event-selection
Add event selection settings
2025-02-14 13:11:38 -05:00
GriffinR
3be7f54d05 Only show file watcher warning when Porymap is active 2025-02-13 21:14:58 -05:00
GriffinR
5feb391a9d Read colorpicker screen using cursor position 2025-02-13 11:17:05 -05:00
GriffinR
e67790a8d3 Merge branch 'dev' of https://github.com/huderlem/porymap into event-selection 2025-02-12 16:10:01 -05:00
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
165d49f7da
Merge pull request #670 from GriffinRichards/tileset-division
Keep metatile images on separate rows, fix metatile usage count
2025-02-11 14:24:55 -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
01126a888a Apply the "map opened" API callback to layouts, add utility functions 2025-02-07 16:25:58 -05:00
GriffinR
df861b59ad Shift events if map moves when resized 2025-02-07 14:59:00 -05:00
GriffinR
ac6750de44 Keep search focus when changing map list tabs 2025-02-07 13:43:10 -05:00
GriffinR
6b9a4d73e9 Read/write heal locations using new JSON data 2025-02-06 13:46:42 -05:00
garak
51773926d2 resolve some goofiness 2025-02-06 13:06:30 -05:00
garak
1e7d5144b9 add back metatile limit upper bound check and popup 2025-02-06 13:06:30 -05:00
garak
035c326348 reset button working for change dimension dialog 2025-02-06 13:06:30 -05:00
garak
e4a4fb5ab1 add limits for resizing layouts 2025-02-06 13:06:30 -05:00
garak
54e41b0c20 redesign layout dimension change window 2025-02-06 13:06:30 -05:00
GriffinR
6dcbe45051
Merge pull request #669 from GriffinRichards/port-custom-attr
Port changes from Custom Attributes redesign
2025-02-06 10:11:14 -05:00
GriffinR
7173503f59 Fix Qt5 build, misc warnings 2025-02-05 23:35:25 -05:00
GriffinR
05c07e5a00 Keep metatile images on separate rows, fix metatile usage count 2025-02-05 15:01:32 -05:00
GriffinR
2aa2f8dbd4 Fix shortcuts editor crash 2025-02-05 11:07:37 -05:00
GriffinR
fe38e42591 Port changes from Custom Attributes redesign 2025-01-31 10:45:59 -05:00
GriffinR
9bdf396679 Fix some lexical sorting of names with numbers 2025-01-30 12:07:25 -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
fe8f978a6b Fix map symbol editing regression, save new map/layout dialog geometry 2025-01-22 15:02:20 -05:00
GriffinR
cfb6f70580 Fix freeze when creating a new tileset 2025-01-22 14:38:49 -05:00
GriffinR
f4c0cb2d2d Use placeholder text for new map/layout names 2025-01-22 13:24:09 -05:00
GriffinR
90c904ecb9 Make it easier to edit MAPSEC names, Area -> Location 2025-01-22 13:12:22 -05:00
GriffinR
72f37d8983
Merge branch 'master' into new-map-dialog 2024-12-28 01:47:02 -05:00
GriffinR
7a36fcc2ba
Merge pull request #655 from GriffinRichards/fix-transparency
Add setting for how to render fully transparent pixels
2024-12-28 01:34:26 -05:00
GriffinR
3ca1ee1650 Remove config diff noise from hashed containers changing order 2024-12-28 01:22:46 -05:00
GriffinR
8bd71a3860 Merge branch 'master' of https://github.com/huderlem/porymap into new-map-dialog 2024-12-23 15:06:22 -05:00
GriffinR
9efbe53238
Merge pull request #609 from GriffinRichards/commit-version
Include latest commit hash in version info
2024-12-23 14:58:06 -05:00
GriffinR
0d939772bf Add QMessageBox convenience classes 2024-12-22 23:58:59 -05:00
GriffinR
ad0b8d6794 Render metatile/collision views by tab 2024-12-21 17:28:34 -05:00
GriffinR
486d1b7335 Add config settings for rendering transparency 2024-12-19 16:28:53 -05:00
GriffinR
12dba1a8b3 Add Qt version to About, remove changelog 2024-12-18 15:04:22 -05:00
GriffinR
64a9e2cacb Add dividing line for tilesets in Tileset Editor 2024-12-18 14:27:12 -05:00
GriffinR
4f6291a3f6 Support non-Windows builds without QtCharts 2024-12-18 13:33:29 -05:00
GriffinR
8f1e112858 Combine tile image export functions 2024-12-16 16:23:52 -05:00
GriffinR
d9be7d594e Fix Qt5 build 2024-12-16 15:40:36 -05:00
GriffinR
8f16822f07 Merge branch 'master' of https://github.com/huderlem/porymap into new-map-dialog 2024-12-16 14:44:22 -05:00
GriffinR
bf3820745a Add new QValidator classes 2024-12-16 14:34:45 -05:00
GriffinR
bdd64a6c6b Use applicationName() for window titles, clean up some remaining TODO items 2024-12-14 16:22:28 -05:00
GriffinR
52a7cd4f56 Combine minor creation dialogs 2024-12-12 15:46:13 -05:00
GriffinR
6b70abaaf0 Use QFile/QString for C parser files and paths 2024-12-11 23:21:53 -05:00
GriffinR
11dd7306d3 Remove unused parser_util 2024-12-11 23:21:47 -05:00
GriffinR
391f7b1685 Reserve MAP_DYNAMIC, fix some MAPSEC displays not updating, new error messages/handling 2024-12-09 21:43:36 -05:00
GriffinR
435d22c63a Fix layouts list sorting by ID rather than name 2024-12-06 11:02:38 -05:00
GriffinR
9c40b04ad5 Redesign new tileset dialog 2024-12-06 10:39:50 -05:00
GriffinR
b7c34a67e5 Fix AdvanceMap import memory leaks, revert name change 2024-12-03 16:16:54 -05:00
GriffinR
ba4a43d595 Reserve MAP_UNDEFINED 2024-12-03 15:46:25 -05:00
GriffinR
83ef14a242 Fix some problems with layout directory creation 2024-12-03 15:22:37 -05:00
GriffinR
06a263c689 Fix regression to map stitch images from layout split 2024-11-27 02:41:57 -05:00
GriffinR
f1a4b78ca9 Fix map duplication 2024-11-26 20:44:43 -05:00
GriffinR
ff04a41db2 Add map list tool tips / copy actions, simplify MapListModel 2024-11-26 15:19:28 -05:00
GriffinR
b230f21e8d Automatically add new MAPSEC values from New Map dialog 2024-11-23 23:19:49 -05:00
GriffinR
4671321690 Add item to duplicate map/layouts from list 2024-11-23 22:36:37 -05:00
GriffinR
d0101d807e Finish new layout dialog redesign 2024-11-22 14:22:18 -05:00
GriffinR
e7df829843 Group AdvanceMap parsing together, fix its tileset defaults 2024-11-21 14:11:47 -05:00
GriffinR
bd39bcfdd2 Begin new layout dialog redesign 2024-11-21 12:12:43 -05:00
GriffinR
724f42019c Automatically add new map groups 2024-11-19 13:49:00 -05:00
GriffinR
8bb0100540 Separate layout/header features of new map dialog 2024-11-14 14:43:20 -05:00
GriffinR
7d7db3857d Clean up new map dialog redesign 2024-11-12 15:06:14 -05:00
GriffinR
4f8224359e Use collapsible section for header data in new map dialog 2024-11-12 14:34:10 -05:00
GriffinR
205bb48c65 Header tab and new map dialog share UI setup 2024-11-12 14:27:35 -05:00
GriffinR
9e1ef2c741 Import collapsible section 2024-11-12 13:48:18 -05:00
GriffinR
d6a796e3b4 Start new map dialog redesign 2024-11-12 13:46:09 -05:00
GriffinR
9d87ece663 New map popup/prompt to dialog 2024-11-12 13:23:43 -05:00
GriffinR
acaed90d65 Read map.json constants on project open 2024-11-12 13:13:09 -05:00
GriffinR
b7d78b0263 Make Map members private 2024-11-12 12:44:33 -05:00
GriffinR
18308fa9de Stop writing map_groups.h 2024-11-11 18:42:26 -05:00
t
c9695521c7
Merge pull request #515 from garakmon/slam
Separate Layouts and Maps
2024-11-11 11:10:00 -05:00
GriffinR
e278d48380 Fix script API undo/redo for layouts, final TODO items 2024-11-08 15:26:43 -05:00
GriffinR
06ece16b93 Finish support for deleting MAPSEC values 2024-11-08 14:46:27 -05:00
GriffinR
d448765d63 Read/write MAPSEC values using the region map json 2024-11-07 22:49:52 -05:00
GriffinR
727cce5d8b
Merge pull request #633 from GriffinRichards/api-images
Render API images as pixmaps
2024-11-05 00:29:06 -05:00
GriffinR
7d89031273 Resolve warnings and low-hanging TODO items 2024-11-04 21:35:36 -05:00
GriffinR
f90dae0da0 Set up map list tool bar to record setting states 2024-10-31 16:36:16 -04:00
GriffinR
ab8eb7c7e4 Reimplement disabled Delete key features 2024-10-31 14:58:01 -04:00
GriffinR
23e094d850 Update map list delete functionality 2024-10-31 14:30:56 -04:00
GriffinR
b89c1ddc80 Show unsaved changes warning for map list and layout-only edits 2024-10-29 21:51:05 -04:00
GriffinR
785ac958a5 Fix crash when file watcher message triggers 2024-10-29 20:09:01 -04:00
GriffinR
2ce5c3fcc5 Fix crash on tileset save, bugs with map resizing 2024-10-29 16:16:35 -04:00
GriffinR
3bd5ddbf2f Simplify saving the map list tab 2024-10-28 16:02:17 -04:00
GriffinR
7da2375998 Refactor map list buttons 2024-10-28 15:36:47 -04:00
GriffinR
d674856b18 Render API images as pixmaps 2024-10-28 11:42:44 -04:00
GriffinR
40d34b2d5b Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-10-25 14:33:00 -04:00
GriffinR
178dd16cf1
Merge pull request #626 from GriffinRichards/help
Update help buttons, chart help text
2024-10-25 14:29:34 -04:00
GriffinR
958b71afbb Stop leaking scripting overlay 2024-10-21 12:18:46 -04:00
GriffinR
10aa6f6c3f Fix new name regexes, some assumptions about MAPSEC_NONE, memory leak 2024-10-17 15:56:05 -04:00
GriffinR
728355d202 Fix some missing constant usage 2024-10-17 12:12:33 -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
GriffinR
09eaef4dbf Update help buttons, chart help text 2024-10-16 14:23:28 -04:00
GriffinR
70807fba3a Stop leaking tileset metatiles 2024-10-16 11:57:47 -04:00
GriffinR
e431c161e7
Merge pull request #621 from GriffinRichards/file-dialogs
Correctly restore window focus for file dialogs
2024-10-16 10:41:17 -04:00
GriffinR
426faddad7
Merge pull request #619 from GriffinRichards/stitch-preview
Add actual preview to Export Map Stitch Image
2024-10-10 13:40:18 -04:00
GriffinR
f192b745dd Add additional static functions to filedialog 2024-10-10 01:43:35 -04:00
GriffinR
1ed9b1ee10 Correctly restore window focus for file dialogs 2024-10-09 12:35:12 -04:00
GriffinR
931b471cf1
Merge pull request #617 from GriffinRichards/custom-grid
Add map grid settings
2024-10-09 11:10:17 -04:00
GriffinR
a31a014b5d Fix Summary Chart animations stopping prematurely 2024-10-08 01:40:40 -04:00
GriffinR
4dc598455f Improve color slider edit history 2024-10-04 13:53:16 -04:00
GriffinR
bdcfc0467b Fix image exporter reset button 2024-10-04 03:45:47 -04:00
GriffinR
6e79c6c4c3 Add 'All' settings, avoid unnecessary work in a few places 2024-10-03 22:55:12 -04:00
GriffinR
ae6312c131 Add actual preview to Export Map Stitch Image 2024-10-02 02:29:33 -04:00
GriffinR
eefa46a2a2 Fix Qt 5.15 build 2024-10-01 10:19:40 -04:00
GriffinR
932c299935 Refactor palette editor to use new color input widget 2024-10-01 09:03:01 -04:00
GriffinR
44642c347f Add custom dash patterns to grid settings 2024-10-01 01:50:29 -04:00
GriffinR
a277e19334 Add linking buttons to grid settings 2024-09-28 21:43:41 -04:00
GriffinR
274d95eef5 Add color input to grid settings 2024-09-28 18:07:37 -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
2f5f401a37 Construct regex to filter defines beforehand 2024-09-11 15:04:06 -04:00
GriffinR
a0ebae00c6 Fix a bunch of memory leaks on startup->shutdown 2024-09-11 13:16:54 -04:00
GriffinR
11bd41d000
Merge pull request #606 from GriffinRichards/parse-enum
Support for parsing enums
2024-09-08 21:38:10 -04:00
GriffinR
57f74d4b20
Merge pull request #607 from GriffinRichards/triple-layer
Interpret triple-layer metatiles from NUM_TILES_PER_METATILE
2024-09-02 23:15:58 -04:00
GriffinR
f7fc899627
Merge branch 'master' into parse-enum 2024-09-02 20:37:41 -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
1a456bc47b Save config in custom scripts editor, stop accidental 'refreshed' popup 2024-08-30 11:56:35 -04:00
GriffinR
d41d4d53e7 Interpret triple-layer metatiles from NUM_TILES_PER_METATILE 2024-08-29 12:44:50 -04:00
GriffinR
5c9a1d4140 Fix enum comma parsing 2024-08-29 00:05:05 -04:00
GriffinR
b1ad6d83f4 Replace 'prefix' names where we were actually using regex 2024-08-28 16:06:28 -04:00
GriffinR
869d0c7dec Restore display order for unevaluated defines 2024-08-28 15:38:41 -04:00
GriffinR
4b0d30fbc4 Initial enum support 2024-08-28 15:01:21 -04:00
GriffinR
8240cf55ef Exclude charts features for our Windows builds 2024-08-27 21:39:33 -04:00
GriffinR
325757d4ee Clean up in wildmonchart 2024-08-27 19:05:44 -04:00
GriffinR
0e9dacd159 Read MAX_ENCOUNTER_RATE from project 2024-08-27 16:14:02 -04:00
GriffinR
d8d196b79d Connect wild mon chart to editor 2024-08-27 15:30:46 -04:00