Commit graph

1632 commits

Author SHA1 Message Date
yenatch
4a2c2e47a9
Merge pull request #45 from huderlem/fixpath
Fix event_object_movement.c filepath
2018-03-20 19:40:05 -04:00
Marcus Huderle
a11365176c Fix event_object_movement.c filepath to account for new pokeruby directory structure 2018-03-19 18:15:29 -07:00
yenatch
aaae8674b5 Redraw the map when switching to collision editing 2018-03-18 23:48:38 -04:00
yenatch
45d3e932ca
Merge pull request #40 from huderlem/connect
Edit Map Connections
2018-03-18 23:13:52 -04:00
yenatch
4280735c1e Merge remote-tracking branch 'origin/master' into connect 2018-03-18 22:57:01 -04:00
yenatch
7f74b3b481 Need to include QMap in parseutil.h 2018-03-18 21:30:12 -04:00
yenatch
ae4158ce7b Fix offset value when selecting another connection 2018-03-18 21:28:52 -04:00
yenatch
8c80e44438
Merge pull request #41 from huderlem/fixtilesets
Properly support painting tiles from secondary tileset
2018-03-16 00:15:54 -04:00
Marcus Huderle
69c84a68e3 Properly support painting tiles from secondary tileset 2018-03-13 20:07:16 -07:00
Marcus Huderle
9533042c4c Support 'mirror' editing for dive and emerge connections 2018-03-12 21:52:58 -07:00
Marcus Huderle
1a10eac29f Support 'mirror' connection editing. Can be toggled off via checkbox 2018-03-12 20:51:27 -07:00
Marcus Huderle
ad7b9ca7b3 Some cleanup, and disable connection controls when loading map with no connections 2018-03-11 15:59:21 -07:00
Marcus Huderle
dec99c8cac Fix bug where saving shared map assets wouldn't work 2018-03-11 15:21:01 -07:00
Marcus Huderle
bd2c782021 Double-clicking on a connection will load the destination map 2018-03-11 14:31:35 -07:00
Marcus Huderle
f47e3bf4ea Limit connection offsets to reasonable values 2018-03-11 14:01:36 -07:00
Marcus Huderle
9b0f686781 Properly support saving map connections 2018-03-11 13:33:08 -07:00
Marcus Huderle
6f71c15629 Add dive/emerge map pickers 2018-03-10 11:25:34 -08:00
yenatch
aa6949237f
Merge pull request #39 from huderlem/fixMovement
Fix collision and elevation selections
2018-03-10 14:11:51 -05:00
Marcus Huderle
5301b299e2 Support adding/removing connections via buttons 2018-03-10 10:09:19 -08:00
Marcus Huderle
9a6132314c Support multiple connections in same direction, and darken non-selected connections 2018-03-10 00:22:13 -08:00
Marcus Huderle
562edc5e3e Fix collision and elevation selections 2018-03-10 00:17:50 -08:00
Marcus Huderle
8df2a864a0 Fixup connection graphicswindow dimensions 2018-03-08 22:35:16 -08:00
Marcus Huderle
2b5da0ee01 Use same graphicswindow format as Map tab 2018-03-08 22:34:51 -08:00
Marcus Huderle
c553980105 Properly remove connections 2018-03-08 21:26:40 -08:00
Marcus Huderle
1e8d1d9497 Hide connection editor when switching tabs 2018-03-08 21:18:00 -08:00
Marcus Huderle
c00d83da46 Support changing connection maps, adding new connections, and removing connections 2018-03-08 20:34:04 -08:00
Marcus Huderle
073a13ac9c Save connections to file 2018-03-07 21:05:35 -08:00
Marcus Huderle
64007b5bae Add basic drop-and-drop connection editing 2018-03-07 20:22:18 -08:00
Marcus Huderle
e2933fc801 Add connections tab 2018-03-06 16:02:08 -08:00
yenatch
997bfe7fea
Merge pull request #28 from huderlem/multiblock
Add multi-block and smart-path tile painting
2018-03-06 01:50:40 -05:00
Marcus Huderle
e485f23004 Add smart path painting 2018-03-05 16:47:07 -08:00
Marcus Huderle
940fb1b65c Support multi-block painting 2018-03-05 14:47:46 -08:00
yenatch
6cb394ebde
Merge pull request #26 from huderlem/exportpic
Add ability to export map image
2018-03-04 22:07:18 -05:00
Marcus Huderle
6112b279c8 Add 'export map image' action to File menu 2018-03-04 18:49:33 -08:00
yenatch
d667a0caad
Merge pull request #25 from huderlem/grid
Add map grid toggling
2018-03-04 21:37:48 -05:00
Marcus Huderle
eeaa347f17 Add checkbox to toggle grid lines 2018-03-04 17:15:30 -08:00
Marcus Huderle
47ce60cbe1 Display grid lines on map editor 2018-03-04 16:14:09 -08:00
yenatch
6bb945d798
Merge pull request #24 from huderlem/coords
Display hovered map tile and block info
2018-03-04 15:12:59 -05:00
Marcus Huderle
2dfcab7a47 Allow collision and elevation tiles to handle hover events individually 2018-03-04 10:49:44 -08:00
Marcus Huderle
4f838b979c Display hovered block selection in status bar 2018-03-04 10:19:03 -08:00
Marcus Huderle
f81ab6994a Display hovered tile coords and block in status bar 2018-03-04 00:09:34 -08:00
yenatch
470fc92fba
Merge pull request #23 from huderlem/items
Populate items, flags, and vars in dropdown menus
2018-03-03 21:03:13 -05:00
Marcus Huderle
af4dc34eba Evaluate C define expressions using postfix evaluation, and rename 'asm' to 'parseutil' 2018-03-03 17:09:05 -08:00
Marcus Huderle
d87d5e6f00 Remove the reverse song constant lookup 2018-03-03 12:20:59 -08:00
Marcus Huderle
669c81b50b Populate flag and var dropdown menus with their respective constants 2018-03-02 21:59:24 -08:00
Marcus Huderle
2bc949612d Populate hidden item dropdown menu with item constants 2018-03-02 19:56:23 -08:00
Marcus Huderle
38360de140 Update map object filepath 2018-03-02 19:55:55 -08:00
yenatch
ce49e788ec
Merge pull request #20 from huderlem/maps
Support adding new maps
2018-02-18 17:14:54 -05:00
Marcus Huderle
b39f44c6d0 Small cleanup 2018-02-18 10:32:30 -08:00
Marcus Huderle
c61b8a9b18 Save map constants header based on the current map group data 2018-02-18 09:43:29 -08:00