Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
fbb86ab
Added flask communications
Kalimono Sep 22, 2023
7a3a676
Creating develop
Kalimono Oct 3, 2023
05790fc
Trying to commit Arduino changes
Kalimono Oct 3, 2023
7cf8e26
Merge branch 'MartBranch' into develop
Kalimono Oct 3, 2023
05ce1dc
Added git ignore file
Kalimono Oct 3, 2023
77cee3d
Created base structure for questions and answers
williamhugoGH Oct 3, 2023
624dd7e
Started dragedroptest
maxgitnet Oct 10, 2023
72ee86d
Updated Q/A to include types
williamhugoGH Oct 10, 2023
ac2e397
Another type added
williamhugoGH Oct 10, 2023
a6b0481
No more cgpt
maxgitnet Oct 10, 2023
0863166
Kaos men på g
maxgitnet Oct 12, 2023
7a6ca78
Fixat playmode
maxgitnet Oct 13, 2023
ac37907
All good
maxgitnet Oct 13, 2023
e915f1b
rebuild interfaces
maxgitnet Oct 15, 2023
dd9b240
audio mixer
maxgitnet Oct 17, 2023
bb226ef
Merge branch 'william' into MaxBranch
maxgitnet Oct 17, 2023
6742e79
working on base question class
maxgitnet Oct 17, 2023
60f5b2a
Cleaned up session class
maxgitnet Oct 17, 2023
107d8eb
cleaned up QA cs file
maxgitnet Oct 17, 2023
ac2a88d
can confirm ranking complete
maxgitnet Oct 17, 2023
1140d79
some questions added
maxgitnet Oct 17, 2023
57d8491
Updated gitignore, again
Kalimono Oct 17, 2023
db601ef
Sorting names and returning ans
maxgitnet Oct 17, 2023
ed62dab
Merge branch 'MaxBranch' of https://github.com/Kalimono/CIU265Project…
maxgitnet Oct 17, 2023
6bcbcb4
Organised project
maxgitnet Oct 17, 2023
c63c2cf
Fiddled with mixer and added single question form
maxgitnet Oct 17, 2023
4ac7532
Cleanup and commenting
maxgitnet Oct 18, 2023
5da2a2b
Added startup and structure for startup
maxgitnet Oct 19, 2023
4010528
Now replaces names
maxgitnet Oct 19, 2023
b921ef1
Added some stuff to NameEntry
Kalimono Oct 19, 2023
4a95e43
Lagade skiten
maxgitnet Oct 19, 2023
03f829d
?
maxgitnet Oct 19, 2023
6884047
Merge branch 'MaxBranch' into Feature-NameEntry
maxgitnet Oct 19, 2023
de9662d
Names working
maxgitnet Oct 19, 2023
9380734
Improved organisation of code
maxgitnet Oct 19, 2023
df461b6
Ba Cleanup
maxgitnet Oct 19, 2023
ac37cdf
Added Music events
maxgitnet Oct 21, 2023
5ad0d30
refactoring
maxgitnet Oct 21, 2023
2a5f5ce
fixa warn
maxgitnet Oct 21, 2023
530ddfa
Organisation
maxgitnet Oct 21, 2023
0f2cdf3
more organisation
maxgitnet Oct 21, 2023
40d7283
kallsvett
maxgitnet Oct 21, 2023
912982b
.
maxgitnet Oct 22, 2023
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
74 changes: 74 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
*.wav
Assets/La Porte Della Percezione.wav.meta
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .vs/CIU265Project/v17/.suo
Binary file not shown.
35 changes: 35 additions & 0 deletions .vs/CIU265Project/xs/UserPrefs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Properties StartupConfiguration="{304CF1B4-805E-7DC8-9CFD-4275C5630AE3}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/UI/Blank/Blank.cs">
<Files>
<File FileName="Assets/Scripts/Session/Session.cs" Line="33" Column="1" />
<File FileName="Assets/UI/Blank/Blank.cs" Line="45" Column="2" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="CIU265Project">
<Node name="Assets" expanded="True" selected="True">
<Node name="Scripts" expanded="True">
<Node name="Session" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="Blank" expanded="True" />
<Node name="NameEntry" expanded="True" />
<Node name="Ranking" expanded="True" />
<Node name="SingleOut" expanded="True" />
<Node name="Startup" expanded="True" />
</Node>
</Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="5bf6f264-c05f-4220-8d29-3821d7c302ad" />
<MultiItemStartupConfigurations />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
</Properties>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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"
]
}
832 changes: 832 additions & 0 deletions Assembly-CSharp-Editor.csproj

