Skip to content

Commit

Permalink
Merged Jakob into master
Browse files Browse the repository at this point in the history
  • Loading branch information
doingitraith committed Jan 21, 2017
2 parents 5354483 + ef6d58f commit 6920c7c
Show file tree
Hide file tree
Showing 20 changed files with 300 additions and 1 deletion.
9 changes: 9 additions & 0 deletions GGJ17/Assets/Images.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Images/portrait1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions GGJ17/Assets/Images/portrait1.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Images/portrait2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions GGJ17/Assets/Images/portrait2.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions GGJ17/Assets/Prefab/Dialog.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Prefab/Dialog/Dialog Left.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions GGJ17/Assets/Prefab/Dialog/Dialog Left.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions GGJ17/Assets/Prefab/Dialog/Dialog Right.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Prefab/UI.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions GGJ17/Assets/Prefab/UI.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added GGJ17/Assets/Scene/IntroScene.unity
Binary file not shown.
8 changes: 8 additions & 0 deletions GGJ17/Assets/Scene/IntroScene.unity.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions GGJ17/Assets/Script/Dialog.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions GGJ17/Assets/Script/Dialog/Dialog.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class Dialog : MonoBehaviour
{
public List<string> speeches;

// Use this for initialization
void Start()
{
}

// Update is called once per frame
void Update()
{
}

public IEnumerator talk()
{
foreach(string s in speeches)
{
GameObject g = new GameObject();
g.transform.parent = this.gameObject.transform;
DialogBox d = new DialogBox();

yield return new WaitForSeconds(2.0f);
}
}
}
12 changes: 12 additions & 0 deletions GGJ17/Assets/Script/Dialog/Dialog.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions GGJ17/Assets/Script/Dialog/DialogBox.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

public class DialogBox : MonoBehaviour
{
private Text textbox;

// Use this for initialization
void Start()
{
textbox = GetComponent<Text>();
}

// Update is called once per frame
void Update()
{

}

public IEnumerator Speak(string text)
{
int i = 0;
textbox.text = "";

while(i < text.Length)
{
textbox.text += text[i];
++i;
yield return new WaitForSeconds(.5f);
}
}
}
12 changes: 12 additions & 0 deletions GGJ17/Assets/Script/Dialog/DialogBox.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion GGJ17/Assets/Script/GodView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class GodView : MonoBehaviour {

public void enableConstructionMode(GameObject prefab)
{

constructionPrefab = prefab;
}

// Use this for initialization
Expand Down

0 comments on commit 6920c7c

Please sign in to comment.