Browse Source

Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop

# Conflicts:
#	Assets/Scenes/PlayerJoinScene.unity
develop
Joshua Reason 3 years ago
parent
commit
f789e9279b
3 changed files with 8 additions and 8 deletions
  1. BIN
      Assets/Scenes/MainGameplayScene.unity
  2. +4
    -4
      Assets/World Assets/Prefabs/Player.prefab
  3. BIN
      ProjectSettings/EditorBuildSettings.asset

BIN
Assets/Scenes/MainGameplayScene.unity (Stored with Git LFS) View File

size 655013

+ 4
- 4
Assets/World Assets/Prefabs/Player.prefab View File

@ -29,7 +29,7 @@ Transform:
m_GameObject: {fileID: 2725293205319018834} m_GameObject: {fileID: 2725293205319018834}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: m_Children:
- {fileID: 7280267804154012179} - {fileID: 7280267804154012179}
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -65,7 +65,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 513431a08a8506242ba8fc3919ccf76e, type: 3} m_Script: {fileID: 11500000, guid: 513431a08a8506242ba8fc3919ccf76e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_playerSpeed: 5
m_playerSpeed: 20
m_rotationSpeed: 10 m_rotationSpeed: 10
m_turnRadius: m_turnRadius:
serializedVersion: 2 serializedVersion: 2
@ -125,9 +125,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3} m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
yeetVelocity: 5
yeetVelocity: 20
yeetDuration: 2 yeetDuration: 2
windupSpeed: 0.01
windupSpeed: 0.05
m_YeetAnimator: {fileID: 7280267804803618209} m_YeetAnimator: {fileID: 7280267804803618209}
--- !u!1 &6496616781582263990 --- !u!1 &6496616781582263990
GameObject: GameObject:

BIN
ProjectSettings/EditorBuildSettings.asset (Stored with Git LFS) View File

size 569

Loading…
Cancel
Save