Skip to content

Conversation

@SpeedyR10
Copy link
Contributor

"master" changed to "main" for release branch

@SpeedyR10 SpeedyR10 requested a review from SamuelBellomo as a code owner May 30, 2021 16:44
@unity-cla-assistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@SamuelBellomo SamuelBellomo merged commit 9960a59 into Unity-Technologies:main May 31, 2021
SamuelBellomo added a commit that referenced this pull request May 31, 2021
* main:
  Update README.md (#346)
  Fixing parameter exception when connecting to lobby (#343)
  Merging develop to main (#338)

# Conflicts:
#	Assets/BossRoom/Audio.meta
#	Assets/BossRoom/Audio/SFX.meta
#	Assets/BossRoom/Audio/SFX/Archer.meta
#	Assets/BossRoom/Audio/SFX/Boss.meta
#	Assets/BossRoom/Fonts.meta
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_door_boss_ani.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_door_gears_ani.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_floor_switch_glow.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_treasure_chest_ani.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/crystal.meta
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/crystal/DestroyedCrystal.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_Door.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_boss_floor_2.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_door_boss_head.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_floor_barrier_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_lava.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_corner_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_3.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_2.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_3.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_cap_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_corner_1.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar2.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar2_break_parent.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pots/env_pot_break_parent.prefab
#	Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab
#	Assets/BossRoom/Prefabs/Game/BreakableCrystal.prefab
#	Assets/BossRoom/VFX/Materials/FX_Crystal_Broken.mat
#	Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md
#	ProjectSettings/ProjectSettings.asset
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants