Marcus Huderle
|
d66b3868ca
|
Merge pull request #36 from Diegoisawesome/master
Bugfix and visual tweaks
|
2018-09-18 08:36:32 -05:00 |
|
Diegoisawesome
|
3b61b1af0b
|
Visual tweaks
|
2018-09-18 00:05:29 -05:00 |
|
Diegoisawesome
|
ef657628fa
|
Fix segfault if metatile count != metatile attrs count
|
2018-09-17 14:23:25 -05:00 |
|
Marcus Huderle
|
43eeffcf75
|
Fix comment
|
2018-09-16 11:57:16 -05:00 |
|
Marcus Huderle
|
23f2016e26
|
Update tileset image palette processing, to accompany RGB-indexed images, rather than greyscale
|
2018-09-16 11:21:53 -05:00 |
|
Marcus Huderle
|
b3a30c91ae
|
Properly read dynamically-set warps that use MAP_NONE as their destination
|
2018-09-15 15:25:34 -05:00 |
|
Marcus Huderle
|
a2d95bfc72
|
Fix more warnings
|
2018-09-14 18:37:44 -05:00 |
|
Marcus Huderle
|
0b07ea63cb
|
Fix memory leak when going back in edit/undo history
|
2018-09-14 18:37:41 -05:00 |
|
Marcus Huderle
|
0b8c71119d
|
Fix warnings
|
2018-09-14 18:37:36 -05:00 |
|
Marcus Huderle
|
c612140878
|
Merge pull request #32 from garakmon/rebranding
Rebranding
|
2018-09-14 17:55:47 -05:00 |
|
Marcus Huderle
|
459c5e836c
|
Merge remote-tracking branch 'origin/master' into rebranding
|
2018-09-14 12:32:56 -05:00 |
|
garak
|
afb5586b36
|
delete line
|
2018-09-14 10:39:00 -04:00 |
|
Marcus Huderle
|
9916295e41
|
Create LICENSE.md
|
2018-09-14 08:44:21 -05:00 |
|
Marcus Huderle
|
6131194065
|
Add keyboard shortcuts for each of the editing tool buttons
|
2018-09-13 17:48:43 -05:00 |
|
Marcus Huderle
|
fa2574ad48
|
Add cursor for 'shift' mode
|
2018-09-13 17:48:40 -05:00 |
|
Marcus Huderle
|
ab0eff8c20
|
Shift tool, shift+click for smart paths, middle button click for fill, and toggle border/connections visibility
|
2018-09-13 17:48:32 -05:00 |
|
Marcus Huderle
|
6d19da8d88
|
Merge pull request #25 from garakmon/cursors
Cursor update
|
2018-09-13 17:02:22 -05:00 |
|
Marcus Huderle
|
0932ce6711
|
Change text to 'Cursor Icons'
|
2018-09-13 17:01:49 -05:00 |
|
Marcus Huderle
|
532afc5385
|
Merge remote-tracking branch 'origin/master' into cursors
# Conflicts:
# mainwindow.cpp
# mainwindow.h
# mainwindow.ui
|
2018-09-13 16:54:16 -05:00 |
|
Marcus Huderle
|
4313662200
|
Merge pull request #24 from garakmon/open-scripts
"Open Map Scripts" button
|
2018-09-13 16:41:38 -05:00 |
|
garak
|
b0e7364349
|
pretmap -> porymap, add icon v1
|
2018-09-12 22:10:28 -04:00 |
|
garak
|
475f63d0f2
|
small fix
|
2018-09-12 21:10:11 -04:00 |
|
garak
|
ece612a865
|
using different cursors is checkable and added to settings
|
2018-09-12 20:43:04 -04:00 |
|
Marcus Huderle
|
62b9d97a31
|
Smart path now draws a 2x2 region, instead of 3x3 region
|
2018-09-12 17:44:40 -05:00 |
|
Marcus Huderle
|
2a00e8aee9
|
Fix bug when saving heal locations for maps with multiple heal locations
|
2018-09-12 17:44:37 -05:00 |
|
Marcus Huderle
|
23efdc2bea
|
Support spritesheets instead of individual frames for event object pics
|
2018-09-12 17:44:30 -05:00 |
|
Marcus Huderle
|
5e42b07bff
|
Merge pull request #22 from garakmon/heal
Add HealLocation Event
|
2018-09-12 09:39:55 -05:00 |
|
Marcus Huderle
|
e0e8dc321f
|
Merge pull request #23 from garakmon/warp-id
Warp events to use zero-based indexing
|
2018-09-12 09:21:32 -05:00 |
|
Marcus Huderle
|
65adc2bdd0
|
Use Qt built-in functionality for opening scripts with default editor
|
2018-09-12 09:17:50 -05:00 |
|
Marcus Huderle
|
5b96af47db
|
Add reticule-styled cursors
|
2018-09-12 08:52:24 -05:00 |
|
garak
|
f5f763d32c
|
add move drag mode with changing cursor
|
2018-09-11 20:52:57 -04:00 |
|
garak
|
378d5bb660
|
Open Map Scripts button
|
2018-09-11 20:41:58 -04:00 |
|
garak
|
d7f04568ec
|
zero-base index warps
|
2018-09-11 20:39:41 -04:00 |
|
garak
|
67f7fca399
|
add HealLocation fly spots
|
2018-09-11 20:37:36 -04:00 |
|
yenatch
|
6f3c5c25dd
|
Merge pull request #61 from huderlem/master
Efficient map editing
|
2018-07-21 13:39:37 -04:00 |
|
Marcus Huderle
|
95bb802ad0
|
Fix bug where right-click selecting from the map would cause a map commit
|
2018-07-19 22:58:33 -05:00 |
|
Marcus Huderle
|
6b5ad53733
|
Rename Block to Metatile
|
2018-07-19 22:44:55 -05:00 |
|
Marcus Huderle
|
6546bcbbd4
|
Fix memory leak when caching various Layout Blockdata sets
|
2018-07-19 22:37:24 -05:00 |
|
Marcus Huderle
|
21af92b856
|
Update collision/elevation selection
|
2018-07-19 22:27:40 -05:00 |
|
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 |
|