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

537 commits

Author SHA1 Message Date
garakmon
2b55e49933 fix bucket fills for CollisionPixmapItem 2020-08-26 20:03:47 -04:00
garakmon
9fb938939f allocate new map lastUpdatedBlockdata 2020-08-26 20:03:47 -04:00
garakmon
3c5401551d add Map class destructor to manage Event memory 2020-08-26 20:03:47 -04:00
garakmon
1151f9fc26 make some performance improvements to event rendering 2020-08-26 20:03:47 -04:00
garakmon
2a11760afd fix error in script edit command 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
5e4cc9a182 do not add no-ops to edit history for map painting 2020-08-26 20:03:47 -04:00
garakmon
d671470cb0 fix PaintMetatile subclass issues 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
6c2d035dfa more undo commands 
- add edit command for duplicating map events
- add edit commands for painting map collision
- edit commands that delete events now select
  the proper next event
 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
garakmon
90aba5e433 define a setMap for current_metatile_selection_item to prevent crash on project transition 2020-08-19 19:31:13 -04:00
GriffinR
79e384ef76 Fix metatile selection not updating properly when changing tilesets 2020-08-19 15:13:37 -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
3312280287 Fix 1x1 layer tile selection not highlighting 2020-07-23 19:30:48 -05:00
Marcus Huderle
7d70505b90 Fix crash when opening new project 2020-07-14 18:10:55 -05:00
Marcus Huderle
45cfb3aabd Allow 6-wide selections in tileset editor when triple layer is enabled 2020-07-14 17:54:56 -05:00
GriffinR
00ad1ec22a Fix flags being listed out of order 2020-07-14 17:44:33 -05:00
GriffinR
70b8806737 Fix layer flip to work on all incomplete metatile selections 2020-07-14 17:40:53 -05:00
GriffinR
cf9314eaa6 Reflect palette changes in TE metatile selection 2020-07-14 17:40:53 -05:00
GriffinR
5798ef7fda Apply xflip to layers individually, fix palette in selection 2020-07-14 17:40:53 -05:00
GriffinR
b5b227a6a0 Respect x/y flip for selections with different flip states 2020-07-14 17:40:53 -05:00
GriffinR
023be7f541 Respect x/y flip and palette for external tileset editor tile selections 2020-07-14 17:40:53 -05:00
GriffinR
c68e352bb1 Fix deleted events persisting after all events deleted 2020-07-13 19:11:51 -05:00
GriffinR
e518e2c554 Prevent heal locations from being duplicated 2020-07-13 19:08:46 -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
d20f4a5c83 Fix metatile selection rect disappearing during map selection 2020-07-10 01:15:22 -04:00
ultima-soul
38bbb2c4c8 Fix increasing metatileset size in tileset editor crashing when triple layer is enabled. 2020-07-09 13:07:48 -04:00
GriffinR
8b600fb59c Ignore invalid metatiles in selection calls to metatile selectors 2020-07-08 17:35:59 -04:00
GriffinR
35af5557d3 Remove unnecessary check in metatileIsValid 2020-07-08 17:35:59 -04:00
GriffinR
0e04d2250b Ignore invalid metatiles in tileset editor when syncing 2020-07-08 17:35:59 -04:00
GriffinR
b04638b4cf Validate metatile selection when changing tilesets 2020-07-08 17:35:59 -04: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
016c65448e Track unsaved changes to metatile attributes and labels 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
SBird
7bece548fb layer-scripting: fix layer transparency for reordered layers 2020-07-02 15:16:44 -05:00
Marcus Huderle
4557e22115 Fix wrong opacity layer assignment 2020-07-01 20:59:01 -05:00
Marcus Huderle
96ca895daa Add scripting api for metatile layer opacity 2020-07-01 20:43:19 -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
cc16440336 Allow Ctrl+Shift+Z to redo in the tileset editor 2020-06-30 18:55:13 -05:00
Marcus Huderle
64f9976d81 Fix bug where newly-created tileset couldn't be used 2020-06-30 18:20:07 -05:00
GriffinR
16f7373816 Fix crash when reducing tileset metatiles past current selection 2020-06-30 10:24:03 -05:00
GriffinR
1747a4bf2e Disable invalid metatile selection in tileset editor 2020-06-30 10:24:03 -05:00
GriffinR
2e29e19605 Fix sprite transparency not updating when changing object event graphics 2020-06-30 10:12:04 -05:00
SBird
18b9e5fbee triple-layer: fix creating tilesets 2020-06-30 10:10:44 -05:00
Marcus Huderle
b7d1db61a8 Remove pointless check on metatile layer mouse event 2020-06-28 16:36:55 -05:00
Marcus Huderle
7392105297 Early exit magic fill if it would be a no-op 2020-06-27 17:14:37 -05:00
Marcus Huderle
370221a974 Disable map zoom when middle button is pressed 2020-06-27 17:07:34 -05:00
ultima-soul
9183a297d4 Change layer slot labels when Triple Metatile Layers is enabled. 2020-06-26 16:22:15 -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
b58ec89854 Properly filter the map search results when switching sort types 2020-06-25 18:34:46 -05:00
GriffinR
dd91e29e85 Fix exported tileset images using x/y flip 2020-06-15 16:43:21 -05:00
GriffinR
ee7978ea2d Open scripts.inc when scripts.pory doesn't exist 2020-06-15 16:42:00 -05:00
GriffinR
afb157beb3 Assign editor->map to nullptr after clearing map cache 2020-06-06 11:35:44 -05:00
GriffinR
c382190e8b Fix crash parsing C defines from unknown token 2020-06-04 19:11:15 -05:00
GriffinR
32726d4a6a Show mouse coords in map event editor 2020-06-02 18:21:23 -05:00
GriffinR
6cb1c532a4 Show metatile label names in map editor 2020-06-02 18:21:23 -05:00
GriffinR
90aa26197d Set project-specific config defaults 2020-05-27 18:58:43 -05:00
GriffinR
125a287b9c Add config options for some project-specific features 2020-05-27 18:58:43 -05:00
garak
aa2ce13551
Merge pull request #232 from GriffinRichards/monitor-labels 
Monitor metatile_labels.h
 2020-05-22 16:07:05 -04:00
