Skip to content

Commit

Permalink
Adding interactions,
Browse files Browse the repository at this point in the history
adding setting parsing,
fixing behaviours
  • Loading branch information
mrayy committed Aug 22, 2017
1 parent cae08a7 commit 2adc381
Show file tree
Hide file tree
Showing 103 changed files with 1,367 additions and 924 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
*.booproj
#*.*.meta

*.mp4

/Assets/StreamingAssets/
/Assets/Libraries/FFmpegOut/

# Unity3D generated meta files
#*.pidb.meta

Expand Down
8 changes: 8 additions & 0 deletions Assets/Data/Settings.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[WebCamera]
Index=1
Width=640
Height=480

[Simulation]
NoWebcam=false
NoLeapmotion=false
8 changes: 8 additions & 0 deletions Assets/Data/Settings.ini.meta

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

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

Binary file not shown.

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

Binary file not shown.
6 changes: 6 additions & 0 deletions Assets/Libraries/Advanced INI Parser/How to use.pdf.meta

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

Loading

0 comments on commit 2adc381

Please sign in to comment.