vanilla merge #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
`--portable` was using the path to the executable's file, instead of the directory that contains the executable
…/ammo (#3539) Adds some debug options that make it easier to quickly complete the game, get orbs, unlock cheats, etc. 
…3540) This adds support for generating collide meshes when importing custom models. A couple of things to keep in mind: - A single `collide-mesh` may only have up to 255 vertices. - When exporting a GLTF file in Blender, a `collide-mesh` will be generated for every mesh object that has collision properties applied (ideally, you would set all visual meshes to `ignore` and your collision meshes to `invisible` in the OpenGOAL plugin's custom properties). - Ensure that your actor using the model properly allocates enough `collide-shape-prim-mesh`es for each `collide-mesh` ([example from the original game that uses multiple meshes](https://github.com/open-goal/jak-project/blob/f6688659f2ef85f5ceaacea6271580c9f4d91ed1/goal_src/jak1/levels/finalboss/robotboss.gc#L2628-L2806)). ~One annoying problem that I haven't fully figured out yet (unrelated to the actual functionality): `collide-mesh`es are stored in art groups as an `(array collide-mesh)` in the `art-joint-geo`'s `extra`, so I had to add a new `Res` type to support this. The way that `array`s are stored in `res-lump`s is a bit of a hack right now. The lump only stores a pointer to the array, so the size of that is 4 bytes, but because we have to generate all the actual array data too, the current `ResLump` code in C++ doesn't handle this case well and would assert, so I decided to omit the asserts if an `array` tag is present and "fake" the size so the object file is generated more closely to how the game expects it until we figure out something better.~ This was fixed by generating the array data beforehand and creating a `ResRef` class that takes the pointer to the array data and adds it to the lump.
Slam Dozer > Ram Rod
for specific cutscene scenarios --------- Co-authored-by: Tyler Wilding <xtvaser@gmail.com>
…eap and level flags (#3541)
Motivated by - open-goal/opengoal-vscode#358 This addresses the following: - Fixes #2939 spam edge-case - Stop picking a different nREPL port based on the game mode by default, this causes friction for tools in the average usecase (having a REPL open for a single game, and wanting to connect to it). `goalc` spins up fine even if the port is already bound to. - For people that need/want this behaviour, adding per-game configuration to the `repl-config.json` is on my todo list. - Allows `goalc` to permit redefining symbols, including functions. This is defaulted to off via the `repl-config.json` but it allows you to for example, change the definition of a function without having to restart and rebuild the entire game.  - Updates the welcome message to include a bunch of useful metadata up-front. Cleaned up all the startup logs that appear when starting goalc, many of whom's information is now included in the welcome message. - Before:  - After: 
People seem to be translating lines that aren't in the base english one, such as `mtn-plat-buried-rocks-a` This is fine, but Crowdin will continue to remove these every sync PR because they aren't in the base english file. So some kind of segregation needs to happen. If we didn't want these scenes translated, then they should be banned from being translated via the editor / etc in the first place (shouldn't have been included in the metadata).
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
…l_src/jak1` (#3535) This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious: 
Fixed several translation errors
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
Currently PS2 Actor Vis and FPS are only enforced when starting a run - this enforces them on every frame similar to cheats. In the progress menu, FPS is already disabled in speedrunner mode - this adds the same restriction for PS2 Actor Vis. Jak 2 already does this properly, no change needed there
* Add periods to lines in code_status.md for consistency (#3521) * CI: Periodic Controller Database Update (#3528) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * game: fix the path the`--portable` flag determines (#3537) `--portable` was using the path to the executable's file, instead of the directory that contains the executable * g/j2: add some debug menu options to unlock things and give orbs/gems/ammo (#3539) Adds some debug options that make it easier to quickly complete the game, get orbs, unlock cheats, etc.  * [buildactor] support generating `collide-mesh`es for custom models (#3540) This adds support for generating collide meshes when importing custom models. A couple of things to keep in mind: - A single `collide-mesh` may only have up to 255 vertices. - When exporting a GLTF file in Blender, a `collide-mesh` will be generated for every mesh object that has collision properties applied (ideally, you would set all visual meshes to `ignore` and your collision meshes to `invisible` in the OpenGOAL plugin's custom properties). - Ensure that your actor using the model properly allocates enough `collide-shape-prim-mesh`es for each `collide-mesh` ([example from the original game that uses multiple meshes](https://github.com/open-goal/jak-project/blob/f6688659f2ef85f5ceaacea6271580c9f4d91ed1/goal_src/jak1/levels/finalboss/robotboss.gc#L2628-L2806)). ~One annoying problem that I haven't fully figured out yet (unrelated to the actual functionality): `collide-mesh`es are stored in art groups as an `(array collide-mesh)` in the `art-joint-geo`'s `extra`, so I had to add a new `Res` type to support this. The way that `array`s are stored in `res-lump`s is a bit of a hack right now. The lump only stores a pointer to the array, so the size of that is 4 bytes, but because we have to generate all the actual array data too, the current `ResLump` code in C++ doesn't handle this case well and would assert, so I decided to omit the asserts if an `array` tag is present and "fake" the size so the object file is generated more closely to how the game expects it until we figure out something better.~ This was fixed by generating the array data beforehand and creating a `ResRef` class that takes the pointer to the array data and adds it to the lump. * jak3 - fill out some `text-id` entries (#3494) Slam Dozer > Ram Rod * [jak2] new subtitle speakers (#3536) for specific cutscene scenarios --------- Co-authored-by: Tyler Wilding <xtvaser@gmail.com> * [jak3] implement autocollect and city turbo board cheats, fix actor heap and level flags (#3541) * fix nav mesh debugging crash (#3542) * jak3: airlock speed hacks + make cutscenes skip properly (#3543) * REPL related improvements and fixes (#3545) Motivated by - open-goal/opengoal-vscode#358 This addresses the following: - Fixes #2939 spam edge-case - Stop picking a different nREPL port based on the game mode by default, this causes friction for tools in the average usecase (having a REPL open for a single game, and wanting to connect to it). `goalc` spins up fine even if the port is already bound to. - For people that need/want this behaviour, adding per-game configuration to the `repl-config.json` is on my todo list. - Allows `goalc` to permit redefining symbols, including functions. This is defaulted to off via the `repl-config.json` but it allows you to for example, change the definition of a function without having to restart and rebuild the entire game.  - Updates the welcome message to include a bunch of useful metadata up-front. Cleaned up all the startup logs that appear when starting goalc, many of whom's information is now included in the welcome message. - Before:  - After:  * New Crowdin updates (#3547) People seem to be translating lines that aren't in the base english one, such as `mtn-plat-buried-rocks-a` This is fine, but Crowdin will continue to remove these every sync PR because they aren't in the base english file. So some kind of segregation needs to happen. If we didn't want these scenes translated, then they should be banned from being translated via the editor / etc in the first place (shouldn't have been included in the metadata). * CI: Periodic Controller Database Update (#3548) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * wrap sprite rgba to 0-255 (#3549) * g/j1: Cleanup all main issues in the formatter and format all of `goal_src/jak1` (#3535) This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious:  * Jak 2 3rd update subtitle_lines_fr-FR.json (#3546) Fixed several translation errors * CI: Periodic Controller Database Update (#3555) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * [jak1] Enforce certain pc-settings in speedrunner mode (#3553) Currently PS2 Actor Vis and FPS are only enforced when starting a run - this enforces them on every frame similar to cheats. In the progress menu, FPS is already disabled in speedrunner mode - this adds the same restriction for PS2 Actor Vis. Jak 2 already does this properly, no change needed there * Rebuild binaries --------- Co-authored-by: Matthew Wells <91291346+richarm4@users.noreply.github.com> Co-authored-by: OpenGOAL Bot <99294829+OpenGOALBot@users.noreply.github.com> Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> Co-authored-by: Tyler Wilding <xTVaser@users.noreply.github.com> Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Co-authored-by: Matt Dallmeyer <mattdallmeyer@gmail.com> Co-authored-by: Aloqas <102683375+Aloqas@users.noreply.github.com> Co-authored-by: Tyler Wilding <xtvaser@gmail.com> Co-authored-by: ManDude <7569514+ManDude@users.noreply.github.com> Co-authored-by: RoyalForgotten <150559120+RoyalForgotten@users.noreply.github.com>
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
* Sync and cleanup Fileutil * half finish collectables * Finish cleanup of collectables * Finish cleaning up jak 1 * Finish hand reviewing every file * for permissive_redfenitions and rebuild
- Can make the event buffer larger or smaller - UI shows the current event index / size, so you know how fast it's filling up - Can save compressed, 10x reduction in filesize and Windows 11 explorer actually supports ZSTD natively now so this isn't inconvenient at all  > An example of almost 1 million events. Results in a 4mb file.
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
…e-size` resolutions (#3601) Fixes open-goal/jak-project#3563 These users have the following spamming in logs: > OpenGL error 0x502 S8246 T824C: GL_INVALID_OPERATION error generated. Source and destination dimensions must be identical with the current filtering modes. And the solution is to correctly set their game-size. The way this change accomplishes that is by confirming whether or not the set `game-size` is a valid resolution informed by SDL, if not, it defaults to the monitor's currently set display mode's resolution. This also moves the selected display id, and the display mode into the C++ settings -- closer to where it's actually managed and used. I'm tempted to do this eventually for the resolutions as well but that stuff is much more burdensome. This hopefully simplifies debugging, reduces startup flickering, and removes back-and-forth complexity. Hopefully this makes debugging display related problems easier. It also adds a bunch more logging to the related code.
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
Previously was only applying to game versions above Jak 2, Fixes #3342
Used by `prebot`
Fixes #3210  TIL that on the PS4/PS5, mirror mode breaks the upscaling
…n settings in `pc-settings` instead of the memory card file (#3612) In the original game, they had no choice but to use the memory card file as their method of persisting settings. We are not limited by such things. It's inconvenient to have to load your save-file when launching the game to initialize these settings to your liking, it's also confusing behaviour to even some players that have played the game heavily for over a decade. We can do better by globally saving these settings to the `pc-settings` file instead. Originally I only migrated the volume settings, then i figured it would be nice to also have play-hints and subtitles settings persisted. More could debatably be moved (language is a big one...) but these were the low hanging fruit. I also reduced the default volumes as that is something else that has come up a few times.
A long overdue Finnish translation update with better subtitle timings and wording.
* decompiler: Cleanup duplication in extractor/decompiler and make it easier to enable streamed audio ripping from CLI (#3560) This centralizes the code that both `extractor` and the decompiler executes. In the past this code was partially-duplicated, meaning that the `extractor` could only do _some_ operations and not others (ie. could not extract the audio files). I also simplified the process to enable audio streaming in the configuration. This is to support a new feature in the launcher that allows you to enable these options for the decompiler:  * Update volume in sound-group sog3 to sfx-volume (#3574) Adds a way to override certain sounds that don't respect the settings that they should... https://github.com/open-goal/jak-project/assets/89345505/97d9518d-aafd-4227-b25f-82c5d32e811e * jak3: fix some nan bugs (#3581) Fixes a couple of NaN bugs, making the Arena and Marauder Stronghold missions, the leaper corralling mission and final boss playable: - Fixes #3579: - After catching a leaper, the `flut` that spawns would have a NaN `world-sphere` - Fixes #3580: - `vf0` was being clobbered after a `suspend`, causing them to spawn at the origin. - The Terraformer's `world-sphere` would be NaN until an animation started playing. * jak3: add missing texture animations (#3577) This refactors some of the texture animation code a bit to better support multiple games and adds most of the missing texture animations for Jak 3 with a couple of exceptions/bugs: - `hanga-sprite`: Despite `move_to_pool` being set for this anim, it's not showing up in-game, but it does display properly in the ImGUI debug window.  - `factoryc-alpha`: Some conveyors do not have the animation for some reason.  - This spot in Spargus seems to use texture animations, but it looks like it maps to the `fora-water-dest` texture/slot, which comes from `foresta-water`. Because the texture is not initialized, the texture shows up black on first load, but it does show up after loading `foresta`.   - `hfrag` texture anim is not handled yet. Probably needs some special casing. * [high fps] Increase input buffer for jak1 and jak3 (#3578) Applying open-goal/jak-project#3178 to jak1 and jak3 This also fixes cloud speed in jak3 --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> * jak3: fix `robo-hover` hand cannon nans (#3584) Fixes #3583. The callback function for the hand cannon joint mods was initialized prior to calling `ja-post`, propagating NaNs. * jak3: fix opengl error spam (#3586) * jak3: fix texture anim alpha (#3587) * game: log more OpenGL info (#3588) Logs the OpenGL vendor and renderer, in most cases this helps identify what GPU the game is using, which is something that comes up from time-to-time in support.  * CI: Periodic Controller Database Update (#3585) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * jak3: fix `bbush` rings (#3593) Fixes #3592 * decompiler: support merc model replacements and adding custom actor models to vanilla fr3s (#3597) This adds support for replacing existing merc models in FR3 files with custom GLB model files. The replacements go in `custom_assets/<GAME>/merc_replacements`, similar to texture replacements. When a `.glb` file with a file name that matches any model present in an FR3 is detected (e.g. `eichar-lod0` for Jak), all merc model data is replaced with the given model. Additionally, models for custom actors can now also be added to vanilla FR3s. The models for this go in `custom_assets/<GAME>/models/<LEVEL_NAME>` (e.g. `custom_assets/jak1/models/jungleb/test-actor-lod0.glb`) and will be added to the FR3 that has a matching name (exception: to add things to the common level file, the folder should be named `common` instead of `GAME`). For custom levels, these now go in `custom_assets/<GAME>/models/custom_levels` (previously `custom_assets/<GAME>/models`). Another small change: When level ripping is enabled, the resulting model files will now be stored in game name subfolders inside of `glb_out`. * CI: Periodic Controller Database Update (#3600) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * [wip] Jak 3 Overlord (#3567) * [jak3] Fix eye slot assignment and textures (#3603) I found two issues with Jak 3 eyes. The first was simple - we were missing a `-pc` texture upload in `texture.gc` for `pris2` textures, which has eye textures for a few characters, like torn or damas. The second was a little more annoying. Unlike jak 2 and jak 1, jak 3 can dynamically assign eye slots when merc models are loaded. This involves modifying eye data to tell the eye renderer where to render, and modifying the merc model's adgif shaders to point to the correct eye texture. The modification to the merc adgif shader is problematic since our PC port of merc assumes this slot is constant. My solution here was to bypass this whole slot system entirely for jak 3. I modified the GOAL eye renderer to tell the c++ eye renderer the name of the merc-ctrl containing the eye. Then, the PC C++ Merc renderer can just look up the merc-ctrl by name. To make this fit nicely in the existing memory layout, I used a 64-bit fnv hash of the name. (which honestly is how we should have handled a lot of other texture/model names stuff...) Unrelated fix to Overlord2 so it handles the case where file size changes after the game starts, I had this in jak2/jak1 and forgot it for jak 3. * [jak3] A few bug fixes (#3606) A few minor fixes: - Fix crash in overlord3 during final boss open-goal/jak-project#3605 - Update goal_src for `scene-actor.gc`, which was not updated after a bug fix for decompiling skelgroups, making some cutscene actors invisible due to using the wrong joint for culling checks. - Stop using `-1` as an invalid value for texture id's in Merc.cpp. This could sometimes cause Merc2.cpp to accidentally skip updating the OpenGL texture. This fixes the bug where skull gems sometimes didn't have the animated textures. * [jak3] prim rendering for cloth (#3607) * Jak1: Add Autosplitting options for tasks completed in one level and turned in in another (#3595) For the FJ Mirrors, Muse, Lightning Moles, and Gambler's race the tasks are completed in one level, then turned in at the hub. This presents a spot of confusion for new players with the autosplitter and requires hacky workarounds for those who want to split on these conditions. This pull request adds in the necessary code to the autosplit-h.gc and autosplit.gc files so that the autosplitter can identify these events, similar to the talk to fisherman and catch fish options in the current autosplitter. * jak1: Adjust sprite positioning or hide them where appropriate when using non-standard aspect ratios (#3596) This attempts to do a best-effort quick fix for the sprite alignment in the menus and first person views on higher aspect ratios. This: - Hides the binocular borders completely when using a non-standard ratio  - Hides the borders in jak's first person view when using a non-standard ratio  - Uses a combination of manual alignment and approximation to get the pause menu closer.  > 32:9 screenshot. I accomplished the last one by manually aligning all of the core sprites and text for the most popular aspect ratios. This means that from a practical standpoint, things should align "perfectly". However, I then used all of those values to derive a polynomial for each adjustment based on the aspect ratio. This allows the game to do a half-decent approximation/interpolation for every aspect ratio in-between the common ones. It won't be perfect, but it will be better than this:  * [jak3] Some cleanup/fixes around curve and light-trail (#3608) They still don't work yet, this is just naming/comments to help with debug. The vehicle tracks are now at least trying to draw, but like the others, don't actually show up. * [jak3] Fix alpha for prims, entity-table (#3609) Fix issue where light-trail is invisible and some actors not spawning due to out of memory. * jak3: add darkjak highres texture anim (#3611) Eyes don't work yet * game: cleanup some display settings related code, forbid invalid `game-size` resolutions (#3601) Fixes open-goal/jak-project#3563 These users have the following spamming in logs: > OpenGL error 0x502 S8246 T824C: GL_INVALID_OPERATION error generated. Source and destination dimensions must be identical with the current filtering modes. And the solution is to correctly set their game-size. The way this change accomplishes that is by confirming whether or not the set `game-size` is a valid resolution informed by SDL, if not, it defaults to the monitor's currently set display mode's resolution. This also moves the selected display id, and the display mode into the C++ settings -- closer to where it's actually managed and used. I'm tempted to do this eventually for the resolutions as well but that stuff is much more burdensome. This hopefully simplifies debugging, reduces startup flickering, and removes back-and-forth complexity. Hopefully this makes debugging display related problems easier. It also adds a bunch more logging to the related code. * CI: Periodic Controller Database Update (#3615) Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> * decompiler: Apply docstring indentation fix to all game versions (#3614) Previously was only applying to game versions above Jak 2, Fixes #3342 * g/j1: fix menu labelling issue in jak1 (#3613) Fixes #3393 * jak3: add more prim buckets (#3618) Used by `prebot` * jak2: support mirror mode (#3616) Fixes #3210  TIL that on the PS4/PS5, mirror mode breaks the upscaling * jak1/jak2: Persist sound settings, play-hints, subtitles and vibration settings in `pc-settings` instead of the memory card file (#3612) In the original game, they had no choice but to use the memory card file as their method of persisting settings. We are not limited by such things. It's inconvenient to have to load your save-file when launching the game to initialize these settings to your liking, it's also confusing behaviour to even some players that have played the game heavily for over a decade. We can do better by globally saving these settings to the `pc-settings` file instead. Originally I only migrated the volume settings, then i figured it would be nice to also have play-hints and subtitles settings persisted. More could debatably be moved (language is a big one...) but these were the low hanging fruit. I also reduced the default volumes as that is something else that has come up a few times. * New Crowdin updates (#3621) * [jak1] update finnish translations (#3619) A long overdue Finnish translation update with better subtitle timings and wording. --------- Co-authored-by: Tyler Wilding <xTVaser@users.noreply.github.com> Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Co-authored-by: Brent Hickey <brent.hickey@icloud.com> Co-authored-by: OpenGOAL Bot <99294829+OpenGOALBot@users.noreply.github.com> Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com> Co-authored-by: water111 <48171810+water111@users.noreply.github.com> Co-authored-by: zakfaulk <zakfaulk@gmail.com> Co-authored-by: Aloqas <102683375+Aloqas@users.noreply.github.com>
… master (#3626) Fixes #3063
…the `pc-settings.gc` file (#3624) Also saves out the default `pc-settings.gc` file so it's less confusing _and_ so we can request it from users to actually see what it's doing. The fix in the last release was only to fix bad `game-size` values when _loading_ the file. But if you don't have a file, it picks a default. Right now it picks that default by: 1. Your largest reported resolution 2. If that fails, the one that is currently set In reality this scenario can never really happen (if you have a set resolution, it will be one of the reported ones). However what can happen is for SDL to be misinformed by bad display/monitor drivers/the OS and be given "supported" resolutions that aren't actually supported. For example some users have a 4K resolution as their highest, despite them using a 1080p monitor. The solution is to not blindly assume the largest resolution is valid, instead use the one the user already has set. I'm also now filtering out resolutions by refresh rate, as perhaps this also caused a problem. ie. the monitor supports a resolution if the refresh rate is lowered, but it's currently set high (at 144hz for example).
* Hack added for custom navmesh, plus example. * path comment correction * updated readme * can see triangle and vertex id now, store vertex-count in our navmesh * all actors stuff --------- Co-authored-by: Luminar Light <18116946+LuminarLight@users.noreply.github.com>
Updating Controller Database Co-authored-by: OpenGOALBot <OpenGOALBot@users.noreply.github.com>
Mistake lead to CI failures for PRs that modified goal_src (of course the files are different than master!)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.