Skip to content

feat: adding RNSM to boss room [MTT-3267] #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 49 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
e9a2f6c
initial engine bump
SamuelBellomo Apr 14, 2022
611a998
fix
SamuelBellomo Apr 14, 2022
d1d4ba9
adding missing network object on main menu state prefab
SamuelBellomo Apr 14, 2022
36cd3cd
adding default RNSM with some custom script to toggle it
SamuelBellomo Apr 14, 2022
38b166c
reserialize scenes
SamuelBellomo Apr 14, 2022
0272ec3
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 14, 2022
21832e5
asm ref missing
SamuelBellomo Apr 14, 2022
88dc66d
missing changes
SamuelBellomo Apr 14, 2022
fccc507
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 14, 2022
bde22ce
adding rnsm prefab instance to startup
SamuelBellomo Apr 14, 2022
52f45c4
adding mobile support
SamuelBellomo Apr 14, 2022
ca264e4
auto generated changes
SamuelBellomo Apr 14, 2022
f53d905
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 14, 2022
de619af
initial pass at hooks
SamuelBellomo Apr 14, 2022
0aa9a40
Adding project id detection
SamuelBellomo Apr 14, 2022
65ec34f
something didn't work, reverting file
SamuelBellomo Apr 14, 2022
2ae194a
adding git lfs support
SamuelBellomo Apr 14, 2022
709ebcc
cleanup
SamuelBellomo Apr 14, 2022
3d6ac4e
Merge branch 'sam/feat/pre-commit-hook' into feature/bump-2021
SamuelBellomo Apr 14, 2022
644c8ae
MTT-3022
SamuelBellomo Apr 14, 2022
8f57887
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 14, 2022
187a4a6
Merge branch 'develop' into feature/bump-2021
SamuelBellomo Apr 20, 2022
694b0d8
bumping to latest LTS
SamuelBellomo Apr 20, 2022
7d3bd91
Anything under ProjectSettings should be versioned.
SamuelBellomo Apr 20, 2022
3df0a12
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 20, 2022
f83cda3
Now tracking new settings
SamuelBellomo Apr 21, 2022
3e01ede
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 21, 2022
8d405ac
dunno why this was updated automatically, this isn't findable... reve…
SamuelBellomo Apr 21, 2022
178e961
setting package-lock as non LFS
SamuelBellomo Apr 21, 2022
fd2778c
revert adding VP and RNSM to package-lock
SamuelBellomo Apr 21, 2022
26d7e37
removing file that should be in user settings according to this bug h…
SamuelBellomo Apr 21, 2022
b88fddf
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 21, 2022
020bc46
including RNSM in dependencies
SamuelBellomo Apr 26, 2022
618d577
tmp commit for merge
SamuelBellomo Apr 28, 2022
b02186b
generated files as well
SamuelBellomo Apr 28, 2022
23ba989
Merge branch 'develop' into feature/bump-2021
SamuelBellomo Apr 28, 2022
82d005d
update with right package lock
SamuelBellomo Apr 28, 2022
d49af7d
material update
SamuelBellomo Apr 28, 2022
9fad5c0
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo Apr 28, 2022
637ff27
tmp-do-not-push
SamuelBellomo May 3, 2022
959013f
Merge branch 'develop' into feature/bump-2021
SamuelBellomo May 3, 2022
1ced2a7
auto version bump in package-lock
SamuelBellomo May 3, 2022
260a6a9
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
SamuelBellomo May 3, 2022
2803c38
Adding instructions for RNSM
SamuelBellomo May 4, 2022
751ac06
Merge branch 'develop' into feature/bump-2021-feat/RNSM-dogfooding
SamuelBellomo May 4, 2022
b0f985c
fixing issue due to last minute changes to RNSM before they released
SamuelBellomo May 5, 2022
4ef8588
forgot missing namespaces
SamuelBellomo May 5, 2022
5dd57b3
fix wrong namespace
SamuelBellomo May 5, 2022
921eaa3
Merge develop into feature/bump-2021-feat/RNSM-dogfooding
netcode-ci-service May 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/Startup.unity
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using UnityEngine;

namespace Unity.Multiplayer.Samples.Utilities
{
public class DontDestroyOnLoad : MonoBehaviour
{
void Awake()
{
DontDestroyOnLoad(gameObject);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using System.Collections;
using UnityEngine;

namespace Unity.Multiplayer.Samples.Utilities
{
public class AutoHide : MonoBehaviour
{
[SerializeField]
float m_TimeToHideSeconds = 5f;

// Start is called before the first frame update
void Start()
{
StartCoroutine(HideAfterSeconds());
}

IEnumerator HideAfterSeconds()
{
yield return new WaitForSeconds(m_TimeToHideSeconds);
gameObject.SetActive(false);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using Unity.Multiplayer.Tools.NetStatsMonitor;
using UnityEngine;

namespace Unity.Multiplayer.Samples.Utilities
{
public class NetStatsMonitorCustomization : MonoBehaviour
{
[SerializeField]
RuntimeNetStatsMonitor m_Monitor;

const int k_NbTouchesToOpenWindow = 3;

void Start()
{
m_Monitor.enabled = false;
}

void Update()
{
if (Input.GetKeyUp(KeyCode.S) || Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown())
{
m_Monitor.enabled = !m_Monitor.enabled; // toggle
}
}

static bool AnyTouchDown()
{
foreach (var touch in Input.touches)
{
if (touch.phase == TouchPhase.Began)
{
return true;
}
}

return false;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading