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

413 commits

Author SHA1 Message Date
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
BigBahss
e704793350 Disable actionOpen_Project_in_Text_Editor when no command is set 2020-12-01 10:13:56 -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
bc0127430b Fix MapRuler dimensions tooltip and refactor 2020-11-22 08:37:16 -06:00
BigBahss
4aaae1a264 Add support for opening .inc scripts to the selected event script 2020-11-22 01:04:46 -05: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
b310ccba79 Fix map sorting via shortcut 2020-11-13 09:06:03 -05:00
BigBahss
bb6786f24e Add extra shortcuts to main window and sub-editors 2020-11-12 23:48:03 -05:00
BigBahss
f044672d2e Add support for sub-editor shortcut customization 2020-11-09 05:50:15 -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
eabd2d6618 Convert QShortcut's to Shortcut's and add them to config 2020-11-03 05:58:10 -05:00
BigBahss
88fbf9f28b Add ShortcutsEditor to customize shortcuts for QAction's 2020-11-01 09:16:27 -05:00
BigBahss
174f66c35b Fix crash caused by shortcuts when no project is loaded 2020-10-30 19:33:14 -05:00
garakmon
19633253f8 update objects when adding new event with button, closes #297 2020-10-24 15:51:10 -04:00
garakmon
d1af93f3b5 do not call initWindow() on failed load 2020-10-24 15:51:10 -04:00
BigBahss
9c57a5bc46 Refactor MapRuler event handling 2020-10-24 07:45:08 -04:00
BigBahss
40a155329e Merge branch 'master' into ruler-tool 2020-10-24 03:28:29 -04: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
e4095130c5 Fix closing tileset editor not closing palette editor 2020-10-22 18:44:22 -05:00
BigBahss
daae6fe52b Save & restore region map editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
5624de750b Save & restore tileset editor geometry & state from config 2020-10-22 18:44:22 -05:00
BigBahss
f449f370a0 Implement FlowLayout for frame_mapTools 2020-10-20 15:02:06 -04:00
BigBahss
1ea50d7955 Cleanup large log file on startup 2020-10-14 19:21:41 -05:00
BigBahss
2f20a5d0b3 Hide connection tiles that cant be seen from current map 2020-10-14 01:57:59 -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
5247dd18c0 Refactor map zooming into the Editor 2020-10-13 06:07:31 -04:00
BigBahss
db20d01f3c Focus map zoom on currently hovered metatile 2020-10-11 12:07:11 -04:00
BigBahss
e2dd4fb76b Disable MapRuler when switching tool buttons 2020-10-02 14:06:58 -04:00
BigBahss
39aa420265 Turn MapRuler dimensions into a mouse-tracking tooltip, and show in status bar 2020-10-02 12:12:19 -04:00
BigBahss
502ebd449f Use correct function for setting cursorMapTileRect visibility 2020-09-24 19:40:02 -05:00
ultima-soul
38e7951f3e Add Import Map from Advance Map 1.92 feature. 2020-09-19 12:05:27 -07:00
garak
40078888f8 show or hide rects immediately with 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
5e09d7b965 Create ui checkbox for enabling straight paths 2020-09-07 13:12:15 -04:00
garakmon
68098b8220 silence deprecation warnings 2020-08-26 20:42:42 -04:00
garak
34b88c97c7 change new event default action when tab is changed 2020-08-26 20:04:14 -04:00
garakmon
1151f9fc26 make some performance improvements to event rendering 2020-08-26 20:03:47 -04:00
garakmon
24f970628e do not push new EventDelete if there was no deletion 2020-08-26 20:03:47 -04:00
garakmon
d121701da0 expose undoview with ctrl+E, fix redo shortcut 2020-08-26 20:03:47 -04:00
garakmon
392e595a03 fix the scripting api and many other changes 
- remove obsolete Map::commit()
- add ScriptEditMap command
- reorganize metatile history
- fix next selected event for multi event deletion
 2020-08-26 20:03:47 -04:00
garakmon
98c3298805 add edit command for duplicating events 
- also select next event when performing redo actions on deletion
 2020-08-26 20:03:47 -04:00
garakmon
c3defd6887 small fixes 
- connect DEL key to event deletion action
- update checks for unsaved changes to map
- add an asterisk next to the map name in the
  window title when a map has unsaved changes
 2020-08-26 20:03:47 -04:00
garakmon
4c154501f1 fix multi event deletion crash, allow spinboxes to commit move history 2020-08-26 20:03:47 -04:00
garakmon
2598ca2277 edit commands for creating and deleting events 2020-08-26 20:03:47 -04:00
garakmon
a0dc347ad3 add EventMove command, fix extra signal call in map border resize 2020-08-26 20:03:47 -04:00
garakmon
fb1eec1755 begin refactoring undo history 2020-08-26 20:03:47 -04:00
garak
2e077b45c7 fix scene scaling for metatile selection, replace deprecated setMatrix with setTransform 2020-08-15 19:30:46 -04:00
BigBahss
62e86b3c94 Toggle menuFile actions and menuHelp when no project is open 2020-08-04 18:31:35 -04:00
garak
55bd16db40 actually use new function to disable ui 2020-08-03 19:28:26 -04:00
garak
2c6d8f3d8d enable file menu for OSes with attached menu bars (#281 cont.) 2020-08-03 19:21:35 -04:00
garak
1575d3f799 disable ui when no project is open (closes #281) 2020-08-03 15:35:14 -04:00
GriffinR
c68e352bb1 Fix deleted events persisting after all events deleted 2020-07-13 19:11:51 -05:00
GriffinR
1b832929b2 Enforce limit for object events 2020-07-13 19:08:46 -05:00
GriffinR
ea2bfa7274 Add duplicate shortcut for events 2020-07-13 19:08:46 -05:00
ultima-soul
a5bd797914 Dropdown indexes for Event tab now properly set upon loading an event. 2020-07-13 18:58:45 -05:00
GriffinR
c4cdc47e20 Fix tileset editor syncing selection on save 2020-07-06 12:45:10 -05:00
GriffinR
257405f451 Unsaved changes prompt for tileset editor when switching tilesets or maps 2020-07-02 16:01:07 -05:00
GriffinR
b16703a397 Update tileset editor when current tileset is changed 2020-07-02 16:01:07 -05:00
GriffinR
a92d0eb006 Sync metatile selection from the map to the tileset editor 2020-07-02 16:01:07 -05:00
Marcus Huderle
b06070df5f Update docs 2020-07-02 15:28:17 -05:00
Marcus Huderle
dac4a0e8f7 Add scripting api for metatile layer draw order 2020-07-01 20:19:08 -05:00
GriffinR
08bc85dde0 Open tileset editor with selected metatile 2020-07-01 13:38:27 -05:00
Marcus Huderle
64f9976d81 Fix bug where newly-created tileset couldn't be used 2020-06-30 18:20:07 -05:00
SBird
18b9e5fbee triple-layer: fix creating tilesets 2020-06-30 10:10:44 -05:00
Marcus Huderle
370221a974 Disable map zoom when middle button is pressed 2020-06-27 17:07:34 -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
b58ec89854 Properly filter the map search results when switching sort types 2020-06-25 18:34:46 -05:00
GriffinR
ee7978ea2d Open scripts.inc when scripts.pory doesn't exist 2020-06-15 16:42:00 -05:00