Commit c13ba78
committed
Merge branch 'develop' into sam/feat/bump-NGO-to-1.1
* develop: (60 commits)
fix: removing FindObjectOfType for a serialized reference (#754)
fix: can click through loading screen [MTT-4753] (#760)
Update CHANGELOG.md (#765)
feat: Architecture.md update (MTT-2637) (#763)
Update README.md (#759)
Updating utilities package for release (#764)
Version bumps (#761)
Updating broken PR links (shouldn't be linked to jira) and changelog fixes (#758)
adding components refs to index (#757)
Adding link to feedback form at the top (#756)
chore: adding details to changelog (#746)
Updating readme with Typeform for feedback (#755)
made arrow trails smaller (#750)
Fixed up some layer settings on some archer VFX so that they show up properly! (#739)
fix: lobby UI unblocking before it should [MTT-4579] (#748)
feat: PubSub improvement: ISubscriber unsub [MTT-2765] (#612)
Fix: Reduction of SSAO Cost (Especially on Mac) [MTT-4558] (#753)
fix: Moving utp to component instead of child GameObject (#752)
Adding TOC and index to readme [MTT-4617] (#736)
Feat: Char Portrait Mouse Hover Feedback [MTT-4754] (#751)
...
# Conflicts:
# Assets/Prefabs/NetworkingManager.prefabFile tree
669 files changed
+55031
-16820
lines changed- .github
- .yamato
- Assets
- GameData
- Action
- Archer
- Boss
- General
- Imp
- Mage
- Rogue
- Tank
- VandalImp
- Character
- Archer
- ImpBoss
- Imp
- Mage
- Rogue
- Tank
- VandalImp
- Transforms
- Material/Characters/Toon
- Models
- Animation Controllers
- Prefabs
- CharGFX
- CharacterGraphics
- Character
- Dungeon
- Dungeon Pieces
- pillar
- pots
- GameCam
- Game
- StaticNetworkObjects
- State
- UI
- Scenes
- BossRoom
- Scripts
- ApplicationLifecycle
- Messages
- Audio
- CameraUtils
- ConnectionManagement
- ConnectionState
- Editor
- Readme
- Gameplay
- Action
- ActionPlayers
- ConcreteActions
- Input
- Configuration
- DebugCheats
- GameState
- GameplayObjects
- AnimationCallbacks
- Audio
- Character
- AI
- Projectiles
- RuntimeDataContainers
- Messages
- UI
- Lobby
- UserInput
- Infrastructure
- PubSub
- ScriptableObjectArchitecture
- Editor
- UnityServices
- Auth
- Infrastructure
- Messages
- Lobbies
- Messages
- Utils
- NetworkOverlay
- VisualEffects
- Sounds
- Character/Imp
- Env
- Tests/Runtime
- Textures/UI
- URP
- Mobile
- Windows
- VFX
- Materials
- Prefabs
- Archer
- Boss
- Caster
- Environment
- Imp
- Throw_bomb
- TossAttack
- Rogue
- Textures
- Documentation/Images
- Packages
- com.unity.multiplayer.samples.coop
- Utilities
- Net
- ClientAuthority
- RNSM
- SceneManagement
- ProjectSettings
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
669 files changed
+55031
-16820
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
122 | | - | |
| 122 | + | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
| 3 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
| 3 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
| 3 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments