Commit 008e8a97 authored by Andrew Van Buren's avatar Andrew Van Buren
Browse files

Merge branch 'master' of git.gmu.edu:gadig/four into character

# Conflicts:
#	Assets/Scripts/Boss.cs
#	Assets/Scripts/FireballMove.cs
#	Assets/Scripts/FireballMove.cs.meta
#	Assets/script/FireballMove.cs.meta
#	Assets/script/TurtleActions.cs.meta
parents 8b4dacbe 17ee1245
fileFormatVersion: 2
guid: 3f69cf60d3105914bacdd6f4714c0732
timeCreated: 1479601880
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7f22a116230fac449b0aba6f00875b4d
timeCreated: 1479601888
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 90809fca9c1d0eb44a3dbe384eaac91b
timeCreated: 1479601888
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d28e37e53d221f444ae4f505b4933f64
timeCreated: 1479601888
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
using System.Collections;
public class CodecPoint : MonoBehaviour {
public enum CommType { codec, burst };
public bool isOn;
public CommType thisCommType;
public string[] codecText;
public float[] codecWaitTimes;
public int[] codecSpeaker;
}
fileFormatVersion: 2
guid: 906231cf7d8afa14d8f725a179188852
timeCreated: 1479601881
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
using System.Collections;
public class EnemyProjectile : MonoBehaviour {
// TEMPORARY
// Does not damage player
void OnCollisionEnter2D(Collision2D col) {
Destroy(gameObject);
}
}
using UnityEngine;
using System.Collections;
public class EnemyProjectile : MonoBehaviour {
// TEMPORARY
// Does not damage player
void OnCollisionEnter2D(Collision2D col) {
Destroy(gameObject);
}
}
using UnityEngine;
using System.Collections;
public class FireballMove : MonoBehaviour {
public float speed;
private Rigidbody2D fireRB;
public Vector2 move;
// Use this for initialization
void Start () {
fireRB = GetComponent<Rigidbody2D> ();
fireRB.velocity = (move * speed);
}
void OnCollisionEnter2D(Collision2D c){
Destroy (gameObject);
}
}
fileFormatVersion: 2
guid: b245668d1f70fae43ba9905676a8f688
timeCreated: 1477616043
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment