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

819 commits

Author SHA1 Message Date
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
Marcus Huderle
4eeff2ed21 Set default prefabs config filepath 2022-09-10 08:54:16 -05:00
Marcus Huderle
300fde4b86 Add confirmation dialog for prefab deletion 2022-09-09 20:53:07 -05:00
Marcus Huderle
7957bbf7e7 Save prefabs file whenever one is added or deleted 2022-09-09 20:48:08 -05:00
Marcus Huderle
32cba33326 Properly filter available prefabs based on current map's tilesets 2022-09-09 20:09:28 -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
GriffinR
60a665642f Drop useless object freezes 2022-09-06 12:22:22 -04: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
6757d8afdb Standardize API file names 2022-09-05 12:17:27 -04:00
GriffinR
bd5446a40b Move script utility functions to own object 2022-09-05 12:13:03 -04:00
GriffinR
31b22bfcc1 Add constants object to API 2022-09-05 01:52:12 -04:00
GriffinR
a3dadadd5b Reorganize overlay functions under MapView 2022-09-04 22:36:35 -04:00
GriffinR
b25dbb849e Reorganize API files 2022-09-04 20:35:18 -04:00
Marcus Huderle
6f68e7e9de
Merge pull request #456 from GriffinRichards/api-scale 
Add scale to API's createImage, add getPorymapVersion
 2022-09-03 12:52:27 -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
Marcus Huderle
cd697df23d
Merge pull request #452 from GriffinRichards/rewrite-loadmetatiles 
Clean up loadTilesetMetatiles
 2022-09-03 11:33:57 -05:00
GriffinR
e9ac799ed2
Merge branch 'master' into handle-collision 2022-09-03 12:09:14 -04:00
Marcus Huderle
41dfa13de9
Merge pull request #445 from GriffinRichards/api-windows 
Add message boxes and user input windows to API
 2022-09-03 11:05:08 -05:00
tustin2121
d97ed4b64f Removing optional 
- C++11 compliance: there's no optional, so use invalid enum value instead.
 2022-09-01 13:29:05 -04:00
tustin2121
09a590e01a Fixing integration failure 
- Apparently Qt 5.15 operations are not allowed.
 2022-09-01 13:03:11 -04:00
tustin2121
3d9cd2ad0d Moving paths to project config 
- Replaced all instances of hardcoded paths with requesting a path from the new project config file properties for "path/".
- As a result, all default paths hardcoded into porymap are now in one place.
- When reading the config file, it now trims out white space around the key and value.
 2022-09-01 12:14:47 -04:00
tustin2121
8e83daac84 Split project config 
- Project config is now split into project and user config.
- Backwards compatibility with the old project config included, porting old project items over to the new user config.
 2022-09-01 00:57:31 -04:00
GriffinR
268cc9b30b Add getPorymapVersion 2022-08-31 13:38:07 -04:00
GriffinR
af2f1b6f7d Replace xflip/yflip in createImage with hScale/vScale 2022-08-31 11:00:17 -04:00
GriffinR
be4a5e8528 Add onBorderVisibilityToggled callback 2022-08-30 12:53:33 -04:00
GriffinR
3e7bfe126a Add edit history for border edits via script 2022-08-29 20:20:09 -04:00
GriffinR
46b4b51302 Handle negative coordinates in Map::setBlock 2022-08-29 13:14:06 -04:00
GriffinR
21ed9bc140 Add onBorderMetatileChanged, onBorderResized, implement some basic border API 2022-08-29 12:57:20 -04:00
GriffinR
8f90ca64b4 Add basic border functions to API 2022-08-28 21:45:57 -04:00
GriffinR
778257ccd9 Add get/setMetatileAttributes 2022-08-26 19:37:07 -04:00
GriffinR
aad1266e91 Tile properties to bitfield 2022-08-26 19:30:40 -04:00
GriffinR
fd4ba874d2 Fix unused layer rendering for METATILE_LAYER_MIDDLE_TOP 2022-08-26 19:29:48 -04:00
GriffinR
d22aab9b10 Fix setOverlayOpacity setting the opacity of the cursor rect and map grid 2022-08-26 18:55:41 -04:00
GriffinR
778cc2ba47 Fix API crashes on bad palette ids / tile numbers 2022-08-26 18:55:19 -04:00
GriffinR
b8636548dc Move function call outside loop 2022-08-20 16:08:53 -04:00
GriffinR
774c60cc88 Clean up loadTilesetMetatiles 2022-08-20 12:14:11 -04:00
GriffinR
4feb913fe8 Add setBlock overload, handle collision values of 2 or 3 2022-08-03 15:14:25 -04:00
GriffinR
c8b28be0b4 Add message boxes and user input windows to API 2022-07-14 16:47:08 -04:00
GriffinR
c05e03a576
Merge branch 'master' into event-paste 2022-07-11 22:45:38 -04:00
garak
26319cef9f reselect old metatile after tileset save 2022-07-11 22:06:17 -04:00
garak
0e3b07201a document tileset and palette editors 2022-07-11 22:06:17 -04:00
garak
ca0229f444 fix 15 bit depth hex value update 2022-07-11 22:06:17 -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
ab6aa01973 use zoom_box_dimensions constant for color picker preview window 2022-07-11 22:06:17 -04:00
garak
1d596023c6 remove palette editor frame shadows 2022-07-11 22:06:17 -04:00
garak
7f24e5c9ee fix spinbox signal ambiguity 2022-07-11 22:06:17 -04:00
garak
635f1325a2 cleanup palette editor code 2022-07-11 22:06:17 -04:00
garak
725c601a06 fix slider rounding 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
22a42eaac1 Select newly-pasted events 2022-07-05 14:50:17 -04:00
GriffinR
d9b37ecb0b Prevent paste exceeding object limit, warn when copying healspots 2022-07-05 14:38:23 -04:00
GriffinR
2bdc8024f7 Add reopen on launch setting to UI 2022-07-04 16:22:52 -05:00
GriffinR
a407fa9e17 Add reopen on launch config option 2022-07-04 16:22:52 -05:00
GriffinR
4a41858e5b Condense config bool code 2022-07-04 16:22:52 -05:00
Marcus Huderle
02b0bc94c5 Make obj event gfx parsing backwards compatible 2022-07-03 11:28:24 -05:00
Marcus Huderle
0b0c588c64 Read object event gfx info by parsing its C file, rather than relying on regex 2022-07-03 11:28:24 -05:00
Marcus Huderle
ed30115d2e
Merge pull request #413 from GriffinRichards/label-copy 
Add metatile label copy button
 2022-07-03 10:46:50 -05:00
