Marcus Huderle
|
de9bfaa9bb
|
Add ability to select metatile chunks directly from the map area. Redraw collision tiles during undo/redo
|
2018-07-15 09:05:08 -05:00 |
|
Marcus Huderle
|
019a597c28
|
emerald uses one more secondary tileset palette slot than ruby
|
2018-07-14 08:50:36 -05:00 |
|
Marcus Huderle
|
9b44850f28
|
Merge pull request #58 from garakmon/master
macOS build fixes
|
2018-07-13 19:19:50 -07:00 |
|
Garak
|
8902102b2c
|
Merge pull request #2 from yenatch/master
syncing with source
|
2018-07-13 21:48:50 -04:00 |
|
Marcus Huderle
|
f86cf26d6e
|
Merge pull request #57 from huderlem/dropdowns
Populated comboboxes and tooltips
|
2018-07-13 18:44:08 -07:00 |
|
Marcus Huderle
|
b05c59bfd8
|
Better default values for newly-created events
|
2018-07-13 20:39:07 -05:00 |
|
Marcus Huderle
|
fba2ade2bb
|
Provide populated comboboxes and tooltips for (mostly) everything
|
2018-07-13 20:33:49 -05:00 |
|
Marcus Huderle
|
74c2766c01
|
Double clicking on warp events takes you to the destination map and warp
|
2018-07-11 17:53:43 -05:00 |
|
Marcus Huderle
|
dc6b82b4dc
|
Disable combobox scroll hijacking, and only show one event by default (rather than all)
|
2018-07-11 15:20:33 -05:00 |
|
Marcus Huderle
|
8930b2c01b
|
Prepopulate more dropdowns, and support new macro formats
|
2018-07-11 11:23:55 -05:00 |
|
yenatch
|
52679eb53f
|
Merge pull request #55 from huderlem/resize
Map resizing and improved floodfill
|
2018-07-09 22:23:01 -04:00 |
|
Garak
|
43119f2b43
|
Merge pull request #1 from yenatch/master
sync with source
|
2018-07-09 20:51:08 -04:00 |
|
Marcus Huderle
|
c1306b4f72
|
Fix segfault due to dangling event object
|
2018-07-09 18:12:43 -05:00 |
|
Marcus Huderle
|
64095821af
|
Make flood fill respect whole metatile selection, including smart path. Smart path is now a checkbox
|
2018-07-09 17:40:37 -05:00 |
|
Marcus Huderle
|
aafe258842
|
Respect map dimension changes in undo/redo history
|
2018-07-09 17:40:34 -05:00 |
|
Marcus Huderle
|
37903a5acb
|
Fix bug where map connections didn't visually update when switching back to the collision view
|
2018-07-09 17:40:31 -05:00 |
|
Marcus Huderle
|
514ecb2907
|
Add map resizing functionality
|
2018-07-09 17:40:28 -05:00 |
|
Marcus Huderle
|
eb0d238a01
|
Add map dimensions dialog window
|
2018-07-09 17:40:15 -05:00 |
|
yenatch
|
8d2958c952
|
Merge pull request #54 from huderlem/tilesets
Allow changing map tilesets
|
2018-07-08 19:05:53 -04:00 |
|
Marcus Huderle
|
48a562d1eb
|
Update map view when tilesets change
|
2018-07-08 17:01:53 -05:00 |
|
Marcus Huderle
|
37529d37ec
|
Add tileset comboboxes, and make metatile area scrollable
|
2018-07-08 10:29:03 -05:00 |
|
yenatch
|
767407e1a7
|
Merge pull request #53 from huderlem/border
Add ability to change map border
|
2018-07-07 19:35:50 -04:00 |
|
Marcus Huderle
|
5bd88e6fef
|
Add ability to change map border
|
2018-07-07 17:32:54 -05:00 |
|
yenatch
|
10b6d3a0d3
|
Merge pull request #52 from huderlem/events
Events Editing
|
2018-07-07 15:11:38 -04:00 |
|
Marcus Huderle
|
a9325fc790
|
Dynamically set event labels
|
2018-07-07 12:07:36 -05:00 |
|
Marcus Huderle
|
fc0cf133b2
|
Bind to all event combobox value changes
|
2018-07-07 11:59:51 -05:00 |
|
Marcus Huderle
|
ecce7d26f2
|
Add ability to add all map event types
|
2018-07-07 11:59:47 -05:00 |
|
Marcus Huderle
|
76649ea867
|
Add menu to 'add event' button
|
2018-07-06 11:08:20 -05:00 |
|
garakmon
|
f227805b7f
|
fixing build errors
Are these only present on non-Windows computers?
|
2018-06-25 10:25:39 -04:00 |
|
yenatch
|
9c2cf84983
|
Merge pull request #50 from huderlem/layouts
Support new map organization
|
2018-06-21 10:28:30 -04:00 |
|
Marcus Huderle
|
2567254214
|
MUS_ prefix instead of BGM_
|
2018-06-20 17:43:26 -05:00 |
|
Marcus Huderle
|
a2b42de541
|
Support new map layouts structure
|
2018-06-20 17:43:20 -05:00 |
|
yenatch
|
39abd40ee0
|
Merge pull request #49 from huderlem/object_event_macro
Update parsing of new object_event macro
|
2018-06-16 19:56:50 -04:00 |
|
Marcus Huderle
|
a89dc22245
|
Update parsing of new object_event macro
|
2018-06-14 22:01:00 -05:00 |
|
yenatch
|
ddb832de0c
|
Merge pull request #48 from huderlem/fixpath
'Map Object' -> 'Event Object'
|
2018-06-05 23:35:47 -04:00 |
|
Marcus Huderle
|
3ed27ba5d3
|
Update filepaths and var names from 'map_object' -> 'event_object'
|
2018-06-05 17:06:14 -05:00 |
|
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 |
|