atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
572 commits 5 branches 53 tags 36 MiB
Commit graph

294 commits

Author SHA1 Message Date
Marcus Huderle
5978aedc30 Fix bug where dragging the metatile selector would visually extend beyond map boundary 2020-02-12 11:52:05 -06:00
Marcus Huderle
2df0ac7d16 Show alert windows when a fatal map-loading error occurs 2020-02-12 11:23:28 -06:00
Marcus Huderle
8b4970413d Log errors for invalid event types 2020-02-12 10:43:17 -06:00
Marcus Huderle
cd9b8b12a5 Validate map layout and tileset loading 2020-02-12 10:22:40 -06:00
Marcus Huderle
8a4456f7b0 Validate remaining data loads, and fix duplicating combobox data 2020-02-12 09:13:58 -06:00
Marcus Huderle
a152404ce8 Validate region map sections 2020-02-12 08:12:12 -06:00
Marcus Huderle
79c74b8814 Validate layouts 2020-02-11 18:34:08 -06:00
Marcus Huderle
cfaf23aa3e Copy collision properties when selecting metatiles from the map area 2020-02-02 16:25:37 -06:00
garak
7a84ca872c toggle grid in map view with CTRL+G 2020-01-15 20:44:01 -05:00
Diegoisawesome
67f8b09c6e Fix tileset image export on exact multiple of 16 tiles 2019-11-30 08:24:43 -06:00
garak
81d02f57a5
Merge pull request #171 from huderlem/fix-event-deletion-crash 
Fix event deletion crash
 2019-11-04 18:48:03 -05:00
garak
2f21f83217 draw map connections with current map tilesets 2019-11-04 18:44:57 -05:00
Marcus Huderle
654b788937 Guard against index out of bounds when deleting last event in group 2019-11-02 18:22:42 -05:00
Karathan
bc4d9e2276 add a switch for using .pory script files in the project config 2019-10-22 19:41:10 -05:00
garak
8f218c8c2b fix inconsistent table header text size 2019-10-16 20:04:19 -05:00
garak
a7e6dd9ebf add warning when encounter slot total exceeds 8 bytes 2019-10-16 20:04:19 -05:00
garak
6324980a8d don't save empty wild encounter field groups 2019-10-16 20:04:19 -05:00
garak
55573099b5 keep track of encounter data when navigating porymap 2019-10-16 20:04:19 -05:00
garak
9e03ac5e14 update pokemon constants path, error check level constants 2019-10-16 20:04:19 -05:00
garak
10c99dd0a2 add 'groups' field to encounter json to accomodate fishing 2019-10-16 20:04:19 -05:00
garak
09dd9380bb add Encounter Chance column to mon tables 2019-10-16 20:04:19 -05:00
garak
91b498ee62 configuring encounter JSON applies changes to all mon data 2019-10-16 20:04:19 -05:00
garak
911b30089c rename TokenType to TokenClass to fix Windows issues 2019-10-16 20:04:19 -05:00
garak
c816801429 change ComboBox::activated calls to currentTextChanged 2019-10-16 20:04:19 -05:00
garak
797ec63e23 encounter slot minimum chance is 1, not 0 2019-10-16 20:04:19 -05:00
jiangzhengwenjz
c29486063a fix build on qt 5.9.5 2019-09-21 17:31:47 -05:00
garak
b1509cb000 make wild encounter windows obey theme 2019-09-21 12:27:05 -05:00
garak
02d16b6a12 revamp dark theme colors, add new themes 
new themes:
- midnight (the old dark theme)
- emerald green
- pink and blue
 2019-09-21 12:27:05 -05:00
garak
230b018834 add themes to config so they persist between sessions 2019-09-21 12:27:05 -05:00
garak
376cfbf9c3 add light and dark themes 2019-09-21 12:27:05 -05:00
garak
ec98312340 change event object sprite when using completer 2019-09-21 13:04:17 -04:00
garak
303cf37b48 fix encounter field slot change config limits 
- add min and max value limits *before* setting value
 2019-09-21 12:37:02 -04:00
garak
96020c21dd change encounterRate slider to a spin box 2019-09-09 23:51:37 -04:00
garak
dc6f962292 silence warnings 2019-09-09 18:26:54 -04:00
garak
e623c22da8 use custom (faster) combos for species selectors 2019-09-09 18:26:54 -04:00
garak
088ad7453b add tooltip for mon field tabs 2019-09-09 18:26:54 -04:00
garak
d794dee8c0 add wild encounters to config 2019-09-09 18:26:54 -04:00
garak
c52b6fe4cd add wild encounter documentation 2019-09-09 18:26:54 -04:00
garak
7129510aea add read misc project values function 2019-09-09 18:26:54 -04:00
garak
267c71d40e clean wild encounter code 2019-09-09 18:26:54 -04:00
garak
78a6944a3c configure field JSON 2019-09-09 18:26:54 -04:00
garak
3c2b7a8df7 fix copy from existing encounter group function 2019-09-09 18:26:54 -04:00
garak
f7022fc3d2 allow saving new encounter groups to maps 2019-09-09 18:26:54 -04:00
garak
eb3fb44542 custom table widget for mon data, add new encounter fields to maps 2019-09-09 18:26:54 -04:00
garak
d7dae219b1 fix saving for multi encounter group maps 2019-09-09 18:26:54 -04:00
garak
5a62df9f55 add json saving to wild encounter editor 2019-09-09 18:26:54 -04:00
garak
4b0e0b0bff continue work on wild encounter editor 2019-09-09 18:26:54 -04:00
garak
1369113a1b add encounter rate slider to wild mon tables 2019-09-09 18:26:54 -04:00
garak
ce002bcb4d speed up combobox load for wild mons 2019-09-09 18:26:54 -04:00
garak
3f9ad3afbb extend wild encounter tab for all fields (dynamic) 2019-09-09 18:26:54 -04:00
garak
0ad71286b1 begin work on wild pokemon editor 2019-09-09 18:26:54 -04:00
garak
e3f92fff12 fix build: 
- use parser class when parsing metatile label files
- use QString() over QString::null which is deprecated
 2019-09-09 18:24:33 -04:00
garak
b9ba7777d3 fix typo / bad error message 2019-09-08 20:26:39 -04:00
garak
22fe92840f
Merge pull request #108 from Phlosioneer/metatile-labels 
Add a way to name metatiles, for use in c code
 2019-09-08 20:15:00 -04:00
