Merge pull request #56 from josutk/devel

Integrated game with gameplay pendings
josutk · Jul 3, 2019 · b15c80e · b15c80e
2 parents 4b36829 + 140d0e5
commit b15c80e
Show file tree

Hide file tree

Showing 418 changed files with 79,050 additions and 1,071 deletions.
diff --git a/Pinball/Assets/Audio/Effects/Big Bumper.wav b/Pinball/Assets/Audio/Effects/Big Bumper.wav
diff --git a/Pinball/Assets/Audio/Effects/Big Bumper.wav.meta b/Pinball/Assets/Audio/Effects/Big Bumper.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/FlipperUp.wav b/Pinball/Assets/Audio/Effects/FlipperUp.wav
diff --git a/Pinball/Assets/Audio/Effects/FlipperUp.wav.meta b/Pinball/Assets/Audio/Effects/FlipperUp.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/Medium Bumper.wav b/Pinball/Assets/Audio/Effects/Medium Bumper.wav
diff --git a/Pinball/Assets/Audio/Effects/Medium Bumper.wav.meta b/Pinball/Assets/Audio/Effects/Medium Bumper.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/Slingshot.wav b/Pinball/Assets/Audio/Effects/Slingshot.wav
diff --git a/Pinball/Assets/Audio/Effects/Slingshot.wav.meta b/Pinball/Assets/Audio/Effects/Slingshot.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/Small Bumper.wav b/Pinball/Assets/Audio/Effects/Small Bumper.wav
diff --git a/Pinball/Assets/Audio/Effects/Small Bumper.wav.meta b/Pinball/Assets/Audio/Effects/Small Bumper.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/Standup.wav b/Pinball/Assets/Audio/Effects/Standup.wav
diff --git a/Pinball/Assets/Audio/Effects/Standup.wav.meta b/Pinball/Assets/Audio/Effects/Standup.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/ballrelease.wav b/Pinball/Assets/Audio/Effects/ballrelease.wav
diff --git a/Pinball/Assets/Audio/Effects/ballrelease.wav.meta b/Pinball/Assets/Audio/Effects/ballrelease.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/fx_spinner.wav b/Pinball/Assets/Audio/Effects/fx_spinner.wav
diff --git a/Pinball/Assets/Audio/Effects/fx_spinner.wav.meta b/Pinball/Assets/Audio/Effects/fx_spinner.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/kicker_enter_center.wav b/Pinball/Assets/Audio/Effects/kicker_enter_center.wav
diff --git a/Pinball/Assets/Audio/Effects/kicker_enter_center.wav.meta b/Pinball/Assets/Audio/Effects/kicker_enter_center.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/knocker.wav b/Pinball/Assets/Audio/Effects/knocker.wav
diff --git a/Pinball/Assets/Audio/Effects/knocker.wav.meta b/Pinball/Assets/Audio/Effects/knocker.wav.meta
diff --git a/Pinball/Assets/Audio/Effects/plunger.wav b/Pinball/Assets/Audio/Effects/plunger.wav
diff --git a/Pinball/Assets/Audio/Effects/plunger.wav.meta b/Pinball/Assets/Audio/Effects/plunger.wav.meta
diff --git a/Pinball/Assets/Fonts.meta b/Pinball/Assets/Fonts.meta
diff --git a/Pinball/Assets/Fonts/digital-7.ttf b/Pinball/Assets/Fonts/digital-7.ttf
diff --git a/Pinball/Assets/Fonts/digital-7.ttf.meta b/Pinball/Assets/Fonts/digital-7.ttf.meta
diff --git a/Pinball/Assets/Images/BasePinball.jpg b/Pinball/Assets/Images/BasePinball.jpg
diff --git a/Pinball/Assets/Images/BasePinball.jpg.meta b/Pinball/Assets/Images/BasePinball.jpg.meta
diff --git a/Pinball/Assets/Images/ChapaBase.jpg b/Pinball/Assets/Images/ChapaBase.jpg