Commit Graph

  • *
  • |\
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • |\ \
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • | * |
  • | * |
  • |/ /
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • |/
  • *
  • |\
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • |/
  • *
  • *
  • |\
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • | *
  • * |
  • |\ \
  • | * |
  • |/ /
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • * |
  • |\ \
  • | | *
  • | | *
  • | * |
  • |/ /
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • 9b44850 (HEAD -> master) Merge pull request #58 from garakmon/master by Marcus Huderle 2018-07-13 19:19:50 -0700
  • 8902102 Merge pull request #2 from yenatch/master by Garak 2018-07-13 21:48:50 -0400
  • f86cf26 Merge pull request #57 from huderlem/dropdowns by Marcus Huderle 2018-07-13 18:44:08 -0700
  • b05c59b Better default values for newly-created events by Marcus Huderle 2018-07-13 20:39:07 -0500
  • fba2ade Provide populated comboboxes and tooltips for (mostly) everything by Marcus Huderle 2018-07-13 20:33:49 -0500
  • 74c2766 Double clicking on warp events takes you to the destination map and warp by Marcus Huderle 2018-07-11 17:53:43 -0500
  • dc6b82b Disable combobox scroll hijacking, and only show one event by default (rather than all) by Marcus Huderle 2018-07-11 13:18:50 -0500
  • 8930b2c Prepopulate more dropdowns, and support new macro formats by Marcus Huderle 2018-07-11 11:23:55 -0500
  • 52679eb Merge pull request #55 from huderlem/resize by yenatch 2018-07-09 22:23:01 -0400
  • 43119f2 Merge pull request #1 from yenatch/master by Garak 2018-07-09 20:51:08 -0400
  • c1306b4 Fix segfault due to dangling event object by Marcus Huderle 2018-07-09 18:12:43 -0500
  • 6409582 Make flood fill respect whole metatile selection, including smart path. Smart path is now a checkbox by Marcus Huderle 2018-07-09 17:40:37 -0500
  • aafe258 Respect map dimension changes in undo/redo history by Marcus Huderle 2018-07-09 17:40:34 -0500
  • 37903a5 Fix bug where map connections didn't visually update when switching back to the collision view by Marcus Huderle 2018-07-09 17:40:31 -0500
  • 514ecb2 Add map resizing functionality by Marcus Huderle 2018-07-09 17:40:28 -0500
  • eb0d238 Add map dimensions dialog window by Marcus Huderle 2018-07-09 17:40:15 -0500
  • 8d2958c Merge pull request #54 from huderlem/tilesets by yenatch 2018-07-08 19:05:53 -0400
  • 48a562d Update map view when tilesets change by Marcus Huderle 2018-07-08 11:17:43 -0500
  • 37529d3 Add tileset comboboxes, and make metatile area scrollable by Marcus Huderle 2018-07-08 10:29:03 -0500
  • 767407e Merge pull request #53 from huderlem/border by yenatch 2018-07-07 19:35:50 -0400
  • 5bd88e6 Add ability to change map border by Marcus Huderle 2018-07-07 17:32:54 -0500
  • 10b6d3a Merge pull request #52 from huderlem/events by yenatch 2018-07-07 15:11:38 -0400
  • a9325fc Dynamically set event labels by Marcus Huderle 2018-07-07 11:57:44 -0500
  • fc0cf13 Bind to all event combobox value changes by Marcus Huderle 2018-07-07 11:21:19 -0500
  • ecce7d2 Add ability to add all map event types by Marcus Huderle 2018-07-07 10:58:25 -0500
  • 76649ea Add menu to 'add event' button by Marcus Huderle 2018-07-06 11:08:20 -0500
  • f227805 fixing build errors by garakmon 2018-06-25 10:25:39 -0400
  • 9c2cf84 Merge pull request #50 from huderlem/layouts by yenatch 2018-06-21 10:28:30 -0400
  • 2567254 MUS_ prefix instead of BGM_ by Marcus Huderle 2018-06-20 17:43:26 -0500
  • a2b42de Support new map layouts structure by Marcus Huderle 2018-06-20 17:43:20 -0500
  • 39abd40 Merge pull request #49 from huderlem/object_event_macro by yenatch 2018-06-16 19:56:50 -0400
  • a89dc22 Update parsing of new object_event macro by Marcus Huderle 2018-06-14 22:01:00 -0500
  • ddb832d Merge pull request #48 from huderlem/fixpath by yenatch 2018-06-05 23:35:47 -0400
  • 3ed27ba Update filepaths and var names from 'map_object' -> 'event_object' by Marcus Huderle 2018-06-05 17:06:14 -0500
  • 4a2c2e4 Merge pull request #45 from huderlem/fixpath by yenatch 2018-03-20 19:40:05 -0400
  • a113651 Fix event_object_movement.c filepath to account for new pokeruby directory structure by Marcus Huderle 2018-03-19 18:15:29 -0700
  • aaae867 Redraw the map when switching to collision editing by yenatch 2018-03-18 23:48:38 -0400
  • 45d3e93 Merge pull request #40 from huderlem/connect by yenatch 2018-03-18 23:13:52 -0400
  • 4280735 Merge remote-tracking branch 'origin/master' into connect by yenatch 2018-03-18 22:57:01 -0400
  • 7f74b3b (connect) Need to include QMap in parseutil.h by yenatch 2018-03-18 21:30:12 -0400
  • ae4158c Fix offset value when selecting another connection by yenatch 2018-03-18 21:28:52 -0400
  • 8c80e44 Merge pull request #41 from huderlem/fixtilesets by yenatch 2018-03-16 00:15:54 -0400
  • 69c84a6 Properly support painting tiles from secondary tileset by Marcus Huderle 2018-03-13 20:07:16 -0700
  • 9533042 Support 'mirror' editing for dive and emerge connections by Marcus Huderle 2018-03-12 21:52:58 -0700
  • 1a10eac Support 'mirror' connection editing. Can be toggled off via checkbox by Marcus Huderle 2018-03-12 20:51:27 -0700
  • ad7b9ca Some cleanup, and disable connection controls when loading map with no connections by Marcus Huderle 2018-03-11 15:59:21 -0700
  • dec99c8 Fix bug where saving shared map assets wouldn't work by Marcus Huderle 2018-03-11 15:21:01 -0700
  • bd2c782 Double-clicking on a connection will load the destination map by Marcus Huderle 2018-03-11 14:20:52 -0700
  • f47e3bf Limit connection offsets to reasonable values by Marcus Huderle 2018-03-11 14:01:29 -0700
  • 9b0f686 Properly support saving map connections by Marcus Huderle 2018-03-11 13:33:08 -0700
  • 6f71c15 Add dive/emerge map pickers by Marcus Huderle 2018-03-10 11:25:34 -0800
  • aa69492 Merge pull request #39 from huderlem/fixMovement by yenatch 2018-03-10 14:11:51 -0500
  • 5301b29 Support adding/removing connections via buttons by Marcus Huderle 2018-03-10 10:09:19 -0800
  • 9a61323 Support multiple connections in same direction, and darken non-selected connections by Marcus Huderle 2018-03-09 23:26:44 -0800
  • 562edc5 Fix collision and elevation selections by Marcus Huderle 2018-03-10 00:17:50 -0800
  • 8df2a86 Fixup connection graphicswindow dimensions by Marcus Huderle 2018-03-08 22:35:16 -0800
  • 2b5da0e Use same graphicswindow format as Map tab by Marcus Huderle 2018-03-08 22:34:51 -0800
  • c553980 Properly remove connections by Marcus Huderle 2018-03-08 21:26:40 -0800
  • 1e8d1d9 Hide connection editor when switching tabs by Marcus Huderle 2018-03-08 21:18:00 -0800
  • c00d83d Support changing connection maps, adding new connections, and removing connections by Marcus Huderle 2018-03-08 20:34:04 -0800
  • 073a13a Save connections to file by Marcus Huderle 2018-03-07 21:05:35 -0800
  • 64007b5 Add basic drop-and-drop connection editing by Marcus Huderle 2018-03-07 20:22:18 -0800
  • e2933fc Add connections tab by Marcus Huderle 2018-03-06 16:02:08 -0800
  • 997bfe7 Merge pull request #28 from huderlem/multiblock by yenatch 2018-03-06 01:50:40 -0500
  • e485f23 Add smart path painting by Marcus Huderle 2018-03-05 16:47:00 -0800
  • 940fb1b Support multi-block painting by Marcus Huderle 2018-03-05 14:47:46 -0800
  • 6cb394e Merge pull request #26 from huderlem/exportpic by yenatch 2018-03-04 22:07:18 -0500
  • 6112b27 Add 'export map image' action to File menu by Marcus Huderle 2018-03-04 18:11:59 -0800
  • d667a0c Merge pull request #25 from huderlem/grid by yenatch 2018-03-04 21:37:48 -0500
  • eeaa347 Add checkbox to toggle grid lines by Marcus Huderle 2018-03-04 16:20:18 -0800
  • 47ce60c Display grid lines on map editor by Marcus Huderle 2018-03-04 16:07:52 -0800
  • 6bb945d Merge pull request #24 from huderlem/coords by yenatch 2018-03-04 15:12:59 -0500
  • 2dfcab7 Allow collision and elevation tiles to handle hover events individually by Marcus Huderle 2018-03-04 10:49:44 -0800
  • 4f838b9 Display hovered block selection in status bar by Marcus Huderle 2018-03-04 10:19:03 -0800
  • f81ab69 Display hovered tile coords and block in status bar by Marcus Huderle 2018-03-04 00:09:34 -0800
  • 470fc92 Merge pull request #23 from huderlem/items by yenatch 2018-03-03 21:03:13 -0500
  • af4dc34 Evaluate C define expressions using postfix evaluation, and rename 'asm' to 'parseutil' by Marcus Huderle 2018-03-03 17:09:05 -0800
  • d87d5e6 Remove the reverse song constant lookup by Marcus Huderle 2018-03-03 12:20:59 -0800
  • 669c81b Populate flag and var dropdown menus with their respective constants by Marcus Huderle 2018-03-02 21:54:08 -0800
  • 2bc9496 Populate hidden item dropdown menu with item constants by Marcus Huderle 2018-03-02 19:56:23 -0800
  • 38360de Update map object filepath by Marcus Huderle 2018-03-02 19:55:55 -0800
  • ce49e78 Merge pull request #20 from huderlem/maps by yenatch 2018-02-18 17:14:54 -0500
  • b39f44c Small cleanup by Marcus Huderle 2018-02-18 10:32:30 -0800
  • c61b8a9 Save map constants header based on the current map group data by Marcus Huderle 2018-02-18 09:43:29 -0800
  • e4c5d53 Maintain master and working copies of data structures, to enable saving single maps at a time by Marcus Huderle 2018-02-17 20:41:15 -0800
  • 17e5892 Save map groups file by Marcus Huderle 2018-02-17 16:29:38 -0800
  • 43e15df Save collateral files when creating a new map by Marcus Huderle 2018-02-17 16:07:19 -0800
  • bcc74b4 Add newly created map into global mapAttributes map by Marcus Huderle 2018-02-17 15:16:42 -0800
  • a9d71d1 Save all map attributes to _assets file by Marcus Huderle 2018-02-17 14:50:20 -0800
  • 50fc906 Parse all map attributes from _assets into memory by Marcus Huderle 2018-02-17 13:00:15 -0800
  • 5c0f628 Build new maps in memory, rather than immediately writing to files by Marcus Huderle 2018-02-15 20:15:25 -0800
  • 40a0fbe Load and save the gMapAttributes array by Marcus Huderle 2018-02-15 18:38:19 -0800
  • f6cb002 Write files on add map functionality. Still need to address gMapGroups by Marcus Huderle 2018-02-14 22:31:23 -0800
  • 3fcad08 Add new map to group that was selected (UI functionality only) by Marcus Huderle 2018-02-14 20:33:55 -0800
  • 794b814 Add right-click context menu for map groups by Marcus Huderle 2018-02-13 21:01:16 -0800
  • 7f761a5 Merge pull request #3 from huderlem/maps by yenatch 2018-02-12 21:53:19 -0500
  • d7700b1 Fix crash that was caused by out-of-bounds metatile tiles by Marcus Huderle 2018-02-12 16:20:41 -0800
  • 631dac5 Add Qt Creator .autosave files to .gitignore by Marcus Huderle 2018-02-12 13:53:38 -0800
  • 9274796 Support bg_secret_base_event by Marcus Huderle 2018-02-12 13:47:50 -0800
  • c3d0769 Support bg_hidden_item_event by Marcus Huderle 2018-02-12 13:29:45 -0800