Skip to content

Commit c8209d0

Browse files
dwoodruffsfdwoodruffsf
authored
Merge pull request #253 from Unity-Technologies/release_merge_april_v2
merge of releave/v0.1.0-experimental back to develop
2 parents 638e71a + f632ebd commit c8209d0

File tree

295 files changed

+10426
-36409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+10426
-36409
lines changed

‎ARCHITECTURE.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,20 @@ For an in-depth overview of the project's architecture please check out our [ARC
5050
- Once path-plan is finished, server representation of entity starts updating its NetworkedTransform at 30fps. Graphics is on a separate GO and is connected to the networked GO via a spring, to smooth out small corrections.
5151
- Graphics GO never passes the simulation GO; if it catches up to the sim due to a network delay, the user will see a hitch.
5252

53+
### Transports
54+
55+
Boss Room provides players with two ways to connect to a server.
56+
57+
- IP based: The clients connect directy to a host via IP address. This will only work if both are in the same local are network or if the host forwards ports.
58+
- Relay Based: The clients and the host connect to a relay server with a room key and run all traffic over this relay server.
59+
60+
To allow for both of these options to be chosen at runtime we created `TransportPicker`. `Transport` picker allows to chose a ip based and a relay based transport and will hook up the game UI to use those transports. The transport field in the `NetworkManager` will be ignored. Currently we support the following transports:
61+
- **UNet(IP):** UNet is the default MLAPI transport and the default IP transport for Boss Room.
62+
- **LiteNetLib(IP):** We use LiteNetLib in Boss Room because it has a built in way to simulate latency which is useful for spotting networking issues early during development.
63+
- **Photon Realtime (Relay):** Photon Realtime is a relay transport using the [Photon Realtime Service](https://www.photonengine.com/Realtime).
64+
65+
To add new transport in the project parts of `GameNetPortal` and `ClientGameNetPortal` (transport switches) need to be extended.
66+
5367
### Navigation System
5468

5569
#### Building a navigation mesh

‎Assets/BossRoom/GameData/Action/Archer/ArcherChargedShot.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:00671f43bc621582d3df54d0dab1dbb99bf124d6bd44d7b6f4d0844b04703acb
3-
size 1682
2+
oid sha256:afabf49dab53bbbb8a34f457329a3d0d61e0a82164a97e209ddaa5d20ebe61f8
3+
size 1683

‎Assets/BossRoom/GameData/Action/Archer/ArcherVolley.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:978c285031469d9ed347e21f328e2c03e7512b04d3301b7c21727b8ba91f5bb9
3-
size 1629
2+
oid sha256:640c858ecd9c5827053df2e45988039fd7f1e255bddedb21d588fa6bdc697ecd
3+
size 1630

‎Assets/BossRoom/GameData/Action/General/Revive.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:bbc1c14f35b828ccdfc656f1bb6e00c92d659dd859aff843a5e1f6f51083e803
3-
size 847
2+
oid sha256:a8f40e307bb0a0385d428a744699698fa02a931e5874290d58b3a335b60cabc1
3+
size 858

‎Assets/BossRoom/GameData/Action/Imp/ImpBaseAttack.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a2ee589c52ecd8bc0037717c84d838d6f6d4822b9846e4be97effdc24dea6b97
3-
size 863
2+
oid sha256:5ba7dbcb8c32a01bdacdf8a5591b7a17bf0d68547e61b0376533608123a31b26
3+
size 864

‎Assets/BossRoom/GameData/Action/Mage/MageBaseAttack.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1422735750a15bb73198babdd42d61e446c2cf664e132863f34a67b029850dc5
3-
size 1132
2+
oid sha256:9457e6f90f0fcc1e75c612d0c5ba498c47e64d695ed4334020ffba744f3bfb87
3+
size 1178

‎Assets/BossRoom/GameData/Action/Mage/MageHeal.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d4648ec34aac10b4a98225e881194cf20a824ca22822418660861ea89d1797ac
3-
size 991
2+
oid sha256:4faf37ef9b30e641b5b7ddcfc46655f75a6da2b9aa9123599f2f2d2272ba2064
3+
size 971

‎Assets/BossRoom/GameData/Action/Rogue/RogueBaseAttack.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2528bd442c336345ec9e48c53e94827fd41b5477adaed6830067c97447b9225f
3-
size 952
2+
oid sha256:8624f1f954b41512c61899c7a36503df267e72f87281dd7bf8fdcb5f1438d55c
3+
size 953

‎Assets/BossRoom/GameData/Action/Rogue/RogueStealthMode.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dd5a352dfe61dd0a5dacdfe6b8f18dc5da9a8886d039fda1c832fcf140aabc78
3-
size 1064
2+
oid sha256:75d15662edfa081857e9aa63b434b39e1f77153652e07fa05bee1adf200f195f
3+
size 1088

‎Assets/BossRoom/GameData/Action/Tank/TankBaseAttack.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dbe38680d5f9c214f52841cad7e0f4fc6eae9c4ddd388c71cea139e8fcf74e45
3-
size 970
2+
oid sha256:9f2f2f09871b56ad3a0bb2beedb17c4192941891ae675ed1e21dbdb615730023
3+
size 971

0 commit comments

Comments
 (0)