GriffinR
3a2d2ef3c2 Add sanity checks to setMetatileLayerOrder 2022-07-03 07:57:09 -05:00
GriffinR
44bbef6105 Render unused metatile layer as it appears in-game 2022-07-03 07:57:09 -05:00
GriffinR
87b43080ba Fix auto-merge 2022-06-30 00:47:31 -04:00
GriffinR
441db4274e
Merge branch 'master' into label-copy 2022-06-30 00:41:10 -04:00
garak
5f3653e7b0 remove unused city map code 2022-06-29 22:15:21 -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
c76f6a8049 code cleanup: finish rme update core 2022-06-29 22:15:21 -04:00
garak
aeb56e579c support ruby in rme 2022-06-29 22:15:21 -04:00
garak
80909734c2 fix build for Qt5 2022-06-29 22:15:21 -04:00
garak
f7a0e02f95 resize region map tilemaps 2022-06-29 22:15:21 -04:00
garak
cff77ad58e update swap section feature for rme 2022-06-29 22:15:21 -04:00
garak
4334e5b2e9 save / load from the config 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
fa01768962 add history for region map layout size and mapsec entry edits 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
43ebeb1662 region maps: save layouts, save tilemaps 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
c1e3415417 Fix memory leak 2022-06-29 19:13:42 -04:00
GriffinR
73eabc92ca Prevent duplicate metatile pastes in the tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
304b00b0f3 Add copy/paste to tileset editor 2022-06-29 19:13:42 -04:00
GriffinR
553da9a115 Fix missing music when importing from Advance Map 2022-06-28 13:22:34 -04:00
GriffinR
096a66067d Automatically disable encounters if JSON is missing 2022-06-28 13:20:02 -04:00
GriffinR
b20df82358 Assume objects with no type field are not clones 2022-06-24 23:47:43 -04:00
GriffinR
fc11e3d60b Add newline after appending to metatiles.inc 2022-04-22 16:18:01 -04:00
GriffinR
d1883720c9 Add metatile label copy button 2022-02-10 09:53:04 -05:00
GriffinR
af0abaa38d Add getIndexOffset, change expected event fields to QSet 2022-02-09 18:31:55 -06:00
GriffinR
b91914310e Allow warping by double-clicking clone objects 2022-02-09 18:31:55 -06: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
d531c9407c Separate byte reads for metatile tiles 2022-02-08 16:26:19 -06:00
GriffinR
f92950c46d Move tile value masks to tile.cpp 2022-02-08 16:26:19 -06:00
GriffinR
cf973710c8 Preserve unused metatile attributes 2022-02-08 16:26:19 -06:00
garak
cca762ba94 do nothing with extra encounter groups 
(ie. remove unnecessary error checking code that broke sometimes for no apparent reason)
 2022-02-08 16:43:10 -05:00