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

249 commits

Author SHA1 Message Date
Marcus Huderle
81cd43933b Eliminate unnecessary expensive map redraws when saving or changing tilesets 2020-05-20 19:21:18 -05:00
Marcus Huderle
f6c86e0eed Eliminate unnecessary expensive map redraw when opening a map 2020-05-20 18:30:17 -05:00
garakmon
4ee22fa06a decouple map and event edit modes 2020-05-18 17:25:53 -05:00
garakmon
482d3cd8fb fix map dimension checks in new map window 2020-05-18 17:25:53 -05:00
GriffinR
374020f94d Split readMaxMapDataSize, move mapDimensionsValid to project 2020-05-16 18:26:39 -05:00
GriffinR
731fbce6af Read MAX_MAP_DATA_SIZE 2020-05-16 18:26:39 -05:00
GriffinR
99b95882fe Object event coords from unsigned to signed 2020-05-15 15:57:27 -05:00
GriffinR
53ba6f5ab9 Warn when closing with unsaved encounter changes 2020-05-11 17:11:01 -05:00
Marcus Huderle
2161312122 Add optional args to dictate map refresh and commit 2020-05-09 11:31:14 -05:00
Marcus Huderle
e0afb24002 Merge remote-tracking branch 'origin/master' into scripting 2020-05-08 11:35:58 -05:00
garakmon
37c849f9b5 allow current widget to dictate size of stacked widget for metatile/collision and events pages 2020-05-08 11:35:14 -05:00
GriffinR
399474c1f2 Fix heal loc duplicates, rename flyableMaps 2020-05-08 11:34:40 -05:00
Marcus Huderle
f139365faf Add log() to api 2020-05-08 11:29:39 -05:00
Marcus Huderle
998ea1fcc8 Add custom_scripts project config, and cleanup scripts when switching projects 2020-05-08 11:26:23 -05:00
Marcus Huderle
b8d0268d5d Move script api into separate file 2020-05-08 09:59:01 -05:00
Marcus Huderle
3c1549cc93 Add setTimeout to script api, and properly refresh scene when overlay is changed 2020-05-08 09:46:26 -05:00
Marcus Huderle
71242e5714 Add ability to set keyboard shortcuts for custom actions 2020-05-08 08:49:29 -05:00
Marcus Huderle
7072c001af Implement api for checkboxes 2020-05-07 20:13:56 -05:00
Marcus Huderle
bf64764103 Implement the rest of the palette api 2020-05-07 20:00:14 -05:00
Marcus Huderle
09a892f525 Add ability to register custom actions 2020-05-03 11:28:02 -05:00
Marcus Huderle
434bafe0b2 Call on_block_changed from more places 2020-05-03 10:48:48 -05:00
Marcus Huderle
0ef3c6a898 Add palette preview scripting commands 2020-05-03 10:31:44 -05:00
Marcus Huderle
8697adf186 Add true tileset scripting functions 2020-05-03 10:00:56 -05:00
Marcus Huderle
567a45b7e4 Implement some overlay functions and on_map_opened callback 2020-05-02 16:25:35 -05:00
Marcus Huderle
95012838fd Implement more map api functions 2020-04-30 18:30:24 -05:00
Marcus Huderle
d685718f8d Implement three map scripting functions 2020-04-29 20:41:19 -05:00
Marcus Huderle
267cd5e2cb Implement proof of concept for scripting capabilities 2020-04-29 19:46:01 -05:00
garakmon
333fe69dd8 keep selected tool when switching tabs 2020-04-26 18:55:18 -04:00
garakmon
9e883a8a2f remember edit mode in map tab 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
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
03082e5920
Merge branch 'master' into closeproject 2020-04-20 22:05:28 -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
bb6dbedabf Add ability to export map stitch images. 2020-04-20 20:29:07 -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
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
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
garakmon
e5122ef94f use ordered map for wild encounter json 2020-04-20 14:04:34 -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
GriffinR
129db88453 Minor cleanup 2020-04-06 12:09:45 -04:00
GriffinR
d5908c0045 Draw border up to players view 2020-04-05 00:03:36 -04:00
GriffinR
e4a41cf201 Align border blocks 2020-04-03 16:29:40 -04:00
GriffinR
c28730e834 Fix crash with open windows when switching projects 2020-03-31 12:41:15 -04:00
GriffinR
e9210f96aa
Merge branch 'master' into pokefirered 2020-03-29 13:15:23 -04:00
GriffinR
76a8c0dc44 Read trainer type constants 2020-03-27 10:51:57 -04:00
GriffinR
3ff5483267 Correctly initialize palette for palette editor 2020-03-23 21:12:56 -05:00
GriffinR
d365ebb664 Support reading/saving pokefirered heal locations 2020-03-20 03:09:48 -04:00
GriffinR
bf72ecede9 Parse remaining pokefirered metatile attributes, allow editing/saving them 2020-03-16 16:31:08 -04:00
GriffinR
3fa77609c6 Remove hard-coded new map constants 2020-03-16 03:57:39 -04:00
GriffinR
c0a512803e Allow editing border dimensions 2020-03-14 18:06:35 -04:00
GriffinR
5cf0e35ffc Fix border block cache usage 2020-03-13 19:10:40 -05:00
GriffinR
629abd3c06 Support reading/displaying custom border sizes 2020-03-13 02:23:47 -04:00
GriffinR
a5c47b6333 Disable RME(temporarily), secret bases, and weather triggers for pokefirered 2020-03-12 12:30:37 -04:00
GriffinR
a2f38341f5 Save changes to floor_number 2020-03-11 17:06:26 -04:00
GriffinR
3eca227d07 Basic pokefirered empty layout, floor number, version selection support 2020-03-11 02:06:13 -04:00
Marcus Huderle
342bcae174 Add better error handling for region map editor loading 2020-02-12 15:45:21 -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
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
2f21f83217 draw map connections with current map tilesets 2019-11-04 18:44:57 -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
55573099b5 keep track of encounter data when navigating porymap 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
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
b1509cb000 make wild encounter windows obey theme 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
96020c21dd change encounterRate slider to a spin box 2019-09-09 23:51:37 -04:00
garak
d794dee8c0 add wild encounters to config 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
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
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
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
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
11d6d35b68 fix rme close with unsaved changes 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
b990e661e3 remove old comment 2019-08-07 11:27:52 -04:00