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

Group 1 - Descent #21

Open
wants to merge 95 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
685021b
Create README.md
zdragonite21 Sep 14, 2024
19414bc
mesh generator
zdragonite21 Sep 14, 2024
c3400c7
old main
zdragonite21 Sep 21, 2024
52742b5
main scene
zdragonite21 Sep 21, 2024
8845a4a
correct terrrain orientation
zdragonite21 Sep 21, 2024
ec3d354
some new stuff
Bean-Github Sep 21, 2024
b8b090c
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Sep 21, 2024
827f074
Added my snowboarding script
RRECASMaR Sep 21, 2024
f462527
done with movement!
Bean-Github Sep 21, 2024
6d70562
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Sep 21, 2024
4934df6
fixed some conflict
Bean-Github Sep 21, 2024
9fd8d2d
smooth rotation, we need to fix the player from not being able to get…
Bean-Github Sep 21, 2024
27fe5d3
Done except there is some weird grounded thing
Bean-Github Sep 21, 2024
a7bd958
Layer pushing stuff
Bean-Github Sep 28, 2024
679b648
ground layer
zdragonite21 Sep 28, 2024
711e2f1
Flipping Out
Bean-Github Sep 28, 2024
1e976de
trees
zdragonite21 Sep 28, 2024
de43cd8
fir trees and updates
zdragonite21 Sep 28, 2024
94c85c8
Better Movement!
Bean-Github Sep 28, 2024
71096c5
with trees
Bean-Github Sep 28, 2024
747632f
fixed grounded
Bean-Github Sep 28, 2024
3cdf65a
new tree color
zdragonite21 Sep 28, 2024
936a02b
NEW SCATTER
zdragonite21 Sep 28, 2024
2a0ced3
Updated Movement
RRECASMaR Oct 4, 2024
5553dd2
ROCKS
zdragonite21 Oct 6, 2024
f2f2190
yurr
zdragonite21 Oct 7, 2024
0003de1
Added points and dying
RRECASMaR Oct 8, 2024
eb49a13
new scene and moved script
zdragonite21 Oct 10, 2024
98d286f
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Oct 10, 2024
ce0427c
Update Grounded.cs
Bean-Github Oct 11, 2024
041d2ed
Done with grounded
Bean-Github Oct 11, 2024
3cacb1c
Audio stuff
Bean-Github Oct 11, 2024
924738e
poisson disks updates :C
zdragonite21 Oct 11, 2024
dee65fc
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Oct 11, 2024
e52b760
Player animation + snow shader
organicbran Oct 11, 2024
a09c3d4
new tree scattering
zdragonite21 Oct 12, 2024
671d5a1
pooling trees
zdragonite21 Oct 12, 2024
05bfc24
New rocks
organicbran Oct 12, 2024
b33a0cb
removing debugs
zdragonite21 Oct 12, 2024
c6ebae8
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Oct 12, 2024
91ee57e
Camera Changes and audio
Bean-Github Oct 12, 2024
850d729
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Oct 12, 2024
9a49dd8
extended view dist
zdragonite21 Oct 12, 2024
45944c3
Scoring and UI
organicbran Oct 12, 2024
bc3d75f
trail
zdragonite21 Oct 12, 2024
77ee440
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Oct 12, 2024
0fc56bd
fixed bryan zach merge
zdragonite21 Oct 12, 2024
2d4d0b2
small update
zdragonite21 Oct 12, 2024
292f2a3
Particles done
Bean-Github Oct 12, 2024
aefcfdd
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Oct 12, 2024
b3d61aa
Demo done!
Bean-Github Oct 12, 2024
85cd067
New font
organicbran Oct 12, 2024
4fd68db
Death Fix
RRECASMaR Oct 12, 2024
5f7c83d
Death Fixed again
RRECASMaR Oct 13, 2024
07e7ade
fixed restarting
zdragonite21 Oct 19, 2024
0849126
working build!!!!!
zdragonite21 Oct 19, 2024
42a5b6d
static trees
zdragonite21 Oct 24, 2024
d2376a0
TERRAIN POOLING
zdragonite21 Oct 24, 2024
93587d6
WIND AND SNOWBOARD SFX
zdragonite21 Oct 25, 2024
330bf2d
SAND BIOME
zdragonite21 Oct 26, 2024
4b0cbeb
sand dunes with switchable modes
zdragonite21 Oct 26, 2024
9faa065
cactus
zdragonite21 Oct 26, 2024
a278f26
organized
Bean-Github Oct 26, 2024
6880cf4
Update WeatherManager.cs
Bean-Github Oct 26, 2024
4f1b4b2
Fixed jittering
RRECASMaR Oct 26, 2024
51ad190
trail
zdragonite21 Oct 26, 2024
aa74e43
trail
zdragonite21 Oct 26, 2024
145eecf
fix holes maybe?
zdragonite21 Oct 27, 2024
1c4778a
Fixed Movement, Added Trees, Added TreeRun mechanic
RRECASMaR Nov 10, 2024
d16e4f4
stuff
Bean-Github Nov 13, 2024
fa45ce1
small movement fix
RRECASMaR Nov 16, 2024
6a5b6e5
trail renderer implementation thick and thin
zdragonite21 Nov 16, 2024
18eb30b
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Nov 16, 2024
7f99d3b
yo
Bean-Github Nov 16, 2024
3b56dd6
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Nov 16, 2024
2d94a2d
stuff
Bean-Github Nov 16, 2024
400e564
camera fixed
Bean-Github Nov 16, 2024
f5baf85
teehee
RRECASMaR Nov 16, 2024
e17964c
some weather
Bean-Github Nov 16, 2024
ace93a2
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Nov 16, 2024
c002d48
snow fixed
Bean-Github Nov 16, 2024
b1a690d
snow
Bean-Github Nov 17, 2024
3c43eda
tree tilt exposed parameter
zdragonite21 Nov 17, 2024
0fd29df
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
zdragonite21 Nov 17, 2024
4c8f145
weather
Bean-Github Nov 17, 2024
cd3b645
Merge branch 'main' of https://github.com/zdragonite21/descent-upgrade
Bean-Github Nov 17, 2024
2320f81
for pr
zdragonite21 Dec 7, 2024
c86ed92
catcus new
zdragonite21 Dec 7, 2024
59bebde
Fixed Tricking Midair
RRECASMaR Dec 7, 2024
2080bc9
cactus color
zdragonite21 Dec 7, 2024
808225d
new materials for sand done!
zdragonite21 Dec 7, 2024
58f5bb5
Final few edits
RRECASMaR Dec 7, 2024
35bc065
Splash screen and logo
organicbran Dec 20, 2024
cb2731d
new
zdragonite21 Jan 22, 2025
eda4426
blah blah
Bean-Github Jan 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ crashlytics-build.properties

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
/[Aa]ssets/[Ss]treamingAssets/aa/*
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
55 changes: 55 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "descent-upgrade.sln"
}
6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
8 changes: 8 additions & 0 deletions Assets/DESCENT.meta

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

8 changes: 8 additions & 0 deletions Assets/DESCENT/Audio.meta

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

68 changes: 68 additions & 0 deletions Assets/DESCENT/Audio/Ambient Audio.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7390591601816208003
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4802818650349675216}
- component: {fileID: 5679709640982731104}
m_Layer: 0
m_Name: Ambient Audio
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4802818650349675216
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7390591601816208003}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5679709640982731104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7390591601816208003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 764012554e1b17a45916cd44315f22fd, type: 3}
m_Name:
m_EditorClassIdentifier:
sounds:
- name: Music
audioClip: {fileID: 8300000, guid: 589a5d618eed4214d86a8bf6ff8d3efe, type: 3}
volume: 0.789
pitch: 1
isLooping: 1
playOnAwake: 1
audioSource: {fileID: 0}
- name: Wind
audioClip: {fileID: 8300000, guid: 1f05b686ef3d0b74ea1fb027da41ba07, type: 3}
volume: 0.147
pitch: 1
isLooping: 1
playOnAwake: 1
audioSource: {fileID: 0}
- name: Background
audioClip: {fileID: 8300000, guid: 98caff2b238df1a48b5a7f45d41b113a, type: 3}
volume: 0.354
pitch: 1
isLooping: 1
playOnAwake: 1
audioSource: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/DESCENT/Audio/Ambient Audio.prefab.meta

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

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

public class AudioManager : MonoBehaviour
{
public Sound[] sounds;

private void Awake()
{
foreach (Sound s in sounds)
{
AudioSource newSound = gameObject.AddComponent<AudioSource>();

newSound.clip = s.audioClip;

newSound.volume = s.globalVol;
newSound.pitch = s.pitch;

newSound.loop = s.isLooping;

if (newSound.playOnAwake)
{
newSound.Play();
}

s.audioSource = newSound;
}


}


public void PlaySound(string name)
{
Sound s = Array.Find(sounds, s => s.name == name);

if (s==null)
{
Debug.LogError("Sound " + name + " not found!");
return;
}

s.audioSource.Play();
}

public AudioSource GetSource(string name)
{
Sound s = Array.Find(sounds, s => s.name == name);

return s.audioSource;
}

public void FadeIn(string name, float duration)
{
Sound s = Array.Find(sounds, s => s.name == name);

if (s == null)
{
Debug.LogError("Sound " + name + " not found!");
return;
}

if (s.audioSource == null)
{
Debug.LogError("AudioSource for sound " + name + " is not assigned!");
return;
}

StartCoroutine(FadeInCoroutine(s.audioSource, s.globalVol, duration));
}

public void FadeOut(string name, float duration)
{
Sound s = Array.Find(sounds, s => s.name == name);

if (s == null)
{
Debug.LogError("Sound " + name + " not found!");
return;
}

if (s.audioSource == null)
{
Debug.LogError("AudioSource for sound " + name + " is not assigned!");
return;
}

StartCoroutine(FadeOutCoroutine(s.audioSource, s.globalVol, duration));
}

private IEnumerator FadeInCoroutine(AudioSource audioSource, float global, float duration)
{
float startVolume = 0f;
audioSource.volume = startVolume;
audioSource.Play();

while (audioSource.volume < global)
{
audioSource.volume += Time.deltaTime / duration;
yield return null;
}

audioSource.volume = global;
}

private IEnumerator FadeOutCoroutine(AudioSource audioSource, float global, float duration)
{
while (audioSource.volume > 0f)
{
audioSource.volume -= Time.deltaTime / duration;
yield return null;
}

audioSource.volume = 0f;
audioSource.Stop();
}
}
11 changes: 11 additions & 0 deletions Assets/DESCENT/Audio/AudioManager.cs.meta

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

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

[System.Serializable]
public class Sound
{
public string name;

public AudioClip audioClip;

public float volume = 0.5f;
[Range (0.1f, 3f)]
public float pitch = 1f;

[Range(0f, 1f)]
public float globalVol = 0.5f;

public bool isLooping;

public bool playOnAwake;

[HideInInspector()]
public AudioSource audioSource;

}
11 changes: 11 additions & 0 deletions Assets/DESCENT/Audio/Sound.cs.meta

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

8 changes: 8 additions & 0 deletions Assets/DESCENT/Audio/SoundFiles.meta

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

Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/DESCENT/Audio/SoundFiles/DescentGameScore.mp3.meta

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

Binary file not shown.
Loading