From f18f678776861871d1c8da289b3ebad96bb8f06d Mon Sep 17 00:00:00 2001 From: Souradeep-Nanda Date: Fri, 6 Jun 2014 12:30:28 +0530 Subject: [PATCH 1/4] Added color to the bowling ball TODO: Let the player customize the bowling ball color --- Bowling/Assembly-CSharp-vs.csproj | 1 + Bowling/Assembly-CSharp.csproj | 1 + Bowling/Assets/Materials/BowlingBall.mat | Bin 0 -> 4312 bytes Bowling/Assets/Materials/BowlingBall.mat.meta | 4 ++++ Bowling/Assets/Prefabs/BowlingBall.prefab | Bin 0 -> 12856 bytes .../Assets/Prefabs/BowlingBall.prefab.meta | 4 ++++ Bowling/Assets/Scenes/BowlingAlley.unity | Bin 47080 -> 48888 bytes Bowling/Assets/Scripts/CameraController.cs | 2 +- Bowling/Assets/Scripts/ColorPicker.cs | 16 ++++++++++++++++ Bowling/Assets/Scripts/ColorPicker.cs.meta | 8 ++++++++ Bowling/Bowling-csharp.sln | 2 +- Bowling/Bowling.sln | 2 +- Bowling/Bowling.userprefs | 9 +++++++-- Bowling/Library/CurrentLayout.dwlt | Bin 33744 -> 33728 bytes Bowling/Library/InspectorExpandedItems.asset | Bin 4248 -> 4292 bytes .../ScriptAssemblies/Assembly-CSharp.dll | Bin 7168 -> 7680 bytes .../ScriptAssemblies/Assembly-CSharp.dll.mdb | Bin 1561 -> 1805 bytes Bowling/Library/ScriptMapper | Bin 8476 -> 8500 bytes Bowling/Library/assetDatabase3 | Bin 28920 -> 29588 bytes Bowling/Library/guidmapper | Bin 4916 -> 5416 bytes .../c7/c7f4dd49eb06e4054aa64929af1e9258 | Bin 5553 -> 5533 bytes 21 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 Bowling/Assets/Materials/BowlingBall.mat create mode 100644 Bowling/Assets/Materials/BowlingBall.mat.meta create mode 100644 Bowling/Assets/Prefabs/BowlingBall.prefab create mode 100644 Bowling/Assets/Prefabs/BowlingBall.prefab.meta create mode 100644 Bowling/Assets/Scripts/ColorPicker.cs create mode 100644 Bowling/Assets/Scripts/ColorPicker.cs.meta diff --git a/Bowling/Assembly-CSharp-vs.csproj b/Bowling/Assembly-CSharp-vs.csproj index 4e6d0aa..caaf317 100644 --- a/Bowling/Assembly-CSharp-vs.csproj +++ b/Bowling/Assembly-CSharp-vs.csproj @@ -49,6 +49,7 @@ +