porymap

atiran/porymap

Fork 0

Commit graph

322238c7b8 Add metatile layer item Marcus Huderle 2018-09-30 16:15:04 -0500
ffd769f7ed Add palette and flip selectors to tileset editor Marcus Huderle 2018-09-30 14:54:38 -0500
9f55dbfa23 Merge branch 'master' of github.com:huderlem/porymap Diegoisawesome 2018-09-30 13:59:27 -0500
f767d257f0 Start work on tileset editor Diegoisawesome 2018-09-30 13:51:50 -0500
0bc3513b15 Add tile selector to Tileset Editor window Marcus Huderle 2018-09-30 12:33:58 -0500
990a4aafb7 Add metatile selector in tileset editor window Marcus Huderle 2018-09-29 15:24:35 -0500
9abda07c48 Add Tileset Editor window Marcus Huderle 2018-09-29 14:13:07 -0500
866926daa5

Merge pull request #40 from Diegoisawesome/master Marcus Huderle 2018-09-29 09:24:19 -0500
fe12e0bde5 Scroll map list to current map Marcus Huderle 2018-09-29 09:22:50 -0500
7e6726bef7 Round zoom number display to 1 decimal place Marcus Huderle 2018-09-29 09:13:54 -0500
497f069d20 Restructure source tree Marcus Huderle 2018-09-29 09:10:23 -0500
d7c98c1e3c Remove accidentally-added files Marcus Huderle 2018-09-29 08:59:47 -0500
02fd5bbea6 Merge branch 'master' into refactor Diegoisawesome 2018-09-27 13:27:57 -0500
d93d7c26fe Finish renaming ObjectPropertiesFrame Diegoisawesome 2018-09-27 11:23:40 -0500
c3264b5202 Fix double-clicking on group crash Diegoisawesome 2018-09-27 10:47:05 -0500
88d1ea846a Fix zoom functionality, change shortcuts Diegoisawesome 2018-09-27 01:14:07 -0500
6102181738 Move files into src/ Marcus Huderle 2018-09-26 18:33:08 -0500
911ba64637 Move more ui out of editor Marcus Huderle 2018-09-26 18:30:05 -0500
ecf9e533d4 Move status bar messages out of Map class Marcus Huderle 2018-09-26 11:38:39 -0500
06720258f9 Extract image providers Marcus Huderle 2018-09-25 18:13:33 -0500
afc25805d3 Clean up mainwindow initialization Marcus Huderle 2018-09-24 19:46:09 -0500
083e8e6101 Move heal location logic out of event class Marcus Huderle 2018-09-24 19:21:10 -0500
0d33c3aa64 Move event to core/ Marcus Huderle 2018-09-24 19:12:29 -0500
56499411b1 Move parseutil to core/, and fix include paths during build Marcus Huderle 2018-09-24 19:04:42 -0500
473cca4eee Rename objectpropertiesframe to eventpropertiesframe and move to ui/ Marcus Huderle 2018-09-24 18:55:58 -0500
45f5024d11 Move more custom widgets to ui/ Marcus Huderle 2018-09-24 18:49:44 -0500
d61d33f47f Rename Connection to MapConnection and move to core Marcus Huderle 2018-09-24 11:02:50 -0500
24e79eb94e Move History and HistoryItem to core/ Marcus Huderle 2018-09-24 10:48:36 -0500
262c79776e Create new MetatileSelector class and integrate it. Marcus Huderle 2018-09-23 16:32:07 -0500
113035fa93 Fix bug where selection top-left corner was not calculated correctly Marcus Huderle 2018-09-22 19:20:12 -0500
6dc1e0eea3 Start refactoring core + ui. Create selectable pixmap item Marcus Huderle 2018-09-22 18:47:28 -0500
823c99827d Merge remote-tracking branch 'upstream/master' garak 2018-09-21 12:45:40 -0400
f6f4b4024a Placeholder tile for primary layer when requesting out-of-bounds tile Diegoisawesome 2018-09-21 11:00:23 -0500
4afdd43487

