Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e381973
Initial commit
FelixJ98 Feb 21, 2025
e405552
First Commit
FelixJ98 Feb 21, 2025
2ad1af0
1st commit
chrisorozco305 Feb 21, 2025
d5f9ffb
Commit2
FelixJ98 Feb 21, 2025
558e6a9
Merge branch 'main' of https://github.com/FelixJ98/PawsUp
FelixJ98 Feb 21, 2025
efb9ef6
commit 3
FelixJ98 Feb 21, 2025
747e272
LOL
chrisorozco305 Feb 21, 2025
3f15d5e
CUBE
chrisorozco305 Feb 21, 2025
96fbe46
LOL
chrisorozco305 Feb 21, 2025
58045e6
Updated Project Settings & Packages
hverd004 Mar 16, 2025
9285684
FadeIn/Out and Load Scene
emelybarcenas Mar 26, 2025
d57a13e
added confetti on start
emelybarcenas Mar 27, 2025
b5e48ef
Preliminary VR Implementation
hverd004 Mar 30, 2025
b6dbf32
testing
hverd004 Apr 5, 2025
8f64b19
Merge branch 'main-menu' into FinalMVP
hverd004 Apr 5, 2025
b39920a
Testing
hverd004 Apr 10, 2025
c1e1b4d
current changes
Roseline-Projects Apr 15, 2025
3e2864f
LOL
chrisorozco305 Apr 15, 2025
66a814b
Update from tuesday
chrisorozco305 Apr 15, 2025
baa68c3
layout
Roseline-Projects Apr 16, 2025
91577be
progress - interaction points
Roseline-Projects Apr 16, 2025
97bcbc4
mid-day experimentation push
hverd004 Apr 16, 2025
34c436d
GL AND GC SLIGHTLY BETTER
hverd004 Apr 17, 2025
baed956
updates - mvp decor
Roseline-Projects Apr 17, 2025
b985de4
some grabbing features (gavel on the floor)
Roseline-Projects Apr 17, 2025
de819d3
Small Update to button in photospheres
hverd004 Apr 17, 2025
123526b
added box collider to gavel
Roseline-Projects Apr 17, 2025
43b6400
updates
hverd004 Apr 17, 2025
0d9c407
law building rescaling with fixes, added new models
Roseline-Projects Apr 18, 2025
4848870
Chris O. Push
chrisorozco305 Apr 18, 2025
0befd55
law updates
Roseline-Projects Apr 18, 2025
36bb8fd
Merge branch 'HVTestFinalMVPPush' into feature/fiu_law
Roseline-Projects Apr 18, 2025
3223960
fiu law into mvp
Roseline-Projects Apr 18, 2025
36ba08d
attempt to fix exc points
Roseline-Projects Apr 18, 2025
bfd968a
law portal implementation
chrisorozco305 Apr 18, 2025
90ab93b
law portal implementation 2
chrisorozco305 Apr 18, 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
  •  
  •  
  •  
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"
}
]
}
60 changes: 60 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.vs": true,
"**/.gitmodules": true,
"**/.vsconfig": 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,
"Logs/": true,
"logs/": true,
"ProjectSettings/": true,
"UserSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "PawsUp.sln"
}
42 changes: 42 additions & 0 deletions Assets/HandTrigger.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class HandTrigger : MonoBehaviour
{
public GameObject dialogBoxPrefab;
//private GameObject activeDialog;
//private EventSystem eventSystem;
//pointerEventData = new PointerEventData(eventSystem);

void OnTriggerStay(Collider other)
{
Debug.Log(other.gameObject);
//if (other.gameObject.name.Contains("Hand"))
if (other.gameObject.CompareTag("Player"))
{
if(dialogBoxPrefab == null) {
Debug.Log("Dialog box null check");
} else {
Debug.Log("Triggered by: " + other.gameObject.name);
//Instantiate(dialogBoxPrefab, new Vector3(0,0.5f,0), Quaternion.identity);
Debug.Log(dialogBoxPrefab.activeSelf);
dialogBoxPrefab.SetActive(true);
}
}

//pointerEventData = new PointerEventData(eventSystem);

}

void OnTriggerExit(Collider other)
{
dialogBoxPrefab.SetActive(false);
}

// private void SimulateMouse() {
// pointerEventData.position = this.gameObject.transform.position;


// }
}
13 changes: 13 additions & 0 deletions Assets/HandTrigger.cs.meta

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

149 changes: 149 additions & 0 deletions Assets/InteractionPoint.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2989003704941345155
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7066896488443176145}
- component: {fileID: 8903288573383323098}
- component: {fileID: 6551617472947013633}
- component: {fileID: 4472764040236116311}
- component: {fileID: 6636036416090753973}
- component: {fileID: 4360365494047639302}
m_Layer: 0
m_Name: InteractionPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7066896488443176145
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
serializedVersion: 2
m_LocalRotation: {x: 0.0043632328, y: 0.0043632328, z: -0.00001903816, w: 0.999981}
m_LocalPosition: {x: 0.5, y: 0.2, z: 0.1}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0.5, y: 0.5, z: 0}
--- !u!33 &8903288573383323098
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6551617472947013633
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &4472764040236116311
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &6636036416090753973
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &4360365494047639302
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2989003704941345155}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1901d7f5fadc54a4eb1d439d6bf75b94, type: 3}
m_Name:
m_EditorClassIdentifier:
dialogBoxPrefab: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/InteractionPoint.prefab.meta

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

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

public class LabelsFollowYou : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{

}

// Update is called once per frame
void Update()
{

}
}
11 changes: 11 additions & 0 deletions Assets/LabelsFollowYou.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/StreamingAssets.meta → Assets/Main-Menu.meta

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

Binary file added Assets/Main-Menu/Blank Shape.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading