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

411 Commits

Author SHA1 Message Date
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
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
367198f98f Sync changes between connection list and map 2024-07-03 11:08:38 -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
6520189352 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-02-22 16:31:16 -05:00
GriffinR
b228c4e76c
Merge pull request #590 from GriffinRichards/update-promoter 
Add update promoter
 2024-02-12 13:27:49 -05:00
GriffinR
13f14757be Smooth out scrolling for graphics views nested in scroll areas 2024-01-28 14:15:45 -05:00
GriffinR
4cb7e8a9aa Fix selectors jumping when zooming 2024-01-26 15:38:03 -05:00
GriffinR
c04a89396c Add update promoter dialog 2024-01-21 12:01:31 -05:00
GriffinR
97b485284e Move version info to porymap.pro 2024-01-21 00:14:40 -05:00
GriffinR
09c2ed6b30 Add check for updates setting 2024-01-20 23:02:43 -05:00
GriffinR
d6dfab1805 Add update promoter network functions 2024-01-20 22:09:42 -05:00
GriffinR
5adb11f374 Release 5.3.0 2024-01-15 17:23:39 -05:00
GriffinR
fa8bb20fe2 Fix splitter limiting window resizing 2024-01-15 01:47:57 -05:00
GriffinR
86d0200441 Add scrolling to border metatiles, splitter for Metatiles tab 2024-01-12 22:11:07 -05:00
garak
0296c22845 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-12 15:57:56 -05:00
garak
b620e3d816 add button to lock group edits 2024-01-12 15:48:51 -05:00
garak
cd5b1f98d2 add toggleable button to hide empty map folders 2024-01-09 21:50:22 -05:00
garak
0f9c5873a2 Merge branch 'master' of https://github.com/huderlem/porymap into slam 2024-01-09 15:28:01 -05:00
GriffinR
bcba146be9 Add zoom sliders to the Tileset Editor 2024-01-07 18:01:59 -05:00
GriffinR
eecdd8c331 Hardcode URL colors (for Windows dark themes) 2024-01-03 15:17:56 -05:00
GriffinR
16f0a1a030 Release 5.2.0 2024-01-02 15:13:23 -05:00
GriffinR
63102eccd6
Merge pull request #569 from GriffinRichards/recent-projects 
Add 'Open Recent Project' menu
 2023-12-31 17:39:43 -05:00
