garak
|
0f9c5873a2
|
Merge branch 'master' of https://github.com/huderlem/porymap into slam
|
2024-01-09 15:28:01 -05:00 |
|
GriffinR
|
1212d7dfd8
|
Sort script dropdown, minor fixes
|
2024-01-06 17:40:59 -05:00 |
|
GriffinR
|
ef165e29df
|
Stop enforcing heal locations table name
|
2024-01-04 12:22:06 -05:00 |
|
GriffinR
|
a0069b6a3f
|
Add truncation warnings for Block masks
|
2024-01-03 14:24:14 -05:00 |
|
GriffinR
|
2c61df578a
|
Support relative paths in image API functions, combine projectDir calls
|
2024-01-03 12:13:53 -05:00 |
|
GriffinR
|
d126a2b589
|
Merge pull request #575 from GriffinRichards/map-scripts
Add labels from scripts file to Script dropdowns
|
2024-01-02 00:56:51 -05:00 |
|
GriffinR
|
ced402a4c6
|
Add labels from scripts file to Script dropdowns
|
2023-12-29 21:54:37 -05:00 |
|
GriffinR
|
945201026e
|
Set reasonable defaults for wild encounter rates
|
2023-12-29 00:15:51 -05:00 |
|
GriffinR
|
c543cc0899
|
Store warp behaviors as values, add version defaults
|
2023-12-21 23:33:36 -05:00 |
|
GriffinR
|
93fb8cf471
|
Allow empty behavior names, simplify fieldmap parsing
|
2023-12-19 15:46:10 -05:00 |
|
GriffinR
|
ee6d6c7bcc
|
Fix metatile behavior value displays
|
2023-12-19 13:42:07 -05:00 |
|
GriffinR
|
e0c6621abc
|
Add truncation warning for metatile labels
|
2023-12-19 12:29:16 -05:00 |
|
GriffinR
|
902beeedcf
|
Fix shuffled attributes
|
2023-12-19 00:23:32 -05:00 |
|
GriffinR
|
6d995cee9b
|
Add identifier config settings
|
2023-12-18 20:48:40 -05:00 |
|
GriffinR
|
bfb827b736
|
Add by-name and recursive define evaluation
|
2023-12-17 20:47:28 -05:00 |
|
GriffinR
|
8d274c013f
|
Merge branch 'master' of https://github.com/huderlem/porymap into custom-images
|
2023-12-17 16:18:16 -05:00 |
|
GriffinR
|
144b835c53
|
Merge pull request #531 from GriffinRichards/fix-label-saving
Fix metatile label saving
|
2023-12-17 02:05:34 -05:00 |
|
GriffinR
|
fc1e192087
|
Add warp behavior list to settings
|
2023-12-17 02:03:33 -05:00 |
|
GriffinR
|
60fb1a246e
|
Clean up custom Block layouts
|
2023-12-16 17:54:06 -05:00 |
|
GriffinR
|
5a3907bf56
|
Use Block masks to update value limits, parse fieldmap.c
|
2023-12-16 01:48:13 -05:00 |
|
GriffinR
|
f0310d4a63
|
Generalize bit packing utility for Block
|
2023-12-15 14:33:01 -05:00 |
|
GriffinR
|
c4adcc2963
|
Stop unnecessary evaluation when parsing constant names
|
2023-12-11 16:49:27 -05:00 |
|
GriffinR
|
06ff213691
|
Sturdier pokemon icon search, add icon override settings
|
2023-12-11 03:08:25 -05:00 |
|
GriffinR
|
61b1789d4b
|
Custom collision/event graphics cleanup
|
2023-12-08 14:50:00 -05:00 |
|
GriffinR
|
4f0e8716f2
|
Update Collision tab UI
|
2023-12-08 12:18:21 -05:00 |
|
GriffinR
|
49cb69f2b8
|
Fix issues when user supplies incorrect number of encounters
|
2023-11-07 13:05:10 -05:00 |
|
GriffinR
|
56d53d2693
|
Relax spacing requirements in heal location data table
|
2023-09-30 18:39:14 -04:00 |
|
garak
|
f4cd57c988
|
some code cleanup
|
2023-09-28 19:02:11 -04:00 |
|
garak
|
ac83e0fbe3
|
no need to manually crop map tab icon
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
ff086a6fe6
|
remove redundant mapsceneeventfilter file
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
2ea0590f6e
|
save changes to layouts
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
a14e70ef53
|
update map lists when new maps and layouts are added
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
f8c7ada585
|
fix layout undo history
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
72eb8f873f
|
create dynamic map tab icon
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
f7f06dab29
|
fix change dimensions for layouts
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
18eb3ceb1e
|
setLayout to create layout-only edit mode
|
2023-09-28 19:02:10 -04:00 |
|
garak
|
2bc51f1c29
|
move map pixmap item and metatile rendering from Map to Layout
|
2023-09-28 19:02:10 -04:00 |
|
GriffinR
|
c42909d028
|
Merge branch 'master' into fix-label-saving
|
2023-09-25 10:50:07 -04:00 |
|
GriffinR
|
22fe7f2963
|
Use spin boxes for border metatile settings if using default size
|
2023-09-19 14:30:48 -04:00 |
|
GriffinR
|
9bed66ecfc
|
Write config with project settings editor
|
2023-08-28 16:48:27 -04:00 |
|
GriffinR
|
ff6a51ffa4
|
Support 8BPP tileset tile images
|
2023-06-30 01:49:43 -04:00 |
|
GriffinR
|
f232de68c9
|
Fix empty metatile label regression
|
2023-05-19 02:21:41 -04:00 |
|
GriffinR
|
ea704c8ef7
|
Fix metatile label saving
|
2023-05-19 01:41:20 -04:00 |
|
GriffinR
|
44dba9edc5
|
Set shared metatile labels as placeholders
|
2023-02-14 22:44:13 -05:00 |
|
GriffinR
|
16e5e9fad8
|
Update metatile label copy button
|
2023-02-14 15:28:18 -05:00 |
|
GriffinR
|
dbd6afb0c3
|
Move metatile labels to tilesets
|
2023-02-14 14:43:05 -05:00 |
|
GriffinR
|
72ae9dfc01
|
Fix regression in metatile label saving
|
2023-02-14 11:50:14 -05:00 |
|
GriffinR
|
36363febf7
|
Remove mistaken field addition to map_groups.json
|
2023-02-14 11:03:01 -05:00 |
|
GriffinR
|
2ee60f4544
|
Delete layout when readMapLayouts fails
|
2023-01-25 23:39:10 -05:00 |
|
GriffinR
|
2fce82d1b4
|
Improve layout parser warnings/errors
|
2023-01-25 23:30:54 -05:00 |
|
garak
|
6b47d350a0
|
read multiple incbins and C arrays at once for situations where the same file could be opened many times
|
2023-01-17 13:15:07 -05:00 |
|
garak
|
9cc55ef2f7
|
add option to copy mon info from another tab [closes #469]
|
2023-01-17 13:15:07 -05:00 |
|
garak
|
06948a97b0
|
fix issue with fileCache invalidating certain changes in files
|
2023-01-17 13:15:07 -05:00 |
|
garak
|
4df4e6ddd7
|
fix metatile label reading
|
2023-01-17 13:15:07 -05:00 |
|
garak
|
f9bb6196e2
|
do less work reading C defines while loading tileset labels
|
2023-01-17 13:15:07 -05:00 |
|
garak
|
37fcfba829
|
use static (And const where applicable) regular expression objects
the speed increase here is noticable since the work of creating a regex object is only done once per session
|
2023-01-17 13:15:07 -05:00 |
|
t
|
d29506d755
|
Merge pull request #495 from GriffinRichards/keep-import-path
Preserve import/export path in file dialogs
|
2023-01-16 14:19:31 -05:00 |
|
Marcus Huderle
|
dcbf62e72f
|
Remove inadvertent save to layouts.json
|
2023-01-16 11:59:21 -06:00 |
|
GriffinR
|
f507b3e8a3
|
Preserve import/export path in file dialogs
|
2022-11-27 21:24:55 -05:00 |
|
GriffinR
|
d475286249
|
Merge branch 'master' into metatile-attr
|
2022-11-18 18:13:21 -05:00 |
|
GriffinR
|
97b8bb96cb
|
Remove unused function
|
2022-11-07 01:02:33 -05:00 |
|
GriffinR
|
567a6d92e5
|
Enforce indexed tile images
|
2022-11-04 13:06:50 -04:00 |
|
GriffinR
|
eb80ee86f6
|
Merge branch 'master' into metatile-attr
|
2022-10-29 11:43:00 -04:00 |
|
GriffinR
|
c16a6d5d23
|
Better support for parsing hex values
|
2022-10-28 13:29:33 -04:00 |
|
GriffinR
|
9cd8777246
|
Remove last base game version difference
|
2022-10-26 04:01:01 -04:00 |
|
GriffinR
|
fa2b4d3edb
|
Allow custom metatile attribute layouts
|
2022-10-25 22:35:26 -04:00 |
|
GriffinR
|
ce6abb0a81
|
Default to No for file watcher prompt
|
2022-10-25 17:53:12 -04:00 |
|
GriffinR
|
ea19b3a08c
|
Sort asm tileset lists
|
2022-10-24 19:55:06 -04:00 |
|
GriffinR
|
8fbcee7f21
|
Insert new tilesets in sorted order
|
2022-10-24 09:33:51 -04:00 |
|
GriffinR
|
09ce5b5913
|
Drop path_ from path config options
|
2022-10-24 08:03:51 -04:00 |
|
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 |
|