porymap

atiran/porymap

Fork 0

Commit graph

8930b2c01b Prepopulate more dropdowns, and support new macro formats Marcus Huderle 2018-07-11 11:23:55 -0500
52679eb53f

Merge pull request #55 from huderlem/resize yenatch 2018-07-09 22:23:01 -0400
43119f2b43

Merge pull request #1 from yenatch/master Garak 2018-07-09 20:51:08 -0400
c1306b4f72 Fix segfault due to dangling event object Marcus Huderle 2018-07-09 18:12:43 -0500
64095821af Make flood fill respect whole metatile selection, including smart path. Smart path is now a checkbox Marcus Huderle 2018-07-09 17:40:37 -0500
aafe258842 Respect map dimension changes in undo/redo history Marcus Huderle 2018-07-09 17:40:34 -0500
37903a5acb Fix bug where map connections didn't visually update when switching back to the collision view Marcus Huderle 2018-07-09 17:40:31 -0500
514ecb2907 Add map resizing functionality Marcus Huderle 2018-07-09 17:40:28 -0500
eb0d238a01 Add map dimensions dialog window Marcus Huderle 2018-07-09 17:40:15 -0500
8d2958c952

Merge pull request #54 from huderlem/tilesets yenatch 2018-07-08 19:05:53 -0400
48a562d1eb Update map view when tilesets change Marcus Huderle 2018-07-08 11:17:43 -0500
37529d37ec Add tileset comboboxes, and make metatile area scrollable Marcus Huderle 2018-07-08 10:29:03 -0500
767407e1a7

Merge pull request #53 from huderlem/border yenatch 2018-07-07 19:35:50 -0400
5bd88e6fef Add ability to change map border Marcus Huderle 2018-07-07 17:32:54 -0500
10b6d3a0d3

Merge pull request #52 from huderlem/events yenatch 2018-07-07 15:11:38 -0400
a9325fc790 Dynamically set event labels Marcus Huderle 2018-07-07 11:57:44 -0500
fc0cf133b2 Bind to all event combobox value changes Marcus Huderle 2018-07-07 11:21:19 -0500
ecce7d26f2 Add ability to add all map event types Marcus Huderle 2018-07-07 10:58:25 -0500
76649ea867 Add menu to 'add event' button Marcus Huderle 2018-07-06 11:08:20 -0500
f227805b7f fixing build errors garakmon 2018-06-25 10:25:39 -0400
9c2cf84983

Merge pull request #50 from huderlem/layouts yenatch 2018-06-21 10:28:30 -0400
2567254214 MUS_ prefix instead of BGM_ Marcus Huderle 2018-06-20 17:43:26 -0500
a2b42de541 Support new map layouts structure Marcus Huderle 2018-06-20 17:43:20 -0500
39abd40ee0

Merge pull request #49 from huderlem/object_event_macro yenatch 2018-06-16 19:56:50 -0400
a89dc22245 Update parsing of new object_event macro Marcus Huderle 2018-06-14 22:01:00 -0500
ddb832de0c

Merge pull request #48 from huderlem/fixpath yenatch 2018-06-05 23:35:47 -0400
3ed27ba5d3 Update filepaths and var names from 'map_object' -> 'event_object' Marcus Huderle 2018-06-05 17:06:14 -0500
4a2c2e47a9

Merge pull request #45 from huderlem/fixpath yenatch 2018-03-20 19:40:05 -0400
a11365176c Fix event_object_movement.c filepath to account for new pokeruby directory structure Marcus Huderle 2018-03-19 18:15:29 -0700
aaae8674b5 Redraw the map when switching to collision editing yenatch 2018-03-18 23:48:38 -0400
45d3e932ca

Merge pull request #40 from huderlem/connect yenatch 2018-03-18 23:13:52 -0400
4280735c1e Merge remote-tracking branch 'origin/master' into connect yenatch 2018-03-18 22:57:01 -0400
7f74b3b481 Need to include QMap in parseutil.h yenatch 2018-03-18 21:30:12 -0400
ae4158ce7b Fix offset value when selecting another connection yenatch 2018-03-18 21:28:52 -0400
8c80e44438

