mirror of https://github.com/huderlem/porymap.git synced 2026-09-25 09:15:34 -05:00

Go to file

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

resources

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

.gitignore

Add Qt Creator .autosave files to .gitignore

2018-02-12 13:53:38 -08:00

block.cpp

Initial commit

2016-09-29 02:35:29 -04:00

block.h

Initial commit

2016-09-29 02:35:29 -04:00

blockdata.cpp

lots of changes

2018-02-11 14:34:09 -05:00

blockdata.h

Fix memory leak when caching various Layout Blockdata sets

2018-07-19 22:37:24 -05:00

editor.cpp

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

editor.h

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

event.cpp

Support spritesheets instead of individual frames for event object pics

2018-09-12 17:44:30 -05:00

event.h

Support spritesheets instead of individual frames for event object pics

2018-09-12 17:44:30 -05:00

graphicsview.cpp

Disable combobox scroll hijacking, and only show one event by default (rather than all)

2018-07-11 15:20:33 -05:00

graphicsview.h

Support changing connection maps, adding new connections, and removing connections

2018-03-08 20:34:04 -08:00

heallocation.cpp

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

heallocation.h

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

main.cpp

Small cleanup

2018-02-18 10:32:30 -08:00

mainwindow.cpp

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

mainwindow.h

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

mainwindow.ui

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

map.cpp

add move drag mode with changing cursor

2018-09-11 20:52:57 -04:00

map.h

Merge remote-tracking branch 'origin/master' into cursors

2018-09-13 16:54:16 -05:00

neweventtoolbutton.cpp

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

neweventtoolbutton.h

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

noscrollcombobox.cpp

Disable combobox scroll hijacking, and only show one event by default (rather than all)

2018-07-11 15:20:33 -05:00

noscrollcombobox.h

Disable combobox scroll hijacking, and only show one event by default (rather than all)

2018-07-11 15:20:33 -05:00

noscrollspinbox.cpp

Disable combobox scroll hijacking, and only show one event by default (rather than all)

2018-07-11 15:20:33 -05:00

noscrollspinbox.h

Disable combobox scroll hijacking, and only show one event by default (rather than all)

2018-07-11 15:20:33 -05:00

objectpropertiesframe.cpp

lots of changes

2018-02-11 14:34:09 -05:00

objectpropertiesframe.h

lots of changes

2018-02-11 14:34:09 -05:00

objectpropertiesframe.ui

Provide populated comboboxes and tooltips for (mostly) everything

2018-07-13 20:33:49 -05:00

parseutil.cpp

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

parseutil.h

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

pretmap.pro

add HealLocation fly spots

2018-09-11 20:37:36 -04:00

project.cpp

Fix bug when saving heal locations for maps with multiple heal locations

2018-09-12 17:44:37 -05:00

project.h

Fix bug when saving heal locations for maps with multiple heal locations

2018-09-12 17:44:37 -05:00

README.md

readme

2018-02-11 14:34:12 -05:00

tile.cpp

Initial commit

2016-09-29 02:35:29 -04:00

tile.h

Initial commit

2016-09-29 02:35:29 -04:00

tileset.cpp

emerald uses one more secondary tileset palette slot than ruby

2018-07-14 08:50:36 -05:00

tileset.h

Add ability to change map border

2018-07-07 17:32:54 -05:00

README.md

pretmap

A map editor for pokeruby using Qt.