GriffinR
febc788097 Ignore metatile_labels when saving 2020-05-22 16:02:11 -04:00
GriffinR
ed2777c397 Monitor metatile_labels.h 2020-05-22 15:52:34 -04:00
Marcus Huderle
2f533a86b2 Optimize displayMapEvents() 2020-05-21 19:11:37 -05:00
Marcus Huderle
81cd43933b Eliminate unnecessary expensive map redraws when saving or changing tilesets 2020-05-20 19:21:18 -05:00
Marcus Huderle
f6c86e0eed Eliminate unnecessary expensive map redraw when opening a map 2020-05-20 18:30:17 -05:00
Marcus Huderle
93661bbe1b Fix crash when painting an event when no existing events exist for the map 2020-05-18 17:25:53 -05:00
garakmon
4ee22fa06a decouple map and event edit modes 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
GriffinR
638ce5370f Typo fix 2020-05-16 18:26:39 -05:00
GriffinR
374020f94d Split readMaxMapDataSize, move mapDimensionsValid to project 2020-05-16 18:26:39 -05:00
GriffinR
731fbce6af Read MAX_MAP_DATA_SIZE 2020-05-16 18:26:39 -05:00
GriffinR
99b95882fe Object event coords from unsigned to signed 2020-05-15 15:57:27 -05:00
Marcus Huderle
23a20dd736 Clear scripting map overlay when closing project 2020-05-13 16:16:51 -05:00
GriffinR
a860f3f110 Support importing FRLG Advance Map metatilesets 2020-05-13 16:00:08 -05:00
GriffinR
53ba6f5ab9 Warn when closing with unsaved encounter changes 2020-05-11 17:11:01 -05:00
garakmon
fcb320bd79 fix crash when attempting to close project that is never opened 2020-05-11 17:12:37 -04:00
Marcus Huderle
2161312122 Add optional args to dictate map refresh and commit 2020-05-09 11:31:14 -05:00
Marcus Huderle
e0afb24002 Merge remote-tracking branch 'origin/master' into scripting 2020-05-08 11:35:58 -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
GriffinR
ac92534576 Disallow drawing heal locations 2020-05-08 11:34:40 -05:00
GriffinR
399474c1f2 Fix heal loc duplicates, rename flyableMaps 2020-05-08 11:34:40 -05:00
Marcus Huderle
f139365faf Add log() to api 2020-05-08 11:29:39 -05:00
Marcus Huderle
998ea1fcc8 Add custom_scripts project config, and cleanup scripts when switching projects 2020-05-08 11:26:23 -05:00
Marcus Huderle
b8d0268d5d Move script api into separate file 2020-05-08 09:59:01 -05:00
Marcus Huderle
3c1549cc93 Add setTimeout to script api, and properly refresh scene when overlay is changed 2020-05-08 09:46:26 -05:00
Marcus Huderle
71242e5714 Add ability to set keyboard shortcuts for custom actions 2020-05-08 08:49:29 -05:00
Marcus Huderle
7072c001af Implement api for checkboxes 2020-05-07 20:13:56 -05:00
Marcus Huderle
bf64764103 Implement the rest of the palette api 2020-05-07 20:00:14 -05:00
Marcus Huderle
09a892f525 Add ability to register custom actions 2020-05-03 11:28:02 -05:00
Marcus Huderle
434bafe0b2 Call on_block_changed from more places 2020-05-03 10:48:48 -05:00
Marcus Huderle
0ef3c6a898 Add palette preview scripting commands 2020-05-03 10:31:44 -05:00
Marcus Huderle
8697adf186 Add true tileset scripting functions 2020-05-03 10:00:56 -05:00
Marcus Huderle
567a45b7e4 Implement some overlay functions and on_map_opened callback 2020-05-02 16:25:35 -05:00
Marcus Huderle
95012838fd Implement more map api functions 2020-04-30 18:30:24 -05:00
Marcus Huderle
d685718f8d Implement three map scripting functions 2020-04-29 20:41:19 -05:00
Marcus Huderle
267cd5e2cb Implement proof of concept for scripting capabilities 2020-04-29 19:46:01 -05:00
Marcus Huderle
16b451ab19 Extend min/max connection offsets to player's view 2020-04-28 19:38:40 -05:00
Marcus Huderle
6a27536cbb Automatically select the newly-created event via the Pencil tool 2020-04-26 19:47:57 -05:00
garakmon
333fe69dd8 keep selected tool when switching tabs 2020-04-26 18:55:18 -04:00
garakmon
f57ef7a819 change main tab for every click 2020-04-26 16:18:25 -04:00
garakmon
9e883a8a2f remember edit mode in map tab 2020-04-26 16:18:25 -04:00
garakmon
7e039121bb fix mainwindow ui conflicts 2020-04-26 16:18:25 -04:00
garak
ccccb7cec0 fix bug with adding new widget to event frame outside of a paint event 2020-04-26 16:17:51 -04:00
garak
b5adbe782d extend most toolbuttons for use in event editing 2020-04-26 16:17:51 -04:00
garak
bf58549666 update midnight theme disabled widgets, disable some ui in event tab 2020-04-26 16:17:51 -04: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
huderlem
c0674d9676
Merge pull request #200 from garakmon/closeproject 
Fix Open Project & Monitor Changed Project Files
 2020-04-25 16:28:02 -05:00