garak
d50444b9cb remove comments 2019-08-27 18:00:56 -05:00
tustin2121
13b6f8f6e3 Event_object_graphics_pointers are now read for explicit indexes. 2019-08-27 18:00:56 -05:00
garak
dae8f7deaf only read map-related WEATHER_ constants 2019-08-19 16:52:39 -05:00
garak
11d6d35b68 fix rme close with unsaved changes 2019-08-19 16:52:39 -05:00
garak
bb7e15785c draw region map layout when label is changed 2019-08-19 16:52:39 -05:00
garak
9e7ce82f45 fix region map entries save bug where NONE map section was being saved in array 2019-08-19 16:52:39 -05:00
garak
60e68116c4 parsing heal locations allows spaces around parentheses 2019-08-19 16:52:39 -05:00
garak
16d25796bf use the custom combobox for all porymap comboboxes 2019-08-19 16:52:39 -05:00
garak
7a239fafda fix tile image export 2019-08-13 22:28:20 -04:00
garak
ee5d85b171 fix new map layout dir creation and erroneous error 2019-08-07 11:17:20 -04:00
garak
3e39ebccdf add unsaved changes dialog to mainwindow close 2019-08-07 10:48:07 -04:00
garak
f89804dd16 silence compiler warnings 2019-08-06 23:35:02 -04:00
garak
5470ade7bb improve combobox speed and autocompletion 2019-08-06 21:50:03 -04:00
garak
e7732bfb42 fix secondary tileset metatile values; format save file 2019-07-18 16:35:00 -04:00
Marcus Huderle
e501a92c30 Fix exporting tileset images with duplicate-color palettes 2019-06-17 12:00:31 -05:00
garak
a240bf5038 allow spaces in C INCBINS 2019-06-10 20:36:58 -05:00
garak
1e5ac54147 parse C defines with line breaks 2019-06-03 21:29:09 -04:00
garak
14a92c4c16 clear flyableMaps when reading heal locations 2019-06-02 16:48:55 -04:00
garak
358732aa00 fix bug in tileset editor where selection is drawn at improper coordinates 2019-05-23 16:45:06 -05:00
garak
0b28a95e9f flip entire selection contents in tileset editor 2019-05-23 16:45:06 -05:00
garak
8f2e47e937 fix preview scene memory leak, fix borders 2019-05-23 16:43:07 -05:00
garak
f750c56e29 create map image export window 2019-05-23 16:43:07 -05:00
garak
24562fdaae handle un-numbered map groups when creating new maps 2019-05-20 22:33:28 -04:00
garak
eb71f72b0e move source parsing functions from project to parseutil 2019-05-09 18:08:52 -05:00
garak
675a064df6 readCDefines() - don't crash on invalid expressions, add better debugging info 2019-05-09 18:08:52 -05:00
garak
54e431617f improve tileset label reading to silence unnecessary warnings 2019-05-09 18:08:52 -05:00
garak
eb3964bcc3 improve way selected events are rendered on top 2019-05-09 18:06:34 -05:00
garak
69a7a24ed6 fix typo in mainwindow.cpp 2019-05-02 11:05:20 -04:00
garak
a214b66353 use more appropriate default elevations for new events, hide heal spot z 2019-05-01 19:30:19 -05:00
garak
2cc5a92cc8 disallow region map entries to have out of bounds dimensions 2019-04-29 19:38:40 -05:00
garak
4774def5cd draw selected event on top when stacked 2019-04-29 19:38:40 -05:00
garak
c189d2fac8 revert hideArrow() function, fix rme swap window 2019-04-29 19:38:40 -05:00
garak
0a4be71ae2 add regex support to C define reading 2019-04-29 19:38:40 -05:00
garak
9098055054 add data qualifiers struct 2019-04-29 19:38:40 -05:00
garak
8c29b00fa4 modify event comboboxes, fix heal location parsing 2019-04-29 19:38:40 -05:00
Marcus Huderle
13e3e660e9 Fix bug where tryParseJsonFile() wasn't explicitly returning true 2019-04-24 17:26:08 -05:00
Marcus Huderle
7b440f38a4 Log error messages when JSON parsing fails 2019-04-20 09:06:59 -05:00
garak
e30ec429ab allow entries to be moved by dragging them around map 2019-04-13 16:24:12 -05:00
garak
92ea089876 insert new map entries when edited 2019-04-13 16:24:12 -05:00
garak
875320ae26 add entries editing tab to rme 2019-04-13 16:24:12 -05:00
Phlosioneer
edcb8f9285 Only commit metatile label if it changes 2019-04-08 00:17:30 -04:00
Phlosioneer
03186e4591 Fix metatile label bug while saving 
The metatile label only saved when the text field lost focus. But
saving doesn't cause the lineEdit to lose focus. This forces a
check whenever the tileset is saved.
 2019-04-08 00:13:55 -04:00
Phlosioneer
6b661db952 Fix incorrect regex validator 
This fixes the bug where an empty line wouldn't clear the metatile
label. It also removes the '.' and '-' characters.
 2019-04-07 20:46:53 -04:00
garak
d094dced1f fix region map editor ui 2019-04-07 18:33:06 -05:00
huderlem
e91df38714
Merge pull request #77 from garakmon/rme 
Region Map Editor
 2019-04-06 19:59:08 -05:00
Marcus Huderle
a61dd168cf Write JASC files with \r\n line endings 2019-04-06 19:58:38 -05:00