Large diffs are not rendered by default.

798 changes: 798 additions & 0 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

185 changes: 185 additions & 0 deletions Assets/PortaMixer.mixer
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!244 &-7829974724630061186
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: da28f955aa5044ee0b994d1db46d8308
m_EffectName: Lowpass
m_MixLevel: 909887d3473b44dfbbdd4adef5995156
m_Parameters:
- m_ParameterName: Cutoff freq
m_GUID: 703f3e5242044425f8dc0e60b09418c3
- m_ParameterName: Resonance
m_GUID: 659ac05eb04204bbb93f546b2502fd38
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &-5489814344072766195
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: highPassOff
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: beb5fe69484834217b40d74a3e2fbb2e
m_FloatValues:
9773de94af8964086ac56f1c29d6af4e: 837
c44146398324844c88a9256cd68edb58: 0.314
e710284ae9d4f41278c1b59aba4c30af: 134.2
48ed3d5ac65984a41810555cb5b8b9d4: 10
86a3ea4ca691d451099153de5bd67162: 0
m_TransitionOverrides: {}
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PortaMixer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
- {fileID: -5489814344072766195}
- {fileID: 2349266698815575186}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews:
- guids:
- 19c65f966935b4e1285599b82f1ded2a
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 19c65f966935b4e1285599b82f1ded2a
m_Children: []
m_Volume: 717cc17fbc65f49ee8dbc933c208e641
m_Pitch: 13d32d9d09f8c4f878b43c4a1f2e1eff
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
- {fileID: 2007881002147406520}
- {fileID: 1200059515610475957}
- {fileID: -7829974724630061186}
- {fileID: 7322958775613043055}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: f6195d7681769440db2aacd8899d4537
m_EffectName: Attenuation
m_MixLevel: f2e2f720baaab49cdbf4b14540ee000c
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 4c65aa946e78a432bb90abfe9634e710
m_FloatValues:
703f3e5242044425f8dc0e60b09418c3: 22000
7a2bf638c63a04cfa82f0be97d02b6f8: 10
c44146398324844c88a9256cd68edb58: 0.314
e710284ae9d4f41278c1b59aba4c30af: 134.2
48ed3d5ac65984a41810555cb5b8b9d4: 322
86a3ea4ca691d451099153de5bd67162: 0
m_TransitionOverrides: {}
--- !u!244 &1200059515610475957
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: faedef11787074c4fb2e344d4a184747
m_EffectName: Distortion
m_MixLevel: 713589e2d143544f59fe85cfc7130654
m_Parameters:
- m_ParameterName: Level
m_GUID: 86a3ea4ca691d451099153de5bd67162
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &2007881002147406520
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: be76ea205d0be4f6da05ca42b91a1368
m_EffectName: Highpass
m_MixLevel: 63d532353cda34ab7882f0c20c11de50
m_Parameters:
- m_ParameterName: Cutoff freq
m_GUID: 48ed3d5ac65984a41810555cb5b8b9d4
- m_ParameterName: Resonance
m_GUID: d1100c8a5168149c99b475d84ab24614
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &2349266698815575186
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: distorted
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 2d7cc320665a04165b1cf3152b1cbc80
m_FloatValues:
c44146398324844c88a9256cd68edb58: 0.624
e710284ae9d4f41278c1b59aba4c30af: 134.2
48ed3d5ac65984a41810555cb5b8b9d4: 57
86a3ea4ca691d451099153de5bd67162: 0.198
m_TransitionOverrides: {}
--- !u!244 &7322958775613043055
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 25962f5c3099142e3b1d866fcc297584
m_EffectName: Pitch Shifter
m_MixLevel: 14984d88eb3ae44c4b35bb8cb0b78e13
m_Parameters:
- m_ParameterName: Pitch
m_GUID: 4a36c8e9a9f134f0cbaa1557e2bfd0fb
- m_ParameterName: FFT size
m_GUID: a4dd2bef2ac13459d911ab8f19b4f9bf
- m_ParameterName: Overlap
m_GUID: 2fc6654547260400e8bd645d7ea84fbd
- m_ParameterName: Max channels
m_GUID: e77a28dba6fb848b6bf34b912d1d5edd
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
8 changes: 8 additions & 0 deletions Assets/PortaMixer.mixer.meta

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

Loading