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

417 commits

Author SHA1 Message Date
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
4187732baa Default to Cancel for reload warning 2022-10-25 17:40:40 -04:00
GriffinR
3656c3082f Fix Open Config Folder 2022-10-25 08:07:14 -04:00
GriffinR
8137388364 Fix QPalette highlights not working for all macOS themes 2022-10-25 02:00:00 -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
5ba3720405 is_secondary to bool 2022-10-24 00:02:27 -04:00
GriffinR
35da77ca94 Treat tileset lists separately 2022-10-23 18:59:59 -04: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
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
8e6585bbb2 Treat warp IDs as strings, stop deleting invalid warps 2022-10-18 13:44:45 -04:00
GriffinR
551a771798 Fix some build warnings from event rewrite 2022-10-18 12:29:07 -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
4b565208f7 Fix one-frame EventFrame jank 2022-10-17 19:37:26 -05:00
GriffinR
5e83c1f716 WIP Adjust custom attributes table 2022-10-17 14:52:12 -04:00
garak
3f2fea0980 event updates 
- select first event in order of tabs and lowest index
  (prev: select top left event)
- maintain current event selection between tab changes
 2022-10-16 18:37:55 -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
Marcus Huderle
36de7b63ff Fix event frame window visibility issue 2022-10-15 12:49:29 -05: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
garak
d433641bee allow numbers for gfx constants, code cleanup 2022-10-13 22:30:07 -04:00
garak
511c6ddb03 fix bug related to event id spinner 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
679f2419b7 fix event tabs not updating with group size changes 2022-10-13 22:30:07 -04:00
garak
9e54537ba2 fix nonstandard use of pointer casting 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
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