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

954 commits

Author SHA1 Message Date
GriffinR
567a6d92e5 Enforce indexed tile images 2022-11-04 13:06:50 -04:00
GriffinR
3770efd6c5 Add setScale to the API 2022-11-03 13:19:57 -04:00
GriffinR
bf9e670d4c Merge branch 'master' of https://github.com/huderlem/porymap into metatile-attr 2022-10-30 11:42:52 -04:00
GriffinR
01cbb52341 Preserve null custom attributes 2022-10-29 17:16:52 -04:00
Marcus Huderle
16926144da Fix event offsets in map image exporting 2022-10-29 11:29:38 -05:00
GriffinR
eb80ee86f6
Merge branch 'master' into metatile-attr 2022-10-29 11:43:00 -04:00
GriffinR
f0c793424c Allow number values in the Metatile Behavior field 2022-10-29 11:41:09 -04:00
GriffinR
fa859a691f Fix minimum connection bounds 2022-10-29 10:57:08 -04:00
GriffinR
c16a6d5d23 Better support for parsing hex values 2022-10-28 13:29:33 -04:00
GriffinR
15e69dc9e7 Enforce border max for new maps 2022-10-28 13:25:04 -04:00
GriffinR
37b5656376 Fix some crashes on project close 2022-10-28 12:46:52 -04:00
GriffinR
d2fa68ba18 Allow number values for behavior in editor, add mask warning 2022-10-27 12:58:12 -04:00
GriffinR
577dc2fce2 Simplify metatile attribute layouts 2022-10-26 21:30:25 -04:00
GriffinR
9cd8777246 Remove last base game version difference 2022-10-26 04:01:01 -04:00
GriffinR
1283f5c19d Use custom attribute masks in API and Tileset Editor 2022-10-26 03:28:30 -04:00
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
ce6abb0a81 Default to No for file watcher prompt 2022-10-25 17:53:12 -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
69c1ae678d Ignore empty deletes for custom attributes 2022-10-24 23:01:26 -04:00
GriffinR
ea19b3a08c Sort asm tileset lists 2022-10-24 19:55:06 -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
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
GriffinR
c9d244bf9b Add missing object event defaults 2022-10-23 18:06:55 -04:00
GriffinR
469ea40984 Automatically convert enable_object_event_in_connection 2022-10-23 17:22:19 -04:00
Marcus Huderle
6fc82c9487 Fix overlay clipping by applying clipping before painter transformations 2022-10-23 10:08:59 -05:00
Marcus Huderle
6332e74d1f Fix typo in region map layout save 2022-10-22 14:31:38 -05:00
Marcus Huderle
1697f55b6c
Merge pull request #480 from GriffinRichards/combos 
Display values for missing items in combo boxes
 2022-10-22 13:08:38 -05: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
9277a2313f Display values for missing items in combo boxes 2022-10-19 14:28:45 -04:00
GriffinR
2f93caff14 Fix metatile behaviors with no constant not displaying 2022-10-19 00:33:53 -04:00
GriffinR
4c3a508534 Better type conversion custom event attributes 2022-10-18 19:52:35 -04:00
GriffinR
7bb5eea7fa Use new config filepaths 2022-10-18 17:14:46 -05:00
GriffinR
55f7b73b9b Fix id names of new heal locations 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
8e6585bbb2 Treat warp IDs as strings, stop deleting invalid warps 2022-10-18 13:44:45 -04:00
GriffinR
0e0da77c07 NONE_MAP -> DYNAMIC_MAP 2022-10-18 12:39:37 -04:00
GriffinR
551a771798 Fix some build warnings from event rewrite 2022-10-18 12:29:07 -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
Marcus Huderle
f5c050828e
Merge pull request #447 from garakmon/and-i-oop-- 
Internal Event Rewrite
 2022-10-17 17:41:00 -07:00
Marcus Huderle
4b565208f7 Fix one-frame EventFrame jank 2022-10-17 19:37:26 -05:00
Marcus Huderle
3de8e88b8e Add optional forceRedraw argument to palette API functions 2022-10-17 19:03:11 -05:00
GriffinR
5e83c1f716 WIP Adjust custom attributes table 2022-10-17 14:52:12 -04:00
garak
33014830cd set map early when creating new events because some types need map info for defaults 2022-10-16 22:15:48 -04:00
garak
c3a5e05f49 update clone sprite text 2022-10-16 21:04:29 -04:00
garak
715c37572e update clone object sprite icon with target change 2022-10-16 19:45:12 -04:00
garak
73ccc3d89d fix bug preventing selection of last event from spinner 2022-10-16 19:16:37 -04:00
garak
265340eed0 add local script labels to event combos for drop down 2022-10-16 18:47:35 -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
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
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
GriffinR
a2795d089b get/setAngle -> get/setRotation 2022-10-15 11:22:55 -07:00
GriffinR
d88d6a828e Scale to qreal, draw path border over fill 2022-10-15 11:22:55 -07:00
GriffinR
82dcecf8f2 Add addPath overload 2022-10-15 11:22:55 -07:00
GriffinR
47f6723bd2 Clean up rotation functions 2022-10-15 11:22:55 -07:00
GriffinR
ad5eea2293 Add rotation and scale to overlay API 2022-10-15 11:22:55 -07:00
GriffinR
67bec313a5 Add rounding to addRect, add fill color to addPath 2022-10-15 11:22:55 -07:00
GriffinR
77d04bb6de Combine addRect and addRectFilled, add color checking 2022-10-15 11:22:55 -07:00
GriffinR
385c17fd23 Add path drawing to the API 2022-10-15 11:22:55 -07:00
Marcus Huderle
37022c2b38 Adjust layout of events tab 2022-10-15 13:02:28 -05:00
Marcus Huderle
36de7b63ff Fix event frame window visibility issue 2022-10-15 12:49:29 -05:00
garakmon
2fa2fc52e8 fix save for region map layout new format 2022-10-15 12:08:42 -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
GriffinR
614242f1fe Update project files page 2022-10-14 12:42:07 -04:00
garak
d433641bee allow numbers for gfx constants, code cleanup 2022-10-13 22:30:07 -04:00
garak
00504817db add methods for updating frame ui 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
af9c0192e0 hide heal location z spinner, and label every event type in frames 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
8ac556c0de properly hide configurable event ui 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
garakmon
dd66f967f8 support current pokeemerald region map layout format 2022-10-13 22:20:19 -04:00
GriffinR
2b78330660 Improve API text rendering speed 2022-10-13 09:55:48 -07: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
c58162be96 Support C tileset data without initializers 2022-10-10 11:38:17 -05:00
GriffinR
487cc8d367 Add config options to remove unnecessary tileset fields 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
70528bbc56 Write tilesets data in 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