GriffinR
331dc1f5c4 Fix window jostling when tile selection changes size 2023-12-29 23:27:51 -05:00
GriffinR
6fedab9a22 Add 'Open Recent Project' menu 2023-12-28 01:00:12 -05:00
GriffinR
7cbe4333aa Update project files manual page 2023-12-27 01:16:10 -05:00
GriffinR
a2d230666b Add grids to tileset editor 2023-12-20 13:11:57 -05:00
GriffinR
87911bb9fd Add new settings to manual 2023-12-19 00:02:51 -05:00
GriffinR
b74b007186 Add identifiers to the settings window 2023-12-18 21:07:36 -05:00
GriffinR
fc1e192087 Add warp behavior list to settings 2023-12-17 02:03:33 -05:00
GriffinR
60fb1a246e Clean up custom Block layouts 2023-12-16 17:54:06 -05:00
GriffinR
5a3907bf56 Use Block masks to update value limits, parse fieldmap.c 2023-12-16 01:48:13 -05:00
GriffinR
19e5e681e5 Add block layout to config 2023-12-13 00:06:37 -05:00
GriffinR
8164aae151 Custom image setting cleanup, update manual 2023-12-12 15:57:54 -05:00
GriffinR
80148c7176 Add missing tooltip, update changelog 2023-12-11 16:59:54 -05:00
GriffinR
06ff213691 Sturdier pokemon icon search, add icon override settings 2023-12-11 03:08:25 -05:00
GriffinR
d6dacf039e Enable clear button on new line edit settings 2023-12-09 17:47:52 -05:00
GriffinR
571ff8e328 Expose new settings, add tabs to settings editor 2023-12-09 12:52:51 -05:00
GriffinR
4f0e8716f2 Update Collision tab UI 2023-12-08 12:18:21 -05:00
GriffinR
dcba9ececd Update custom scripts editor 2023-11-03 02:40:03 -04:00
GriffinR
6ee76f80d1 Fix project settings editor regression 2023-10-01 02:48:32 -04:00
garak
0ec8f4fee5 add drag-drop reordering for maps in groups 2023-09-28 19:02:10 -04:00
garak
a4fdb0de64 fix new map popup window to allow layout selection 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
2bc51f1c29 move map pixmap item and metatile rendering from Map to Layout 2023-09-28 19:02:10 -04:00
garak
917e61b98a add different tabs for map list views 2023-09-28 19:02:10 -04:00
GriffinR
22fe7f2963 Use spin boxes for border metatile settings if using default size 2023-09-19 14:30:48 -04:00
GriffinR
0c47866e3d Fix some window and scrollbox sizes 2023-09-12 13:51:09 -04:00
GriffinR
a508677b1d Move remaining Porymap config settings to Preferences 2023-09-11 16:54:15 -04:00
GriffinR
30a01b7061 Use UIntSpinBox for metatile attribute settings 2023-09-11 16:32:15 -04:00
GriffinR
603df4defa Add UIntSpinBox class 2023-09-11 16:31:44 -04:00
GriffinR
7a399daaff Clean up project settings editor UI 2023-09-08 15:32:33 -04:00
GriffinR
61cbbbf08a Add path override editor 2023-09-08 12:21:56 -04:00
GriffinR
885695e705 Clean up for new editor windows 2023-09-06 16:41:34 -04:00
GriffinR
40e8824eca Add option to turn custom scripts on/off 2023-09-06 12:58:39 -04:00
GriffinR
d6d27ae8b3 Add Custom Scripts Editor window 2023-09-05 16:45:53 -04:00
GriffinR
143e5cf79b Add button to import default prefabs 2023-08-31 14:23:03 -04:00
GriffinR
871a6ed9b7 Add prompts to project settings editor 2023-08-29 14:43:50 -04:00
GriffinR
9bed66ecfc Write config with project settings editor 2023-08-28 16:48:27 -04:00
GriffinR
4d8f5ef150 Add project settings window 2023-08-23 21:06:14 -04:00
GriffinR
4fbe8bf5ef Add palette editor bit depth to config 2023-02-22 11:21:30 -05:00
garakmon
05181aa64e Release 5.1.1 2023-02-20 19:13:00 -05:00
garakmon
777a6c2e18 auto take changelog in porymap about window 2023-02-20 19:09:42 -05:00
garakmon
5de1bbd44c fix nonexistant font issues 2023-02-05 18:26:35 -05:00
GriffinR
5a8d93a20f Remove empty Tools menu from Region Map Editor 2023-01-22 16:08:56 -05:00
Marcus Huderle
cdd21cbf91 Release 5.1.0 2023-01-22 11:37:52 -06:00
GriffinR
9d82a7af68 Add option to turn off checkerboard fill for new tilesets 2022-11-28 14:58:33 -05:00
Marcus Huderle
5362c996e5 Release 5.0.0 2022-10-30 10:05:55 -05:00
GriffinR
d451aaa8c0 Simplify new map popup internal 2022-10-24 16:54:27 -04:00
Marcus Huderle
0da261961b Fix tileset editor UI squishing 2022-10-22 14:08:41 -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
551a771798 Fix some build warnings from event rewrite 2022-10-18 12:29:07 -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
GriffinR
6b55dc935d Add custom header value type selection 2022-10-16 02:29:44 -04:00
Marcus Huderle
dfb6a15379 Fix event tab sizing behavior 2022-10-15 13:17:35 -05:00
Marcus Huderle
37022c2b38 Adjust layout of events tab 2022-10-15 13:02:28 -05:00
GriffinR
239f3935bf Stop treating map header bools as strings 2022-10-14 18:11:11 -04:00
garak
582405d68b change Event class design in favor of polymorphism 2022-10-13 22:30:07 -04:00
GriffinR
b0e12170fb Add image export for metatileset 2022-10-05 18:53:31 -05:00
GriffinR
eb8b9b0352 Add Cut to Tileset Editor 2022-10-04 17:50:39 -05:00
Marcus Huderle
b92fdaf94e Add documentation for prefabs 2022-09-10 13:08:48 -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
268cc9b30b Add getPorymapVersion 2022-08-31 13:38:07 -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
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
GriffinR
2bdc8024f7 Add reopen on launch setting to UI 2022-07-04 16:22:52 -05:00
GriffinR
441db4274e
Merge branch 'master' into label-copy 2022-06-30 00:41:10 -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
aeb56e579c support ruby in rme 2022-06-29 22:15:21 -04:00
garak
f7a0e02f95 resize region map tilemaps 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
2b152ce64e create edit history for region map tilemap and layout 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
304b00b0f3 Add copy/paste to tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
60d407fe80 Add tool tip / icon for metatile label copy button 2022-02-10 11:14:19 -05:00
GriffinR
d1883720c9 Add metatile label copy button 2022-02-10 09:53:04 -05:00
Marcus Huderle
5a06da96ad Release 4.5.0 2021-12-26 12:40:26 -06:00
Marcus Huderle
e070a5a1b2 Fix Poryscript casing 2021-12-26 11:50:11 -06:00
GriffinR
36dc1c6649 Move map cursor UI and grid to foreground 2021-12-26 11:23:45 -06:00
GriffinR
39cd1d335b Add map view tab to API 2021-12-26 11:23:45 -06: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
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
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
80c5f74368 Fix #355 (map group validation) 2021-02-19 01:30:31 -05:00
BigBahss
3d394bc4bb Add option to open config folder 2021-02-03 16:01:54 -06:00
BigBahss
6335151c39 Add option to open log file 2021-02-03 16:01:54 -06:00
Marcus Huderle
c354142f1b Add ability to export map timelapse GIFs 2021-01-20 19:27:50 -06:00
Marcus Huderle
afa06b48d0 Release 4.4.0 2020-12-20 19:16:47 -06:00
BigBahss
1d29a53237 Merge remote-tracking branch 'origin/master' into script-editing 2020-12-13 00:30:22 -05:00
BigBahss
8be6dc2f74 Adjust the appearance of PreferenceEditor 
(Help text appeared too large on Windows)
 2020-12-13 00:24:03 -05: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
