Commits · 259b4a75642a807e73be5be8535640bebb1acf12 · SplooshArts / Lockdown

Feb 28, 2016

Merge branch 'master' of https://git.science.uu.nl/SplooshArts/Lockdown · 259b4a75

jan authored 9 years ago

# Conflicts:
#	Lockdown/Assets/Folder1/Scene1.unity.meta
#	Lockdown/Assets/Prefabs.meta
#	Lockdown/Assets/Scenes/MainScene.unity
#	Lockdown/Assets/Scenes/MainScene.unity.meta
#	Lockdown/Assets/Scenes/Multiplayer Test.unity.meta
#	Lockdown/Assets/Scripts.meta

259b4a75

Multiplayer works over LAN · 2a71d9aa
jan authored 9 years ago

2a71d9aa

Feb 19, 2016
- Folders added · 6b6efabb
  Mees authored 9 years ago
  
  6b6efabb
Feb 17, 2016
- Added a scene and a test folder · 891f4ac3
  Mees authored 9 years ago
  
  891f4ac3
- Removed test script · 2455d3f2
  Mees authored 9 years ago
  
  2455d3f2
- Firstt commit, contains the Unity standard files. · 4eb34e3e
  Mees authored 9 years ago
  
  4eb34e3e
- Test · fb917d69
  Mees authored 9 years ago
  
  fb917d69