Merge 730718e432 into 3808750c23 garak 2018-09-20 20:35:57 +0000
730718e432 CTRL + scroll to zoom maps garak 2018-09-20 16:35:33 -0400
b8836aa381 scroll mapList view to current map garak 2018-09-20 15:27:57 -0400
fe9ebe6b73 Merge remote-tracking branch 'upstream/master' into bugs-1 garak 2018-09-20 00:49:34 -0400
20b1836ced closeProject() (#34 & #35) garak 2018-09-20 00:45:11 -0400
d7641b4e9f fix map zoom bug, move scale to project garak 2018-09-19 23:05:07 -0400
3808750c23

Merge pull request #38 from Diegoisawesome/master Marcus Huderle 2018-09-19 17:32:00 -0500
dfce28d5ff fix map group double click segfault garak 2018-09-19 16:12:21 -0400
cf89d07192 Merge branch 'master2' Diegoisawesome 2018-09-19 12:36:25 -0500
363ea86a2a Move static tileset vars to Project Diegoisawesome 2018-09-19 12:35:45 -0500
d0aabdbba1 Use application display name Diegoisawesome 2018-09-19 12:09:11 -0500
a6fc81ae1a Use project values for tilesets Diegoisawesome 2018-09-18 13:18:12 -0500
741619a934 Merge remote-tracking branch 'huderlem/master' garak 2018-09-18 13:13:19 -0400
d66b3868ca

Merge pull request #36 from Diegoisawesome/master Marcus Huderle 2018-09-18 08:36:32 -0500
3b61b1af0b Visual tweaks Diegoisawesome 2018-09-18 00:05:29 -0500
ef657628fa Fix segfault if metatile count != metatile attrs count Diegoisawesome 2018-09-17 14:23:25 -0500
43eeffcf75 Fix comment Marcus Huderle 2018-09-16 11:57:16 -0500
23f2016e26 Update tileset image palette processing, to accompany RGB-indexed images, rather than greyscale Marcus Huderle 2018-09-16 11:21:53 -0500
b3a30c91ae Properly read dynamically-set warps that use MAP_NONE as their destination Marcus Huderle 2018-09-15 15:25:34 -0500
80370fdd16 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 20:09:39 -0400
a2d95bfc72 Fix more warnings Marcus Huderle 2018-09-14 18:37:44 -0500
0b07ea63cb Fix memory leak when going back in edit/undo history Marcus Huderle 2018-09-14 18:37:41 -0500
0b8c71119d Fix warnings Marcus Huderle 2018-09-14 18:37:36 -0500
c612140878

Merge pull request #32 from garakmon/rebranding Marcus Huderle 2018-09-14 17:55:47 -0500
459c5e836c Merge remote-tracking branch 'origin/master' into rebranding Marcus Huderle 2018-09-14 12:32:56 -0500
b6da1bc233 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 11:21:11 -0400
afb5586b36 delete line garak 2018-09-14 10:39:00 -0400
3ec5ff07f9

Merge fd677b1dc2 into 9916295e41 Deokishisu 2018-09-14 14:15:58 +0000
9916295e41

Create LICENSE.md Marcus Huderle 2018-09-14 08:44:21 -0500
5c73efc738 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 01:34:54 -0400
fd677b1dc2

Update Readme.md Deokishisu 2018-09-13 22:42:25 -0400
6131194065 Add keyboard shortcuts for each of the editing tool buttons Marcus Huderle 2018-09-13 17:48:43 -0500
fa2574ad48 Add cursor for 'shift' mode Marcus Huderle 2018-09-13 17:48:40 -0500
ab0eff8c20 Shift tool, shift+click for smart paths, middle button click for fill, and toggle border/connections visibility Marcus Huderle 2018-09-13 17:48:32 -0500
6d19da8d88

Merge pull request #25 from garakmon/cursors Marcus Huderle 2018-09-13 17:02:22 -0500
0932ce6711 Change text to 'Cursor Icons' Marcus Huderle 2018-09-13 17:01:49 -0500
532afc5385 Merge remote-tracking branch 'origin/master' into cursors Marcus Huderle 2018-09-13 16:54:16 -0500
4313662200

Merge pull request #24 from garakmon/open-scripts Marcus Huderle 2018-09-13 16:41:38 -0500
b0e7364349 pretmap -> porymap, add icon v1 garak 2018-09-12 22:10:28 -0400
475f63d0f2 small fix garak 2018-09-12 21:10:11 -0400
ece612a865 using different cursors is checkable and added to settings garak 2018-09-12 20:43:04 -0400
62b9d97a31 Smart path now draws a 2x2 region, instead of 3x3 region Marcus Huderle 2018-09-12 17:44:40 -0500
2a00e8aee9 Fix bug when saving heal locations for maps with multiple heal locations Marcus Huderle 2018-09-12 17:44:37 -0500
23efdc2bea Support spritesheets instead of individual frames for event object pics Marcus Huderle 2018-09-12 17:44:30 -0500
5e42b07bff

Merge pull request #22 from garakmon/heal Marcus Huderle 2018-09-12 09:39:55 -0500
e0e8dc321f

Merge pull request #23 from garakmon/warp-id Marcus Huderle 2018-09-12 09:21:32 -0500
65adc2bdd0 Use Qt built-in functionality for opening scripts with default editor Marcus Huderle 2018-09-12 09:17:50 -0500
5b96af47db Add reticule-styled cursors Marcus Huderle 2018-09-12 08:52:24 -0500
f5f763d32c add move drag mode with changing cursor garak 2018-09-11 20:52:57 -0400
378d5bb660 Open Map Scripts button garak 2018-09-11 20:41:58 -0400
d7f04568ec zero-base index warps garak 2018-09-11 20:39:41 -0400
67f7fca399 add HealLocation fly spots garak 2018-09-11 20:37:36 -0400
d3bfd9a7ba

Merge pull request #3 from yenatch/master v1.0.3 Garak 2018-07-29 17:22:36 -0400
6f3c5c25dd

Merge pull request #61 from huderlem/master yenatch 2018-07-21 13:39:37 -0400
95bb802ad0 Fix bug where right-click selecting from the map would cause a map commit Marcus Huderle 2018-07-19 22:49:27 -0500
6b5ad53733 Rename Block to Metatile Marcus Huderle 2018-07-19 22:44:55 -0500
6546bcbbd4 Fix memory leak when caching various Layout Blockdata sets Marcus Huderle 2018-07-19 22:37:24 -0500
21af92b856 Update collision/elevation selection Marcus Huderle 2018-07-19 22:27:40 -0500
de9bfaa9bb Add ability to select metatile chunks directly from the map area. Redraw collision tiles during undo/redo Marcus Huderle 2018-07-15 09:05:08 -0500
019a597c28 emerald uses one more secondary tileset palette slot than ruby Marcus Huderle 2018-07-14 08:50:36 -0500
9b44850f28

Merge pull request #58 from garakmon/master Marcus Huderle 2018-07-13 19:19:50 -0700
8902102b2c

Merge pull request #2 from yenatch/master v1.0.2 Garak 2018-07-13 21:48:50 -0400
f86cf26d6e

Merge pull request #57 from huderlem/dropdowns Marcus Huderle 2018-07-13 18:44:08 -0700
b05c59bfd8 Better default values for newly-created events Marcus Huderle 2018-07-13 20:39:07 -0500
fba2ade2bb Provide populated comboboxes and tooltips for (mostly) everything Marcus Huderle 2018-07-13 20:33:49 -0500
74c2766c01 Double clicking on warp events takes you to the destination map and warp Marcus Huderle 2018-07-11 17:53:43 -0500
dc6b82b4dc Disable combobox scroll hijacking, and only show one event by default (rather than all) Marcus Huderle 2018-07-11 13:18:50 -0500