7a4de9f3d9 Add support for finding and opening any event script 2020-12-04 09:29:38 -05:00
BigBahss
789fe7d00c Merge remote-tracking branch 'origin/master' into script-editing 2020-12-01 16:43:53 -05:00
BigBahss
62f73bee04 Populate scripts comboboxes with scripts found in map.json 2020-12-01 16:32:08 -05:00
BigBahss
dbafb99fd4 Add action to open the project root in a text editor 2020-12-01 07:12:32 -05:00
Ashley Coleman
49737d16cc Implement delete for wild encounter table 2020-11-22 16:34:30 -06: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
2fb3bf4e26 Redesign ShortcutsEditor to take an obj list and refactor config to reflect that 2020-11-08 12:03:44 -05:00
BigBahss
88fbf9f28b Add ShortcutsEditor to customize shortcuts for QAction's 2020-11-01 09:16:27 -05:00
Marcus Huderle
8ab5bfcdbd Merge remote-tracking branch 'origin/master' into better-map-zoom 2020-10-23 18:38:05 -05:00
Tyler
de43c64118
Merge branch 'master' into fix-window-size-issue 2020-10-22 19:59:11 -04:00
BigBahss
81ad828a53 Fix palette editor windowTitle 2020-10-22 18:44:22 -05:00
BigBahss
5b24ac1bbe Allow frame_Objects width to resize smaller, cleanup various ui elements 2020-10-20 18:20:53 -04:00
BigBahss
8154b7c654 Allow MainWindow height to resize smaller 2020-10-20 16:23:41 -04:00
BigBahss
f449f370a0 Implement FlowLayout for frame_mapTools 2020-10-20 15:02:06 -04:00
BigBahss
68d4f47dbb Add scrolling to collision tab 2020-10-20 14:41:51 -04:00
BigBahss
f404f8c11f Remove scrollArea surrounding graphicsView_Connections 2020-10-13 12:23:13 -04:00
BigBahss
ef9c4c73c3 Remove scrollArea surrounding graphicsView_Map 2020-10-13 10:14:16 -04:00
BigBahss
db20d01f3c Focus map zoom on currently hovered metatile 2020-10-11 12:07:11 -04: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
e430abe724 Add some useful shortcuts 2020-09-07 14:06:07 -04:00
BigBahss
2fd3df9734 Remove straight paths checkbox and refactor 2020-09-07 13:12:15 -04:00
BigBahss
5f5087df05 Fix checkBox_straightPaths styling 2020-09-07 13:12:15 -04:00
BigBahss
5e09d7b965 Create ui checkbox for enabling straight paths 2020-09-07 13:12:15 -04:00
BigBahss
cfbcb8b623 Add 'Show Location Name' to newmappopup 2020-09-07 12:06:41 -04:00
garakmon
fb1eec1755 begin refactoring undo history 2020-08-26 20:03:47 -04:00
Marcus Huderle
acc6da4c58 Release 4.3.1 2020-07-17 16:55:31 -05:00
Marcus Huderle
b31b2c2fc7 Release 4.3.0 2020-06-27 17:28:36 -05:00
ultima-soul
4cc3d60dc4 Revert unecessary changes and hide Layer Type for Triple Metatile Layers. 2020-06-26 16:22:15 -05:00
ultima-soul
8ceb783056 Remove checkbox for enabling triple metatile layers. 2020-06-26 16:22:15 -05:00
ultima-soul
debb1c66ac Implement proper triple metatile layer support. 2020-06-26 16:22:15 -05:00
Marcus Huderle
a9bd7b884d Release 4.2.0 2020-06-06 11:57:53 -05:00
Marcus Huderle
bc51fcf0be Release 4.1.0 2020-05-18 18:04:05 -05:00
Marcus Huderle
c7495c24a3 Fix new map popup layout 2020-05-18 17:25:53 -05:00
garakmon
9f5b13c287 use a more descriptive warning message for the new map dimensions 2020-05-18 17:25:53 -05:00
garakmon
482d3cd8fb fix map dimension checks in new map window 2020-05-18 17:25:53 -05:00
garakmon
37c849f9b5 allow current widget to dictate size of stacked widget for metatile/collision and events pages 2020-05-08 11:35:14 -05:00
Marcus Huderle
37ab54019b Release 4.0.0 2020-04-28 20:07:55 -05:00
Marcus Huderle
438a36f29a Remove spacing between top tab bar and main contain frames 2020-04-28 19:09:42 -05:00
garak
fa42beac1d update ui so that map and events tabs share widgets 
- use a programmatically created QTabBar to switch between pages of stacked widget
- use stacked widget to display selected objects and metatiles frames
- remove unique map events tab

