garak
d1bdbc2741
create temporary timing function
2023-01-17 13:15:07 -05:00
GriffinR
c233e3cd59
Fix tileset change not updating border
2023-01-16 20:23:58 -05:00
t
debf9d99f0
Merge pull request #505 from GriffinRichards/connection-warp
...
Allow navigating to connected maps from any tab
2023-01-16 15:46:49 -05:00
t
d29506d755
Merge pull request #495 from GriffinRichards/keep-import-path
...
Preserve import/export path in file dialogs
2023-01-16 14:19:31 -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
ab6d035ad8
Merge pull request #485 from GriffinRichards/metatile-attr
...
Allow reorganization of metatile attributes
2023-01-15 18:55:42 -05:00
GriffinR
d9324368a2
Fix Region Map Editor being opened by Shortcuts Editor
2023-01-15 00:26:40 -05:00
GriffinR
5af662a49e
Merge pull request #496 from GriffinRichards/config-checkerboard
...
Add option to turn off the checkerboard fill for new tilesets
2022-12-15 17:12:22 -05:00
GriffinR
5ca3906f55
Merge branch 'master' into keep-import-path
2022-12-14 16:10:23 -05:00
GriffinR
b60e8cd732
Merge branch 'master' into border-hover
2022-12-03 08:51:58 -05:00
GriffinR
4065572ede
Merge branch 'master' into keep-import-path
2022-12-03 08:51:37 -05:00
GriffinR
32903e0d18
Set default New Map settings when switching projects
2022-12-03 08:49:08 -05:00
GriffinR
8594c2ce36
Display message when hovering on border metatiles
2022-11-28 23:08:57 -05:00
GriffinR
9d82a7af68
Add option to turn off checkerboard fill for new tilesets
2022-11-28 14:58:33 -05:00
GriffinR
f507b3e8a3
Preserve import/export path in file dialogs
2022-11-27 21:24:55 -05:00
GriffinR
3a4ce68232
Remove old event label functions
2022-11-27 13:15:52 -05:00
GriffinR
d475286249
Merge branch 'master' into metatile-attr
2022-11-18 18:13:21 -05:00
GriffinR
97b8bb96cb
Remove unused function
2022-11-07 01:02:33 -05:00
GriffinR
3770efd6c5
Add setScale to the API
2022-11-03 13:19:57 -04:00
GriffinR
eb80ee86f6
Merge branch 'master' into metatile-attr
2022-10-29 11:43:00 -04:00
GriffinR
f0c793424c
Allow number values in the Metatile Behavior field
2022-10-29 11:41:09 -04:00
GriffinR
37b5656376
Fix some crashes on project close
2022-10-28 12:46:52 -04:00
GriffinR
d2fa68ba18
Allow number values for behavior in editor, add mask warning
2022-10-27 12:58:12 -04:00
GriffinR
577dc2fce2
Simplify metatile attribute layouts
2022-10-26 21:30:25 -04:00
GriffinR
9cd8777246
Remove last base game version difference
2022-10-26 04:01:01 -04:00
GriffinR
1283f5c19d
Use custom attribute masks in API and Tileset Editor
2022-10-26 03:28:30 -04:00
GriffinR
1641ac00b0
Combine attribute shift/mask data
2022-10-26 00:39:46 -04:00
GriffinR
fa2b4d3edb
Allow custom metatile attribute layouts
2022-10-25 22:35:26 -04:00
GriffinR
c50b8d0668
Restore last settings for new map popup
2022-10-24 16:54:34 -04:00
GriffinR
d451aaa8c0
Simplify new map popup internal
2022-10-24 16:54:27 -04:00
GriffinR
8fbcee7f21
Insert new tilesets in sorted order
2022-10-24 09:33:51 -04:00
GriffinR
09ce5b5913
Drop path_ from path config options
2022-10-24 08:03:51 -04:00
GriffinR
5ba3720405
is_secondary to bool
2022-10-24 00:02:27 -04:00
GriffinR
f8a92c071c
Add default tileset config options
2022-10-23 19:43:16 -04:00
GriffinR
35da77ca94
Treat tileset lists separately
2022-10-23 18:59:59 -04:00
Marcus Huderle
1697f55b6c
Merge pull request #480 from GriffinRichards/combos
...
Display values for missing items in combo boxes
2022-10-22 13:08:38 -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
9277a2313f
Display values for missing items in combo boxes
2022-10-19 14:28:45 -04:00
GriffinR
4c3a508534
Better type conversion custom event attributes
2022-10-18 19:52:35 -04:00
GriffinR
5f3efdc7a4
Rewrite heal location data writing
2022-10-18 17:14:46 -05:00
GriffinR
43d0dc1e7b
Rewrite heal location data reading
2022-10-18 17:14:46 -05:00
GriffinR
8e6585bbb2
Treat warp IDs as strings, stop deleting invalid warps
2022-10-18 13:44:45 -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
Marcus Huderle
f5c050828e
Merge pull request #447 from garakmon/and-i-oop--
...
Internal Event Rewrite
2022-10-17 17:41:00 -07:00
Marcus Huderle
3de8e88b8e
Add optional forceRedraw argument to palette API functions
2022-10-17 19:03:11 -05:00
garak
265340eed0
add local script labels to event combos for drop down
2022-10-16 18:47:35 -04:00
GriffinR
a0eff32f36
Remove more internal type conversions
2022-10-16 02:49:42 -04:00
GriffinR
67945cb297
Preserve custom header arrays and objects
2022-10-16 02:30:13 -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
a2795d089b
get/setAngle -> get/setRotation
2022-10-15 11:22:55 -07:00
Marcus Huderle
ad01ba0feb
Fix Qt6 build and overloaded addPath ordering
2022-10-15 11:22:55 -07:00
GriffinR
d88d6a828e
Scale to qreal, draw path border over fill
2022-10-15 11:22:55 -07:00
GriffinR
82dcecf8f2
Add addPath overload
2022-10-15 11:22:55 -07:00
GriffinR
47f6723bd2
Clean up rotation functions
2022-10-15 11:22:55 -07:00
GriffinR
ad5eea2293
Add rotation and scale to overlay API
2022-10-15 11:22:55 -07:00
GriffinR
67bec313a5
Add rounding to addRect, add fill color to addPath
2022-10-15 11:22:55 -07:00
GriffinR
77d04bb6de
Combine addRect and addRectFilled, add color checking
2022-10-15 11:22:55 -07:00
GriffinR
385c17fd23
Add path drawing to the API
2022-10-15 11:22:55 -07:00
GriffinR
ec626a59a7
Display custom header values according to type
2022-10-15 11:40:04 -04:00
GriffinR
6ffcb58e5e
Convert JSON values by type, except events
2022-10-15 03:22:13 -04:00
GriffinR
239f3935bf
Stop treating map header bools as strings
2022-10-14 18:11:11 -04:00
GriffinR
614242f1fe
Update project files page
2022-10-14 12:42:07 -04:00
garak
00504817db
add methods for updating frame ui
2022-10-13 22:30:07 -04:00
garak
af9c0192e0
hide heal location z spinner, and label every event type in frames
2022-10-13 22:30:07 -04:00
garak
cb6d1a4220
indicate map edited when event data is modified
2022-10-13 22:30:07 -04:00
garak
8ac556c0de
properly hide configurable event ui
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
2b78330660
Improve API text rendering speed
2022-10-13 09:55:48 -07:00
GriffinR
fbe5427c0b
Prevent some script edit feedback loops
2022-10-11 22:50:08 -04:00
GriffinR
c953a15523
Move error logging out of gameStringToBool
2022-10-10 11:38:17 -05:00
GriffinR
d7894f8399
Ignore unused map header fields for pokeruby
2022-10-10 11:38:17 -05:00
GriffinR
c58162be96
Support C tileset data without initializers
2022-10-10 11:38:17 -05:00
GriffinR
487cc8d367
Add config options to remove unnecessary tileset fields
2022-10-10 11:38:17 -05:00
GriffinR
374da65b7f
Clean up tileset C parsing
2022-10-10 11:38:17 -05:00
GriffinR
9b4c55106b
Read tileset graphics paths from C
2022-10-10 11:38:17 -05:00
GriffinR
efd49cd544
Read tileset headers from C data
2022-10-10 11:38:17 -05:00
GriffinR
ebdf22145d
Generalize C struct parsing
2022-10-10 11:38:17 -05:00
Marcus Huderle
47b6669feb
Add clipping capabilities to overlay scripting api
2022-10-10 11:22:38 -05:00
Marcus Huderle
fc2f91023f
Move default prefab prompt to when the user selects the prefab tab, rather than app startup
2022-10-09 14:36:12 -05:00
GriffinR
564d24c4f3
Simplify TilesetEditorMetatileSelector::buildImage
2022-10-05 18:53:31 -05:00
GriffinR
b0e12170fb
Add image export for metatileset
2022-10-05 18:53:31 -05:00
GriffinR
3181523799
Add convenience functions for triple layer metatiles
2022-10-04 17:50:39 -05:00
GriffinR
eb8b9b0352
Add Cut to Tileset Editor
2022-10-04 17:50:39 -05:00
GriffinR
1b743f9625
Replace offset in createImage with x/y offset
2022-10-01 17:43:50 -05:00
GriffinR
4b1498d059
Add name list functions to API
2022-10-01 08:41:14 -05:00
GriffinR
c2e4fcde8f
errorMap to QHash
2022-09-27 18:22:41 -05:00
GriffinR
d353164244
Suppress errors for unneeded defines
2022-09-27 18:22:41 -05:00
Marcus Huderle
ddf0fe4e11
Display 'prefab selected' tooltip when selecting a prefab for painting
2022-09-27 18:22:08 -05:00
GriffinR
fa76e22508
Add missing project file path usage
2022-09-27 18:22:54 -04:00
Marcus Huderle
54be7a18a9
Merge remote-tracking branch 'tustin/path-in-config'
...
# Conflicts:
# docsrc/manual/settings-and-options.rst
# include/config.h
# src/config.cpp
# src/scriptapi/apimap.cpp
# src/scriptapi/scripting.cpp
2022-09-25 10:02:24 -05:00
Marcus Huderle
c81829cd3f
Merge remote-tracking branch 'griffin/api-redesign'
2022-09-24 15:48:42 -05:00
Marcus Huderle
07f1dd7a62
Merge branch 'master' into new-map-config
2022-09-24 15:40:08 -05:00
Marcus Huderle
71a34c6b22
Add prompt to import default prefabs for each game version
2022-09-24 15:28:31 -05:00
Marcus Huderle
a081af85c4
Fix bug where dimensions of current selection would be incorrect after a prefab was selected
2022-09-24 11:16:03 -05:00
GriffinR
126d264982
Merge branch 'master' into api-redesign
2022-09-12 13:01:22 -04:00
GriffinR
856624addf
Remove region map dimensions from config
2022-09-12 11:33:51 -04:00
GriffinR
089e214d2e
Add new map config options
2022-09-12 11:31:35 -04:00
tustin2121
4c68c3cd77
Merge branch 'master' into path-in-config
2022-09-11 13:56:09 -04: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
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
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
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
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
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
778cc2ba47
Fix API crashes on bad palette ids / tile numbers
2022-08-26 18:55:19 -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
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
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
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
0b0c588c64
Read object event gfx info by parsing its C file, rather than relying on regex
2022-07-03 11:28:24 -05: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
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
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
096a66067d
Automatically disable encounters if JSON is missing
2022-06-28 13:20:02 -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
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
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
GriffinR
ddc0f01460
Stop repeated parsing of src/data/object_events
2022-01-29 12:26:39 -06:00
GriffinR
366fb5c8a8
Stop repeated parsing of event_objects.h and songs.h
2022-01-29 12:26:39 -06:00
GriffinR
2f6de2a285
Fix selected collision space not updating during paint
2022-01-14 14:01:10 -06:00
GriffinR
1abdb301c1
Fix 'getBlock' functions use for tiles, add getTilePixels to API
2022-01-05 11:07:27 -06:00
GriffinR
b0dcadfd11
Fix checkboxes not receiving signals from script
2022-01-01 16:39:32 -06:00
GriffinR
690e19e05a
Add header API prototypes
2022-01-01 16:39:32 -06:00
GriffinR
fd88184b47
Add opacity to scripting overlay
2022-01-01 16:39:32 -06:00
GriffinR
de0a5b526b
Don't change frame for inanimate objects
2021-12-27 16:56:31 -06:00
GriffinR
5f79f15554
Add onBlockHoverChanged and onBlockHoverCleared
2021-12-26 11:23:45 -06:00
GriffinR
0944f9888c
Remove addTilesImage, add overloaded addTileImage, add transparency to addMetatileImage
2021-12-26 11:23:45 -06:00
GriffinR
f4ba4091ad
Change API game version to string
2021-12-26 11:23:45 -06:00
GriffinR
574151aebb
Clean up API changes
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
39cd1d335b
Add map view tab to API
2021-12-26 11:23:45 -06:00
GriffinR
b39906c03f
Add onMapShifted to API
2021-12-26 11:23:45 -06:00
GriffinR
8ed891d501
Add option to bypass the API image cache
2021-12-26 11:23:45 -06:00
GriffinR
fee9ffcd44
Add main tab to API
2021-12-26 11:23:45 -06:00
GriffinR
8f62268d00
Trigger onBlockChanged for blocks changed by undo/redo
2021-12-26 11:23:45 -06:00
GriffinR
a6395eefbb
Add overlay x/y, split singular/plural overlay functions
2021-12-26 11:23:45 -06:00
GriffinR
206a1d12b3
Add onMapResized to scripting API callbacks
2021-12-26 11:23:45 -06:00
GriffinR
b16c971f00
Add some config settings to scripting API
2021-12-26 11:23:45 -06:00
GriffinR
03949d45a4
Add paletteId to createImage
2021-12-26 11:23:45 -06:00
GriffinR
eca84beae0
Add basic image cache to scripting API
2021-12-26 11:23:45 -06:00
GriffinR
1adc489bc0
Add transparency to addTileImage
2021-12-26 11:23:45 -06:00
GriffinR
ac988968b3
Add warn and error to script API
2021-12-26 11:23:45 -06:00
GriffinR
6c1e5b516d
Add getMaxTilesetMetatiles to API
2021-12-26 11:23:45 -06:00
GriffinR
b5bdac8d36
Add tile/metatile to image functions to API, more tile->tileId/metatileId
2021-12-26 11:23:45 -06:00
GriffinR
6a5e4fe247
Split createImage from addImage
2021-12-26 11:23:45 -06:00
GriffinR
83a7ccac8b
Add getNumTilesetMetatiles, getNumTilesInMetatile, and isPrimary/SecondaryTileset to API
2021-12-26 11:23:45 -06:00
GriffinR
6bae415fc1
Add onTilesetUpdated to scripting callbacks
2021-12-26 11:23:45 -06:00
