merge of releave/v0.1.0-experimental back to develop #253
Conversation
This file contains hidden or 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
Changed the URL to the readme as the current version generates a broken link.
…aliasing Enabled antialiasing in all of the relevant scene cameras (SMAA)
…troyed reticule (#212)
Removes earlier temp code that hard-coded separate sprite lists per class. Now uses the Sprites assigned in the GameDataSource. If a class has an unimplemented skill (or the skill has no assigned Sprite), the button for that skill is hidden.
…erimental-status-in-readme Highlight EARLY ACCESS status in readme
…for_unimplemented_attacks Bug fix: hide icons for unimplemented attacks
* release/v0.1.0-experimental: (97 commits) adding screenshots (#228) [GOMPS-352] Add audiomixer to project (#222) feature: transport picker improvements (#200) fixing issue where client disconnect boots everyone else (#229) removed GC allocs inside of AIBrain (#210) init client door with server's current value for IsOpen (#227) Photon Realtime Setup Guide for Boss Room (#225) Update README.md add link to doc (#226) Bug fix: hide icons for unimplemented attacks feature: v0.1.0 experimental updating to latest master mlapi (#220) fixing missing reference exceptions, and missing animation (#219) feat: replace with photon package (#218) Replaced LobbyPlayerArray with a NetworkList<LobbyPlayerState> (#217) ART: Warning Message fixes for models, animations, and Shader...and new App icon (#213) Updating to latest MLAPI on master (#214) null guard added inside of target action for accessing a possibly destroyed reticule (#212) [GOMPS-270] bossroom should let users specify connection port# (#205) Fix useless log error (#203) Bugfix: properly disconnect on quit [GOMPS-324][GOMPS-327][GOMPS-385] (#196) Volume control [GOMPS-373] (#195) ... # Conflicts: # README.md
…hat was outside of BossRoom folder and placed textures in VFX/Textures folder (#239)
FPaizSF
previously approved these changes
Apr 5, 2021
In release branch, it was using a sprite in ui_atlas (specifically "UI_elements_atlas_hud_0"). I think it just got missed when the close button was broken out to a separate image. I plugged in the new ui_btn_exit sprite.
eheimburg
approved these changes
Apr 6, 2021
Contributor
eheimburg
left a comment
eheimburg
left a comment
There was a problem hiding this comment.
- Fixed a small prefab error (that ui_atlas was still being used in one place!)
- Noticed that the boss can't break the pillars at all. But this is actually not due to the merge, since it's broken in the release branch also! Somewhere along the line, my boss-breakable prefab got wiped out. Will revise the pillar prefab again in develop post-merge.
FPaizSF
approved these changes
Apr 6, 2021
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.
Merges release/v0.1.0-experimental back to develop. Things to know:
I tested by playing through a couple losses, and then playing through a victory with one connected client. Pretty much all worked the way I expected.
There is no novel code in this change, so we will be taking it directly.