this gives access to the toolbuttons while editing events (not functional yet)
 2020-04-26 16:17:51 -04:00
garakmon
b849ace6e2 fix mainwindow.ui action tag 2020-04-21 16:22:09 -04:00
garak
03082e5920
Merge branch 'master' into closeproject 2020-04-20 22:05:28 -04:00
garakmon
401d2e4884 let user change some config settings 
- use encounter json
    - use poryscript
    - monitor files
 2020-04-20 21:54:20 -04:00
Marcus Huderle
bb6dbedabf Add ability to export map stitch images. 2020-04-20 20:29:07 -05:00
garakmon
6026266afd add File>Reload Project 2020-04-20 14:07:06 -04:00
GriffinR
9924a36950 Set floor minimum 2020-03-24 00:33:10 -04:00
GriffinR
bf72ecede9 Parse remaining pokefirered metatile attributes, allow editing/saving them 2020-03-16 16:31:08 -04:00
GriffinR
c0a512803e Allow editing border dimensions 2020-03-14 18:06:35 -04:00
GriffinR
3eca227d07 Basic pokefirered empty layout, floor number, version selection support 2020-03-11 02:06:13 -04:00
Marcus Huderle
c058794597 Release 3.0.1 2020-03-04 11:56:09 -06:00
Marcus Huderle
4d21548a7f Release 3.0.0 2020-02-12 18:30:50 -06:00
Marcus Huderle
f2844c2ec0 Update grid tooltip and update object event filepaths 2020-02-12 18:13:48 -06:00
Marcus Huderle
b9ec239655 Release 2.0.0 2019-10-16 20:43:09 -05:00
garak
376cfbf9c3 add light and dark themes 2019-09-21 12:27:05 -05:00
garak
f3928d2c6d add tall grass icon 2019-09-09 18:26:54 -04:00
garak
5a62df9f55 add json saving to wild encounter editor 2019-09-09 18:26:54 -04:00
garak
3f9ad3afbb extend wild encounter tab for all fields (dynamic) 2019-09-09 18:26:54 -04:00
garak
0ad71286b1 begin work on wild pokemon editor 2019-09-09 18:26:54 -04:00
garak
22fe92840f
Merge pull request #108 from Phlosioneer/metatile-labels 
Add a way to name metatiles, for use in c code
 2019-09-08 20:15:00 -04:00