Merge pull request #41 from huderlem/fixtilesets yenatch 2018-03-16 00:15:54 -0400
69c84a68e3 Properly support painting tiles from secondary tileset Marcus Huderle 2018-03-13 20:07:16 -0700
9533042c4c Support 'mirror' editing for dive and emerge connections Marcus Huderle 2018-03-12 21:52:58 -0700
1a10eac29f Support 'mirror' connection editing. Can be toggled off via checkbox Marcus Huderle 2018-03-12 20:51:27 -0700
ad7b9ca7b3 Some cleanup, and disable connection controls when loading map with no connections Marcus Huderle 2018-03-11 15:59:21 -0700
dec99c8cac Fix bug where saving shared map assets wouldn't work Marcus Huderle 2018-03-11 15:21:01 -0700
bd2c782021 Double-clicking on a connection will load the destination map Marcus Huderle 2018-03-11 14:20:52 -0700
f47e3bf4ea Limit connection offsets to reasonable values Marcus Huderle 2018-03-11 14:01:29 -0700
9b0f686781 Properly support saving map connections Marcus Huderle 2018-03-11 13:33:08 -0700
6f71c15629 Add dive/emerge map pickers Marcus Huderle 2018-03-10 11:25:34 -0800
aa6949237f

Merge pull request #39 from huderlem/fixMovement yenatch 2018-03-10 14:11:51 -0500
5301b299e2 Support adding/removing connections via buttons Marcus Huderle 2018-03-10 10:09:19 -0800
9a6132314c Support multiple connections in same direction, and darken non-selected connections Marcus Huderle 2018-03-09 23:26:44 -0800
562edc5e3e Fix collision and elevation selections Marcus Huderle 2018-03-10 00:17:50 -0800
8df2a864a0 Fixup connection graphicswindow dimensions Marcus Huderle 2018-03-08 22:35:16 -0800
2b5da0ee01 Use same graphicswindow format as Map tab Marcus Huderle 2018-03-08 22:34:51 -0800
c553980105 Properly remove connections Marcus Huderle 2018-03-08 21:26:40 -0800
1e8d1d9497 Hide connection editor when switching tabs Marcus Huderle 2018-03-08 21:18:00 -0800
c00d83da46 Support changing connection maps, adding new connections, and removing connections Marcus Huderle 2018-03-08 20:34:04 -0800
073a13ac9c Save connections to file Marcus Huderle 2018-03-07 21:05:35 -0800
64007b5bae Add basic drop-and-drop connection editing Marcus Huderle 2018-03-07 20:22:18 -0800
e2933fc801 Add connections tab Marcus Huderle 2018-03-06 16:02:08 -0800
997bfe7fea

Merge pull request #28 from huderlem/multiblock yenatch 2018-03-06 01:50:40 -0500
e485f23004 Add smart path painting Marcus Huderle 2018-03-05 16:47:00 -0800
940fb1b65c Support multi-block painting Marcus Huderle 2018-03-05 14:47:46 -0800
6cb394ebde

Merge pull request #26 from huderlem/exportpic yenatch 2018-03-04 22:07:18 -0500
6112b279c8 Add 'export map image' action to File menu Marcus Huderle 2018-03-04 18:11:59 -0800
d667a0caad

Merge pull request #25 from huderlem/grid yenatch 2018-03-04 21:37:48 -0500
eeaa347f17 Add checkbox to toggle grid lines Marcus Huderle 2018-03-04 16:20:18 -0800
47ce60cbe1 Display grid lines on map editor Marcus Huderle 2018-03-04 16:07:52 -0800
6bb945d798

Merge pull request #24 from huderlem/coords yenatch 2018-03-04 15:12:59 -0500
2dfcab7a47 Allow collision and elevation tiles to handle hover events individually Marcus Huderle 2018-03-04 10:49:44 -0800
4f838b979c Display hovered block selection in status bar Marcus Huderle 2018-03-04 10:19:03 -0800
f81ab6994a Display hovered tile coords and block in status bar Marcus Huderle 2018-03-04 00:09:34 -0800
470fc92fba

