Commit graph

954 commits

Author SHA1 Message Date
garakmon
f57ef7a819 change main tab for every click 2020-04-26 16:18:25 -04:00
garakmon
9e883a8a2f remember edit mode in map tab 2020-04-26 16:18:25 -04:00
garakmon
7e039121bb fix mainwindow ui conflicts 2020-04-26 16:18:25 -04:00
garak
ccccb7cec0 fix bug with adding new widget to event frame outside of a paint event 2020-04-26 16:17:51 -04:00
garak
b5adbe782d extend most toolbuttons for use in event editing 2020-04-26 16:17:51 -04:00
garak
bf58549666 update midnight theme disabled widgets, disable some ui in event tab 2020-04-26 16:17:51 -04:00
garak
fa42beac1d update ui so that map and events tabs share widgets
- use a programmatically created QTabBar to switch between pages of stacked widget
- use stacked widget to display selected objects and metatiles frames
- remove unique map events tab

this gives access to the toolbuttons while editing events (not functional yet)
2020-04-26 16:17:51 -04:00
huderlem
c0674d9676
Merge pull request #200 from garakmon/closeproject
Fix Open Project & Monitor Changed Project Files
2020-04-25 16:28:02 -05:00
huderlem
d2ed1701bf
Update INSTALL.md 2020-04-25 16:27:12 -05:00
GriffinR
a3d10ef306 Set border visibility after redo/undo 2020-04-25 16:15:34 -05:00
Marcus Huderle
b9522c24f5 Centralize file-changed logic in the callback. Ignore watched files for 5 seconds, when saving them. On Windows, there is a fuzzy delay between the time a file is written and when the signal fires in Qt, and we can't rely on blocking signals or temporarily removing the watched filepaths. It also fires three or four duplicate times for a single file. 2020-04-25 16:11:14 -05:00
Marcus Huderle
5b26ba678b Remove qstringhash implementation needed by older versions of Qt 2020-04-24 19:21:09 -05:00
garak
52596ea38c
Merge pull request #209 from GriffinRichards/fix-ttype
Use first trainer type constant for new objects
2020-04-21 19:05:54 -04:00
GriffinR
d1853a576b Use first trainer type constant for new objects 2020-04-21 19:03:00 -04:00
garak
dba9d866d8
Merge pull request #208 from GriffinRichards/fix-frlg
Re-enable RSE-specific events when switching projects
2020-04-21 16:32:22 -04:00
GriffinR
1bd1db2a7d Re-enable RSE-specific events when switching projects 2020-04-21 16:31:24 -04:00
garakmon
b849ace6e2 fix mainwindow.ui action tag 2020-04-21 16:22:09 -04:00
garak
03082e5920
Merge branch 'master' into closeproject 2020-04-20 22:05:28 -04:00
garakmon
4d2fa5ee38 show file changed warning once at a time 2020-04-20 22:02:14 -04:00
garakmon
401d2e4884 let user change some config settings
- use encounter json
    - use poryscript
    - monitor files
2020-04-20 21:54:20 -04:00
Marcus Huderle
f07422585b Fix typo 2020-04-20 20:29:07 -05:00
Marcus Huderle
bb6dbedabf Add ability to export map stitch images. 2020-04-20 20:29:07 -05:00
garakmon
800d584eb5 update icon 2020-04-20 20:18:24 -04:00
GriffinR
141f0fa773 Fix adding new mapsec regression 2020-04-20 17:45:34 -05:00
GriffinR
1b3d4a44e0 Forbid . and - in new tileset names 2020-04-20 17:39:31 -05:00
garak
4a23c90695
Merge pull request #205 from garakmon/encord
use ordered map for wild encounter json
2020-04-20 14:27:47 -04:00
garakmon
05fe994e32 update changelog 2020-04-20 14:26:16 -04:00
garakmon
df8dac965f move fileWatcher signals to project class, block when saving 2020-04-20 14:08:32 -04:00
garakmon
96a870552e monitor files for changes
- add fileWatcher to project that monitors changes to most files
      (except map and layout json files)
    - add config setting whether to monitor files for changes (monitor_files)
2020-04-20 14:07:06 -04:00
garakmon
6026266afd add File>Reload Project 2020-04-20 14:07:06 -04:00
garakmon
ca5a0247f7 delete project with editor 2020-04-20 14:07:06 -04:00
garakmon
0e9deff4bc clear config data between loads 2020-04-20 14:07:06 -04:00
garakmon
c0bffa0107 add some destructors, prevent value set on combobox update
- add destructors to Project and Editor
    - properly close project when opening a new one
    - when reloading comboboxes, do not set map values
      with the new first item
2020-04-20 14:07:06 -04:00
garak
91f8db10a5
Merge pull request #192 from GriffinRichards/pokefirered
Add pokefirered support
2020-04-20 14:05:27 -04:00
garakmon
e5122ef94f use ordered map for wild encounter json 2020-04-20 14:04:34 -04:00
GriffinR
0c92dc05da Save metatile attributes label in new order for FRLG 2020-04-20 13:29:01 -04:00
GriffinR
d91107a07d Read callback_label for FRLG 2020-04-19 18:23:37 -04:00
GriffinR
f2ae83b33e Use metatile attributes path from header 2020-04-19 18:11:45 -04:00
GriffinR
5f16ae7dd0 Use value() instead of at() for defaults 2020-04-19 10:16:49 -04:00
GriffinR
8c428c578b
Merge branch 'master' into pokefirered 2020-04-19 09:48:21 -04:00
garakmon
799e5537f9 add tsl::ordered_map for json objects,
update project code to save json files with new ordered object
2020-04-19 07:55:51 -05:00
garakmon
12614a174a modify Json::dump to preserve our format 2020-04-19 07:55:51 -05:00
garakmon
7bef1eb1e1 convert to use QVector 2020-04-19 07:55:51 -05:00
garakmon
8cb2e6e2ba add json library, begin modifications 2020-04-19 07:55:51 -05:00
garakmon
ef5ba968b1 do not allow selection of invalid metatiles
- also display invalid metatiles as magenta to stand out more
2020-04-18 15:31:28 -05:00
garak
3a52c8680c
Merge pull request #201 from garakmon/tabbing
allow TAB key to navigate through encounter table widget
2020-04-08 22:13:03 -04:00
garakmon
d3c212edb3 allow TAB key to navigate through encounter table widget 2020-04-08 22:12:20 -04:00
GriffinR
129db88453 Minor cleanup 2020-04-06 12:09:45 -04:00
GriffinR
c9b6f87e06 Apply undo/redo to border drawing 2020-04-05 11:56:13 -04:00
GriffinR
d5908c0045 Draw border up to players view 2020-04-05 00:03:36 -04:00