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

275 commits

Author SHA1 Message Date
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
7b66537d01
Merge pull request #479 from GriffinRichards/fix-json 
Better type conversion for JSON data
 2022-10-22 12:57:17 -05:00
GriffinR
7bb5eea7fa Use new config filepaths 2022-10-18 17:14:46 -05:00
GriffinR
5f3efdc7a4 Rewrite heal location data writing 2022-10-18 17:14:46 -05:00
GriffinR
3e1d26f0ce Make heal location constants prefix-agnostic 2022-10-18 17:14:46 -05:00
GriffinR
43d0dc1e7b Rewrite heal location data reading 2022-10-18 17:14:46 -05:00
GriffinR
0e0da77c07 NONE_MAP -> DYNAMIC_MAP 2022-10-18 12:39:37 -04:00
GriffinR
75788ed3f9 Convert event JSON values by type 2022-10-18 01:20:53 -04:00
GriffinR
e2a31336c5 Merge branch 'master' of https://github.com/huderlem/porymap into fix-json 2022-10-17 22:20:06 -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
463a7e01f6 Save custom header values by type 2022-10-15 18:29:55 -04: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
582405d68b change Event class design in favor of polymorphism 2022-10-13 22:30:07 -04:00
GriffinR
c953a15523 Move error logging out of gameStringToBool 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
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
GriffinR
3181523799 Add convenience functions for triple layer metatiles 2022-10-04 17:50:39 -05:00
GriffinR
d353164244 Suppress errors for unneeded defines 2022-09-27 18:22:41 -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
tustin2121
e241cdd104 Fixed path composing bug with goto script 2022-09-22 12:05:19 -04:00
GriffinR
7777eac9f4 Silence errors about SECRET_BASE_GROUP 2022-09-12 11:54:44 -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
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
3e7bfe126a Add edit history for border edits via script 2022-08-29 20:20:09 -04:00
GriffinR
b8636548dc Move function call outside loop 2022-08-20 16:08:53 -04:00
GriffinR
774c60cc88 Clean up loadTilesetMetatiles 2022-08-20 12:14:11 -04:00
Marcus Huderle
02b0bc94c5 Make obj event gfx parsing backwards compatible 2022-07-03 11:28:24 -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
096a66067d Automatically disable encounters if JSON is missing 2022-06-28 13:20:02 -04:00
GriffinR
b20df82358 Assume objects with no type field are not clones 2022-06-24 23:47:43 -04: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
d531c9407c Separate byte reads for metatile tiles 2022-02-08 16:26:19 -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
garak
cca762ba94 do nothing with extra encounter groups 
(ie. remove unnecessary error checking code that broke sometimes for no apparent reason)
 2022-02-08 16:43:10 -05: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
de0a5b526b Don't change frame for inanimate objects 2021-12-27 16:56:31 -06:00
GriffinR
6613318900 Disambiguate tile field names to tileId or metatileId 2021-12-26 11:23:45 -06: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
GriffinR
3197cda157 Fix macOS crash parsing wild encounters 2021-11-01 15:40:03 -04:00
GriffinR
c372d7a01b Sync map group label comment format 2021-10-17 10:58:05 -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
6c3ee3c46d order wild encounter json reading 2021-08-12 20:24:46 -04: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
fc0c404836 remove some commented old code 2021-07-22 12:23:21 -04:00
garak
df724a4682 find unused tiles 2021-07-22 12:23:21 -04:00
garak
601e671fc8 add options to count metatiles to tileset editor 
- count the total number of usages across all maps of specific metatiles
- display the count and/or display unused metatiles
- this does not account for metatiles used in code (most of these are labeled)
 2021-07-22 12:23:21 -04:00
Marcus Huderle
6f394ce39c Code fixes for Qt 6 2021-07-07 18:11:35 -05:00
BigBahss
e310732169 Make eventScriptLabelModel and eventScriptLabelCompleter into values rather than pointers 2021-04-16 09:04:38 -04:00
BigBahss
f72d4bda50 Fix duplicate event script label completions 2021-04-16 08:22:05 -04:00
BigBahss
61ffcc3259 Merge branch 'master' into script-editing 2021-04-16 07:28:09 -04:00
hjk321
0cebe438b6 Poryscript now generates with newline 2021-03-07 10:16:54 -05:00
BigBahss
a4fc2bcb30 Fix crash when creating new map 2021-02-21 08:44:41 -06:00
BigBahss
b0e3b862e1 Remove unused addNewMapToGroup() overload 2021-02-21 08:44:41 -06:00
BigBahss
0d3e2d90e6 Fix memory leaks in addNewMapToGroup() 2021-02-21 08:44:41 -06:00
GriffinR
02af128913 Add setting to disable/enable map text file creation 2021-02-19 07:29:26 -06:00
BigBahss
bc2cc7d089 Convert PaletteUtil into a namespace 2021-02-18 03:25:26 -05:00
Marcus Huderle
c351f069ff Merge remote-tracking branch 'origin/master' into metatile-leaks 2021-02-17 16:56:15 -06:00
BigBahss
fdd12cde25 Refactor ParseUtil to stop using pointers and output-parameters 2021-02-17 16:34:46 -06:00
BigBahss
fa8b387120 Fix some more memory leaks related to parseAsm() 2021-02-17 16:34:46 -06:00
BigBahss
d9340d3b73 Add parentWidget() to Project to avoid name-shadowing the parent member 2021-02-17 16:34:46 -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
3ccf433d1e Add completion suggestions for global event scripts 2021-01-29 22:05:40 -05:00
GriffinR
e3edb503ed Exclude non-item constants in items.h 2021-01-25 11:15:16 -05:00
GriffinR
b819f82943 Add auto-generated file warning to map_groups.h write 2020-12-30 18:12:51 -06:00
BigBahss
7a4de9f3d9 Add support for finding and opening any event script 2020-12-04 09:29:38 -05:00
BigBahss
3478846b60 Add Project::getMapScriptsFilePath() and rename text editor config members 2020-11-21 17:33:16 -05:00
Blampharos
b371860eb1 Fix extraneous header flags being saved 
Fixes a bug where the program would put map header flags from
firered and emerald to ruby-based projects.
 2020-10-25 17:16:04 -05:00
ultima-soul
8575b83212 Add support for FRLG .map files and border importing for pokefirered and custom border size supporting projects. 2020-09-21 14:26:58 -07:00
ultima-soul
38e7951f3e Add Import Map from Advance Map 1.92 feature. 2020-09-19 12:05:27 -07:00
garakmon
68098b8220 silence deprecation warnings 2020-08-26 20:42:42 -04:00
garakmon
9fb938939f allocate new map lastUpdatedBlockdata 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
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
GriffinR
00ad1ec22a Fix flags being listed out of order 2020-07-14 17:44:33 -05:00
GriffinR
1b832929b2 Enforce limit for object events 2020-07-13 19:08:46 -05:00
ultima-soul
debb1c66ac Implement proper triple metatile layer support. 2020-06-26 16:22:15 -05:00
GriffinR
afb157beb3 Assign editor->map to nullptr after clearing map cache 2020-06-06 11:35:44 -05:00
GriffinR
125a287b9c Add config options for some project-specific features 2020-05-27 18:58:43 -05:00