GriffinR
a3d10ef306 Set border visibility after redo/undo 2020-04-25 16:15:34 -05:00
Marcus Huderle
b9522c24f5 Centralize file-changed logic in the callback. Ignore watched files for 5 seconds, when saving them. On Windows, there is a fuzzy delay between the time a file is written and when the signal fires in Qt, and we can't rely on blocking signals or temporarily removing the watched filepaths. It also fires three or four duplicate times for a single file. 2020-04-25 16:11:14 -05:00
GriffinR
d1853a576b Use first trainer type constant for new objects 2020-04-21 19:03:00 -04:00
GriffinR
1bd1db2a7d Re-enable RSE-specific events when switching projects 2020-04-21 16:31:24 -04:00
garak
03082e5920
Merge branch 'master' into closeproject 2020-04-20 22:05:28 -04:00
garakmon
4d2fa5ee38 show file changed warning once at a time 2020-04-20 22:02:14 -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
f07422585b Fix typo 2020-04-20 20:29:07 -05:00
Marcus Huderle
bb6dbedabf Add ability to export map stitch images. 2020-04-20 20:29:07 -05:00
GriffinR
141f0fa773 Fix adding new mapsec regression 2020-04-20 17:45:34 -05:00
GriffinR
1b3d4a44e0 Forbid . and - in new tileset names 2020-04-20 17:39:31 -05:00
garak
4a23c90695
Merge pull request #205 from garakmon/encord 
use ordered map for wild encounter json
 2020-04-20 14:27:47 -04:00
garakmon
df8dac965f move fileWatcher signals to project class, block when saving 2020-04-20 14:08:32 -04:00
garakmon
96a870552e monitor files for changes 
- add fileWatcher to project that monitors changes to most files
      (except map and layout json files)
    - add config setting whether to monitor files for changes (monitor_files)
 2020-04-20 14:07:06 -04:00
garakmon
6026266afd add File>Reload Project 2020-04-20 14:07:06 -04:00
garakmon
ca5a0247f7 delete project with editor 2020-04-20 14:07:06 -04:00
garakmon
0e9deff4bc clear config data between loads 2020-04-20 14:07:06 -04:00
garakmon
c0bffa0107 add some destructors, prevent value set on combobox update 
- add destructors to Project and Editor
    - properly close project when opening a new one
    - when reloading comboboxes, do not set map values
      with the new first item
 2020-04-20 14:07:06 -04:00
garakmon
e5122ef94f use ordered map for wild encounter json 2020-04-20 14:04:34 -04:00
GriffinR
0c92dc05da Save metatile attributes label in new order for FRLG 2020-04-20 13:29:01 -04:00
GriffinR
d91107a07d Read callback_label for FRLG 2020-04-19 18:23:37 -04:00
GriffinR
f2ae83b33e Use metatile attributes path from header 2020-04-19 18:11:45 -04:00
GriffinR
5f16ae7dd0 Use value() instead of at() for defaults 2020-04-19 10:16:49 -04:00
GriffinR
8c428c578b
Merge branch 'master' into pokefirered 2020-04-19 09:48:21 -04:00