garak
9800abfdb2 make all ui names in mainwindow.ui unique 2019-08-19 16:52:39 -05:00
garak
16d25796bf use the custom combobox for all porymap comboboxes 2019-08-19 16:52:39 -05:00
garak
5470ade7bb improve combobox speed and autocompletion 2019-08-06 21:50:03 -04:00
garak
8f2e47e937 fix preview scene memory leak, fix borders 2019-05-23 16:43:07 -05:00
garak
f750c56e29 create map image export window 2019-05-23 16:43:07 -05:00
Marcus Huderle
ef0b79d580 1.2.2 Release 2019-05-16 17:05:27 -05:00
garak
a214b66353 use more appropriate default elevations for new events, hide heal spot z 2019-05-01 19:30:19 -05:00
garak
875320ae26 add entries editing tab to rme 2019-04-13 16:24:12 -05:00
garak
d094dced1f fix region map editor ui 2019-04-07 18:33:06 -05:00
garak
2ee3731ed8
Merge branch 'master' into rme 2019-04-06 10:20:35 -04:00
Phlosioneer
01c6d09bc2 Add a way to name metatiles, for use in c code 
Metatiles can be given a name. The name becomes a constant in
includes/contstants/metatile_labels.h.

The plan is to be able to reference metatiles in code using a macro
like `METATILE(Building, TV_ON, Primary)`, which will evaluate to the
value 0x003, or `METATILE(BrendansMaysHouse, MOVING_BOX_OPEN, Secondary)`,
which will evaluate to the value 0x270.
 2019-04-04 01:44:31 -04:00
garak
a475823fee further refine region map editor 2019-03-31 14:57:24 -04:00
Karathan
45be05426c add shortcut for adding a tileset 2019-03-24 15:55:40 -05:00
Karathan
092eb2b9aa add ellipsis to new map and new tileset 2019-03-24 15:55:40 -05:00
Karathan
af96054baf Save all tilesets 
because the loader wants to have them all
 2019-03-24 15:55:40 -05:00