Merge pull request #23 from huderlem/items yenatch 2018-03-03 21:03:13 -0500
af4dc34eba Evaluate C define expressions using postfix evaluation, and rename 'asm' to 'parseutil' Marcus Huderle 2018-03-03 17:09:05 -0800
d87d5e6f00 Remove the reverse song constant lookup Marcus Huderle 2018-03-03 12:20:59 -0800
669c81b50b Populate flag and var dropdown menus with their respective constants Marcus Huderle 2018-03-02 21:54:08 -0800
2bc949612d Populate hidden item dropdown menu with item constants Marcus Huderle 2018-03-02 19:56:23 -0800
38360de140 Update map object filepath Marcus Huderle 2018-03-02 19:55:55 -0800
ce49e788ec

Merge pull request #20 from huderlem/maps yenatch 2018-02-18 17:14:54 -0500
b39f44c6d0 Small cleanup Marcus Huderle 2018-02-18 10:32:30 -0800
c61b8a9b18 Save map constants header based on the current map group data Marcus Huderle 2018-02-18 09:43:29 -0800
e4c5d53ffd Maintain master and working copies of data structures, to enable saving single maps at a time Marcus Huderle 2018-02-17 20:41:15 -0800
17e5892cd4 Save map groups file Marcus Huderle 2018-02-17 16:29:38 -0800
43e15dfb0e Save collateral files when creating a new map Marcus Huderle 2018-02-17 16:07:19 -0800
bcc74b4461 Add newly created map into global mapAttributes map Marcus Huderle 2018-02-17 15:16:42 -0800
a9d71d15f8 Save all map attributes to _assets file Marcus Huderle 2018-02-17 14:50:20 -0800
50fc906971 Parse all map attributes from _assets into memory Marcus Huderle 2018-02-17 13:00:15 -0800
5c0f628f0d Build new maps in memory, rather than immediately writing to files Marcus Huderle 2018-02-15 20:15:25 -0800
40a0fbee02 Load and save the gMapAttributes array Marcus Huderle 2018-02-15 18:38:19 -0800
f6cb002592 Write files on add map functionality. Still need to address gMapGroups Marcus Huderle 2018-02-14 22:31:23 -0800
3fcad085c3 Add new map to group that was selected (UI functionality only) Marcus Huderle 2018-02-14 20:33:55 -0800
794b814c47 Add right-click context menu for map groups Marcus Huderle 2018-02-13 21:01:16 -0800
7f761a5051

Merge pull request #3 from huderlem/maps yenatch 2018-02-12 21:53:19 -0500
d7700b1791 Fix crash that was caused by out-of-bounds metatile tiles Marcus Huderle 2018-02-12 16:20:41 -0800
631dac5839 Add Qt Creator .autosave files to .gitignore Marcus Huderle 2018-02-12 13:53:38 -0800
9274796d65 Support bg_secret_base_event Marcus Huderle 2018-02-12 13:47:50 -0800
c3d0769967 Support bg_hidden_item_event Marcus Huderle 2018-02-12 13:29:45 -0800
22722f09c7 Support coord_event_weather Marcus Huderle 2018-02-12 13:12:47 -0800
7594fbf3ed Only write out a map event label if there are actually events to write for its section. Otherwise, you end up writing invalid labels to file, such as '0x0'. Marcus Huderle 2018-02-12 09:21:44 -0800
0e268f9ede Fix warp map destinations (both loading and saving) Marcus Huderle 2018-02-12 09:20:18 -0800
d7756865a9 Fix map connections. Marcus Huderle 2018-02-12 08:42:01 -0800
0452156372

Merge pull request #2 from huderlem/filepaths yenatch 2018-02-12 01:10:27 -0500
a38528afa3 Fix filepaths for map object gfx data Marcus Huderle 2018-02-11 19:25:25 -0800
07fa705b03 Fix reading map obj gfx constants Marcus Huderle 2018-02-11 19:20:29 -0800