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

385 commits

Author SHA1 Message Date
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
374da65b7f Clean up tileset C parsing 2022-10-10 11:38:17 -05:00
GriffinR
efd49cd544 Read tileset headers from C data 2022-10-10 11:38:17 -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
c27ea49fcd Raise supplemental windows when reactivated 2022-10-05 11:55:43 -04:00
GriffinR
3181523799 Add convenience functions for triple layer metatiles 2022-10-04 17:50:39 -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
GriffinR
126d264982
Merge branch 'master' into api-redesign 2022-09-12 13:01:22 -04:00
tustin2121
4c68c3cd77
Merge branch 'master' into path-in-config 2022-09-11 13:56:09 -04:00
Marcus Huderle
32cba33326 Properly filter available prefabs based on current map's tilesets 2022-09-09 20:09:28 -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
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
a5136849b8
Merge pull request #455 from GriffinRichards/api-border 
Add map border to the scripting API
 2022-09-03 12:48:35 -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
21ed9bc140 Add onBorderMetatileChanged, onBorderResized, implement some basic border API 2022-08-29 12:57:20 -04:00
GriffinR
c05e03a576
Merge branch 'master' into event-paste 2022-07-11 22:45:38 -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
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
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
096a66067d Automatically disable encounters if JSON is missing 2022-06-28 13:20:02 -04: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
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
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
7d5b92c349 Add missing signal blocker 2022-01-05 10:53:53 -06:00
GriffinR
b0dcadfd11 Fix checkboxes not receiving signals from script 2022-01-01 16:39:32 -06:00
GriffinR
6be4f2c946 Fix timing of onTabChanged callbacks 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
fee9ffcd44 Add main tab to API 2021-12-26 11:23:45 -06:00
GriffinR
d00cba3382 Call onMapResized for script changes to map size 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
6bae415fc1 Add onTilesetUpdated to scripting callbacks 2021-12-26 11:23:45 -06:00
GriffinR
af4c99537f Add layering to scripting overlay 2021-12-26 11:23:45 -06:00
GriffinR
6613318900 Disambiguate tile field names to tileId or metatileId 2021-12-26 11:23:45 -06:00
GriffinR
7368f443f0 Add config options for showing border/grid 2021-11-08 13:11:16 -05:00
garak
f64b03d684
Merge pull request #306 from ultima-soul/import_amap_map 
Add Import Map from Advance Map 1.92 feature.
 2021-11-08 13:10:44 -05:00
garak
795336f42c fix potential segfault on moveEvent 2021-11-05 15:39:19 -04:00
garak
7bf07e72c2 better unsaved changes code, only block whitespace in combos 2021-09-08 17:39:38 -04:00
garak
0b63c438dd mark unsaved changes to map for heaeder and event edits 
closes #305
closes #337
closes #347
 2021-09-08 17:39:38 -04:00
garak
735a095ced fix pasted event id issue 2021-09-07 13:16:54 -05:00
garak
056b2164a8 draw event frame for pasted events 2021-09-07 13:16:54 -05: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
353a0b017f silence bad macOS warning 2021-07-07 18:11:35 -05:00
Marcus Huderle
28eebbed0a Fix Move tool rendering artifacts by enabling full viewport update during the Move tool 2021-07-07 18:11:35 -05:00
Marcus Huderle
6f394ce39c Code fixes for Qt 6 2021-07-07 18:11:35 -05:00
garak
39648eed41 add copy paste to edit menu 2021-05-03 15:48:21 -04:00
garak
47887aca4d add edit command for event pastes 2021-05-03 15:48:21 -04:00
garak
296d697df0 add copy paste to some aspects of porymap 
- can copy currently selected metatiles
  - can copy currently selected events
  - can copy an image of the current map
  - what is copied depends on the currently focused widget
  - copied objects can be pasted into other instances of porymap
  - copied images live on in the clipboard, cannot be pasted into porymap

TODO:
  - shortcut in Edit menu
  - other things can be copied?
 2021-05-03 15:48:21 -04:00
BigBahss
61ffcc3259 Merge branch 'master' into script-editing 2021-04-16 07:28:09 -04:00
BigBahss
a9c7691a2e Rename DraggablePixmapItem::move() overload as moveTo to avoid confusion 2021-03-24 19:11:49 -04:00
BigBahss
5f292ea3cc Place new events in the center of the map 2021-03-24 19:11:49 -04:00
BigBahss
a4fc2bcb30 Fix crash when creating new map 2021-02-21 08:44:41 -06:00
BigBahss
3bcdb1d728 Fix memory leak when creating new tileset 2021-02-18 15:02:25 -05:00
Marcus Huderle
c351f069ff Merge remote-tracking branch 'origin/master' into metatile-leaks 2021-02-17 16:56:15 -06:00
BigBahss
9a9143500f Convert remaing pointers in Project to values 2021-02-17 16:34:46 -06:00
BigBahss
820b514f26 Change many pointer members in Project to values 2021-02-17 16:34:46 -06:00
BigBahss
cc7a5f5819 Fix memory leaks in Tileset 2021-02-16 21:45:54 -05:00
BigBahss
107ef528e2 Fix map resizing (broke from Blockdata refactoring) 2021-02-16 16:51:00 -06:00
BigBahss
f09e28f06c Convert usages of Blockdata pointers 2021-02-16 16:51:00 -06:00
BigBahss
42b56edc9d Begin refactoring Blockdata to simply inherit QVector<Block> 2021-02-16 16:51:00 -06:00
BigBahss
8187b2d4bb Plug leaks in Metatile 2021-02-16 12:14:27 -05:00
BigBahss
fe5d4982f7 Use QPointer when we need to set a nullptr on destruction 2021-02-16 08:26:09 -05:00
BigBahss
ef449f6f8d Upgrade signal/slot connections in MainWindow 2021-02-14 11:09:39 -06:00
BigBahss
36a6212af6 Store recent map in ProjectConfig instead of PorymapConfig 2021-02-03 16:13:36 -06:00
BigBahss
3d394bc4bb Add option to open config folder 2021-02-03 16:01:54 -06:00
BigBahss
2c065ae5b6 Dont disable option to open log when project open fails 2021-02-03 16:01:54 -06:00
BigBahss
6335151c39 Add option to open log file 2021-02-03 16:01:54 -06:00
BigBahss
3ccf433d1e Add completion suggestions for global event scripts 2021-01-29 22:05:40 -05:00
Marcus Huderle
c354142f1b Add ability to export map timelapse GIFs 2021-01-20 19:27:50 -06:00
BigBahss
5ca30c70dd Fix merge of #302 2020-12-14 18:53:46 -06:00
Marcus Huderle
9c0876e4c0 Fix disabling of UI when failing to open project 2020-12-14 18:06:38 -06:00
Marcus Huderle
d63bebee69 Merge remote-tracking branch 'origin/master' into fix827 
# Conflicts:
#	src/mainwindow.cpp
 2020-12-14 17:57:30 -06:00
BigBahss
3a04f59cb0 Fix QProcess::splitCommand() dependency on Qt 5.15. 
Fix shortcut for Open Map Scripts (Due to merge).
 2020-12-13 04:00:00 -05:00
BigBahss
1d29a53237 Merge remote-tracking branch 'origin/master' into script-editing 2020-12-13 00:30:22 -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
afc0c0c501 Add button next to script combo-box to open file to that script. 
Revert the behavior of Open Map Scripts button.
 2020-12-02 03:39:08 -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