Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2019.3/marc #67

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
027984a
Updated burst package, fixed missing renderer shaders
Verasl Jun 24, 2019
a93d35c
Update package to public 7.0.0 package
Verasl Jul 23, 2019
c82946b
Merge branch 'release/2019.3' into Update-to-package-7.0.0
Verasl Jul 23, 2019
79f9093
Merge pull request #47 from Verasl/Update-to-package-7.0.0
Verasl Jul 23, 2019
124be89
Update BushTest normal map
hkr Aug 29, 2019
5db1cbf
Vegetation ShaderGraph: Normalize normal before master node
hkr Aug 29, 2019
5ee2c75
Bugfix/nan (#53)
hkr Sep 3, 2019
edfbbcb
Merge remote-tracking branch 'origin/bugfix/nan' into release/2019.3
Verasl Nov 18, 2019
73530a4
Update README.md
Verasl Jul 30, 2019
0116262
Update LICENSE
Verasl Nov 18, 2019
0d43432
Rename LICENSE to LICENSE.md
Verasl Nov 18, 2019
9ae675d
Merge branch 'master' into release/2019.3
Verasl Jan 21, 2020
d30ad88
Merge branch 'master' into release/2019.3
Verasl Jan 21, 2020
f45b378
Fixed typo in welcome screen
Verasl Jan 30, 2020
dfd1d89
Added audio files for collisions
unitymarc Feb 2, 2020
6e36bdb
New code for Impulse listening on collisions
unitymarc Feb 2, 2020
66328db
Allow for randomized audio on boat collisions
unitymarc Feb 2, 2020
c29bd67
Fixed an NPE in AiController
unitymarc Feb 2, 2020
c83ee8f
Debug code useful for understanding state of Impulses
unitymarc Feb 2, 2020
5cc1af5
Updates to the Boat prefab to allow for impulses, state driven camera…
unitymarc Feb 2, 2020
f269825
Other things changed in process. It's possible that this commit could…
unitymarc Feb 2, 2020
18512d0
Added a fire control for guns
unitymarc Mar 5, 2020
b04c261
Updated to latest 2019.3
unitymarc Mar 5, 2020
0283e1e
New GunController class
unitymarc Mar 5, 2020
3b96391
Fix a couple NPEs in Boat.cs
unitymarc Mar 5, 2020
76ae3fb
Binary changes to add guns
unitymarc Mar 5, 2020
b40e036
Added gun particles
unitymarc Mar 5, 2020
45e0703
Save the prefab properly
unitymarc Mar 5, 2020
13cabd4
added some ProBuilder stuff and FBX export
HouseinCornell Mar 17, 2020
07981fb
another try
HouseinCornell Mar 17, 2020
f394583
no message
HouseinCornell Mar 23, 2020
25d8d1d
added new fbx packages with some fixes
HouseinCornell Mar 24, 2020
10def9f
updates on fbx files
HouseinCornell Mar 24, 2020
c9c09a4
updates for Mike
HouseinCornell Mar 24, 2020
6b060bd
added a bunch of assets.. not cleaned up, but should link to missing …
HouseinCornell Mar 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Assets/Audio/Boat/Crash.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Crash.mp3.meta

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

Binary file added Assets/Audio/Boat/Dumpster_Door_Hit.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Dumpster_Door_Hit.mp3.meta

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

3 changes: 3 additions & 0 deletions Assets/Audio/Boat/Face_Hit_Series_01.wav
Git LFS file not shown
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Face_Hit_Series_01.wav.meta

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

Binary file added Assets/Audio/Boat/Footstep_on_Cracked_Glass.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Footstep_on_Cracked_Glass.mp3.meta

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

Binary file added Assets/Audio/Boat/Glass_Crush.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Glass_Crush.mp3.meta

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

Binary file added Assets/Audio/Boat/Iron_Club_Hits_Golf_Ball.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Iron_Club_Hits_Golf_Ball.mp3.meta

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

3 changes: 3 additions & 0 deletions Assets/Audio/Boat/Soccer_Ball_Bounce_Series_01.wav
Git LFS file not shown
22 changes: 22 additions & 0 deletions Assets/Audio/Boat/Soccer_Ball_Bounce_Series_01.wav.meta

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

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

using Cinemachine;


public class CMCoreListener : MonoBehaviour
{

public CinemachineImpulseListener l1;

public CinemachineImpulseListener l2;

private bool isHitL1;
private bool isHitL2;



private void Update()
{
Vector3 soundLocationL1 = Vector3.zero;
Quaternion rotLocL1 = Quaternion.identity;
isHitL1 = CinemachineImpulseManager.Instance.GetImpulseAt(l1.transform.position, false,
l1.m_ChannelMask, out soundLocationL1, out rotLocL1);

Vector3 soundLocationL2 = Vector3.zero;
Quaternion rotLocL2 = Quaternion.identity;
isHitL2 = Cinemachine.CinemachineImpulseManager.Instance.GetImpulseAt(l1.transform.position, false,
l1.m_ChannelMask, out soundLocationL2, out rotLocL2);

}

private void OnGUI()
{
if (gameObject.transform.parent != null && gameObject.transform.parent.name == "Player 4")
{
string str = string.Format("Hit1: {0}\nHit2: {1}", isHitL1.ToString(), isHitL2.ToString());
GUI.TextField(new Rect(0, 0, 100, 100), str);

}
}
}
11 changes: 11 additions & 0 deletions Assets/CMCoreListener.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 Assets/Data/DiscoverAsset.asset
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MonoBehaviour:
EnableShowAtStartup: 1
PreferenceName: Discover
Title: Welcome to the Boat Attack demo project!
Description: 'This demo makes use of the Universal Render Pipeline and is deisgned
Description: 'This demo makes use of the Universal Render Pipeline and is designed
to showcase and display examples of how to use some of the features included
with Universal RP and other exciting features available in Unity.

Expand Down
19 changes: 19 additions & 0 deletions Assets/Data/InputControls.inputactions
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
"expectedControlType": "",
"processors": "AxisDeadzone(min=0.1,max=1)",
"interactions": ""
},
{
"name": "Fire",
"type": "Button",
"id": "332a0724-a896-4f33-b724-dfba70e0acbe",
"expectedControlType": "",
"processors": "AxisDeadzone(min=0.1,max=1)",
"interactions": ""
}
],
"bindings": [
Expand Down Expand Up @@ -475,6 +483,17 @@
"action": "Time",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7f367731-0900-42d0-869c-070335cfc410",
"path": "<Keyboard>/tab",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
}
]
}
Expand Down
Binary file modified Assets/Objects/Levels/Island/Terrain_0_0.asset
Binary file not shown.
Binary file modified Assets/Objects/Levels/Island/Terrain_1_0.asset
Binary file not shown.

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

3 changes: 3 additions & 0 deletions Assets/Objects/boats/BFWC_done.fbx
Git LFS file not shown
96 changes: 96 additions & 0 deletions Assets/Objects/boats/BFWC_done.fbx.meta

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

Loading