Skip to content

Sabrina (the sequel electric boogaloo) #16

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.

Sign up for GitHub

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

Open
wants to merge 234 commits into
base: develop
from
Open

Sabrina (the sequel electric boogaloo) #16

Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
f7141cb
Initial commit from demo
VincentChan22 Jan 26, 2025
e0fd201
Redid the initial commit
VincentChan22 Jan 28, 2025
4e32717
Imported HotReload and DOTween
victorliu1231 Feb 1, 2025
428f442
test interactables
victorliu1231 Feb 1, 2025
580e1a8
added tmpro and interactables ui
victorliu1231 Feb 1, 2025
5faf3fc
endless hallway constructed
victorliu1231 Feb 7, 2025
2c2344d
working interactions + item pickup
Sabrina-Lopez Feb 8, 2025
ca8c4c9
Renamed scene
Sabrina-Lopez Feb 8, 2025
bbdde4a
walking backwards through a portal should now no longer break the ill…
victorliu1231 Feb 9, 2025
37af2a0
maze generation algo implemented
victorliu1231 Feb 11, 2025
618ba94
Added QuantumGroupBase
VincentChan22 Feb 15, 2025
10fdaed
Started working on painting teleports
VincentChan22 Feb 15, 2025
949f899
Completed painting teleports
VincentChan22 Feb 15, 2025
9608cbf
Merge pull request #2 from UVASGD/Vincent
VincentChan22 Feb 15, 2025
ce05ddb
updates before switching branch
victorliu1231 Feb 15, 2025
8da6723
Merge branch 'endless-rooms-interactables-victor' into develop
victorliu1231 Feb 15, 2025
c9335fb
Update PaintingsLevel.unity
PenDr0p Feb 15, 2025
fe62082
reduced maze count to 1
victorliu1231 Feb 15, 2025
0e7ffed
finished up basic level design
PenDr0p Feb 18, 2025
4f443d3
added base floor tilemap
victorliu1231 Feb 22, 2025
9803978
added horror elements to endless hallway
victorliu1231 Feb 22, 2025
96dbcd9
added more props
victorliu1231 Feb 22, 2025
5e2ee96
deleted extra building from paintings leve
PenDr0p Feb 22, 2025
33aa59e
Merge branch 'develop' into art_level
PenDr0p Feb 22, 2025
296fb37
kjggj
PenDr0p Feb 22, 2025
75934c5
Remade painting teleport test
VincentChan22 Feb 22, 2025
f325a5f
Merge branch 'develop' into Vincent
VincentChan22 Feb 22, 2025
4626f03
moved EndlessRoom folder under Assets for organization
victorliu1231 Feb 22, 2025
1a9e0c3
fixed maze teleportation (I think)
victorliu1231 Feb 23, 2025
ac49378
working on textures and adding some art
PenDr0p Feb 27, 2025
a4a6643
added some cosmetics
victorliu1231 Mar 1, 2025
5a84523
Merge branch 'art_level' of https://github.com/UVASGD/spring-2025-sup…
PenDr0p Mar 1, 2025
114ede6
debugged last room
victorliu1231 Mar 1, 2025
b68ae4e
QuantumOject fix
VincentChan22 Mar 1, 2025
a06f016
Merge pull request #3 from UVASGD/Vincent
VincentChan22 Mar 1, 2025
9174d05
flashlight created, trying to do quantum stuff
Aarfdark Mar 1, 2025
b13e056
Merge branch 'develop' into flashlight
Aarfdark Mar 1, 2025
0a13cbf
baby added also figured out how to disable ambient light
Aarfdark Mar 1, 2025
878c3ad
lights flicker now and there's a white flash and audio hum increase w…
victorliu1231 Mar 1, 2025
f43cbf9
Start of dealing with puzzle pieces
Sabrina-Lopez Mar 1, 2025
dc09dd8
Interactable Puzzle Pieces + Env Edits
Sabrina-Lopez Mar 2, 2025
9d73862
Progress with Art Level and Interactables
Sabrina-Lopez Mar 2, 2025
428526b
thinning out walls, added skybox
PenDr0p Mar 3, 2025
2f6f787
Merge branch 'art_level' of https://github.com/UVASGD/spring-2025-sup…
PenDr0p Mar 3, 2025
09bbfd0
Added windows and support beam textures
PenDr0p Mar 3, 2025
d72e42e
Made some quick additions for MSE video
VincentChan22 Mar 3, 2025
d5ca3ed
Added more deco, changed the walls color, fixed paintings
PenDr0p Mar 5, 2025
a709adc
Added Nathan's drawings plus more deco
PenDr0p Mar 6, 2025
0ee4f97
I added aadarsh to the game
PenDr0p Mar 6, 2025
597739e
Weeping Angel Enemy
3amBEANS Mar 9, 2025
94557b8
Added Animations & Sfx to weep
3amBEANS Mar 10, 2025
08f4439
bones bones bones
PenDr0p Mar 14, 2025
f9022a0
added scary face to endlessroom
victorliu1231 Mar 21, 2025
96bdeec
flashlight stuff is happening
Aarfdark Mar 22, 2025
14ee61d
added pause menu
jetemoah Mar 22, 2025
7ca12de
started to work on quantumLight but then we realized that mcburney wa…
Aarfdark Mar 22, 2025
e6f4789
prelim door creak
victorliu1231 Mar 22, 2025
9f78e68
Fixed interactable issue
Sabrina-Lopez Mar 27, 2025
cf06171
Start of re-implementing title screen and pause menu
Sabrina-Lopez Mar 27, 2025
0031147
Pause menu background fixup
Sabrina-Lopez Mar 27, 2025
75895ed
door creak additions
victorliu1231 Mar 28, 2025
d351846
Progress with settings
Sabrina-Lopez Mar 28, 2025
3c71f0e
Quick small changes to QuantumGroup and QuantumGroupBase
VincentChan22 Mar 29, 2025
ba9b7d5
Merge branch 'endless-rooms-interactables-victor' into develop
victorliu1231 Mar 29, 2025
b8e54ee
merging pt2
victorliu1231 Mar 29, 2025
0ff5745
fixed positioning of GOs
victorliu1231 Mar 29, 2025
f89b4e8
removed unnecessary my setting scripts since we already have other se…
victorliu1231 Mar 29, 2025
363b3f6
Merge branch 'endless-rooms-interactables-victor' into develop
victorliu1231 Mar 29, 2025
ee204cd
Deleted redundant objects and organized imported files
PenDr0p Apr 2, 2025
d057ac1
Added keypad interactable
VincentChan22 Apr 5, 2025
54b90ae
Merge branch 'develop' into Vincent
VincentChan22 Apr 5, 2025
92deea1
Merge pull request #7 from UVASGD/weep!
VincentChan22 Apr 5, 2025
3a7eef8
Merge pull request #6 from UVASGD/Vincent
VincentChan22 Apr 5, 2025
edeccdf
Merge pull request #8 from UVASGD/pause_menu
VincentChan22 Apr 5, 2025
e5b8492
Finished UI
Sabrina-Lopez Apr 8, 2025
1f27753
Merge branch 'develop' into art_level
Sabrina-Lopez Apr 11, 2025
e163445
Merge pull request #9 from UVASGD/art_level
Sabrina-Lopez Apr 11, 2025
7bb45ad
Post-merge adjustments
Sabrina-Lopez Apr 11, 2025
f02ea31
retexture paintings + pieces, reorganize, etc.
Sabrina-Lopez Apr 12, 2025
98dd6cd
Merge pull request #10 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 12, 2025
37fc49a
made double doors rotate upon opening + added door open sfx
victorliu1231 Apr 12, 2025
726f9a1
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
victorliu1231 Apr 12, 2025
adc2560
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
victorliu1231 Apr 12, 2025
c37369f
repositioned player to beginning of endless level scene
victorliu1231 Apr 12, 2025
3b860ae
fixed bug with one of the noteboards not appearing + added wall movin…
victorliu1231 Apr 14, 2025
4d6be93
added dialogue system (Meet and Talk)
victorliu1231 Apr 18, 2025
c412bfe
made initial dialogue
victorliu1231 Apr 18, 2025
e583b1b
prelim cutscene setup, will do rest when all levels are in one scene …
victorliu1231 Apr 19, 2025
92d239b
changed colors for player and partner characters in end dialogue
victorliu1231 Apr 19, 2025
6de6fc8
plaques
Sabrina-Lopez Apr 19, 2025
58229f8
Merge pull request #11 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 19, 2025
098a9b5
More to FlashlightLevel
Sabrina-Lopez Apr 19, 2025
8190542
Merge pull request #12 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 19, 2025
f5fc47a
imported psych ward tracks
victorliu1231 Apr 19, 2025
c378ef6
flashlight awesome ???????
Aarfdark Apr 19, 2025
8b07462
Imported rock assets
VincentChan22 Apr 20, 2025
307416a
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
VincentChan22 Apr 20, 2025
46a0df8
rest of objects
Sabrina-Lopez Apr 20, 2025
4da03ce
Merge pull request #14 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 20, 2025
667aa20
placed prefab of desert scene into art gallery scene.
VincentChan22 Apr 21, 2025
9b4d2f8
Merge pull request #13 from UVASGD/Vincent
VincentChan22 Apr 21, 2025
012f9be
Decoooooo
PenDr0p Apr 23, 2025
c151f3f
finished keypad + added files for music and sfx
Sabrina-Lopez Apr 24, 2025
3b1582a
Merge pull request #15 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 24, 2025
56a8bfd
finished UFO
Sabrina-Lopez Apr 25, 2025
e093e67
more decooooo
PenDr0p Apr 25, 2025
b6d3a00
Update WeepingAngel.unity
PenDr0p Apr 25, 2025
4d90295
Revert "Update WeepingAngel.unity"
PenDr0p Apr 25, 2025
f180a86
Merge branch 'develop' into origin/Sabrina
Sabrina-Lopez Apr 25, 2025
5de74b8
Merge branch 'flashlight_level_lauren' into final_cutscene_victor
victorliu1231 Apr 25, 2025
be7b8fb
new prefabs
Sabrina-Lopez Apr 25, 2025
e5a21f8
Merge branch 'develop' into flashlight_level_lauren
PenDr0p Apr 25, 2025
6146e7e
added flashlight office map to cutscene scene
victorliu1231 Apr 25, 2025
9eb698b
Merge pull request #16 from UVASGD/flashlight_level_lauren
PenDr0p Apr 25, 2025
eb6bfc8
Weep scene metadata fix
VincentChan22 Apr 26, 2025
4277e7c
Keypad scene + updated ufoAI
Sabrina-Lopez Apr 26, 2025
722636e
Merge branch 'develop' into origin/Sabrina
Sabrina-Lopez Apr 26, 2025
a1ef5e7
Merge pull request #17 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 26, 2025
7fb6cf5
Changed The Desert Scene
3amBEANS Apr 26, 2025
da991dd
Merge pull request #18 from UVASGD/DesertScene
3amBEANS Apr 26, 2025
f780a2a
Added UFO to Desert Scene
3amBEANS Apr 26, 2025
bd32640
Merge pull request #19 from UVASGD/UfoDesertScene
3amBEANS Apr 26, 2025
f64216d
Transition between art gallery -> endlessroom
VincentChan22 Apr 26, 2025
6f398a1
transition artgallary -> endlessroom
VincentChan22 Apr 26, 2025
f636e12
Merge branch 'Vincent' of https://github.com/UVASGD/spring-2025-super…
VincentChan22 Apr 26, 2025
9b4a2a0
Revert "Merge branch 'Vincent' of https://github.com/UVASGD/spring-20…
VincentChan22 Apr 26, 2025
6f24301
transition
VincentChan22 Apr 26, 2025
10e0928
Merge branch 'Vincent' of https://github.com/UVASGD/spring-2025-super…
VincentChan22 Apr 26, 2025
460df6d
t
VincentChan22 Apr 26, 2025
acc85d3
Changed the interact to E
3amBEANS Apr 26, 2025
203312a
Merge pull request #23 from UVASGD/ChangeInteractable
3amBEANS Apr 26, 2025
1361806
Playable art scene
VincentChan22 Apr 26, 2025
9db8a5c
Merge pull request #24 from UVASGD/Vincent2
VincentChan22 Apr 26, 2025
bacddc7
added art gallery
victorliu1231 Apr 26, 2025
369edd4
Merge branch 'develop' into final_cutscene_victor
victorliu1231 Apr 26, 2025
14d1eee
Buildable + debugged menu
Sabrina-Lopez Apr 26, 2025
f192f70
Merge pull request #25 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 26, 2025
57f01a1
small changes to painting level
VincentChan22 Apr 26, 2025
aa910ec
Merge branch 'develop' into Vincent
VincentChan22 Apr 26, 2025
642fabb
Playermovement improvement
VincentChan22 Apr 26, 2025
0f998d0
Merge pull request #26 from UVASGD/Vincent
VincentChan22 Apr 26, 2025
cf26b99
test commit
victorliu1231 Apr 26, 2025
205b10d
test
victorliu1231 Apr 26, 2025
b3fe6d9
fixed scene
victorliu1231 Apr 26, 2025
dc9c265
weeping angel scene fixed
victorliu1231 Apr 26, 2025
70755cf
Merge branch 'develop' into flashlight
VincentChan22 Apr 26, 2025
5c59a99
Merge branch 'develop' into flashlight_level_lauren
PenDr0p Apr 26, 2025
17a4c67
Merge pull request #27 from UVASGD/flashlight
VincentChan22 Apr 26, 2025
dcc9121
Merge branch 'develop' into flashlight_level_lauren
PenDr0p Apr 26, 2025
342d8d6
Merge pull request #28 from UVASGD/flashlight_level_lauren
PenDr0p Apr 26, 2025
835cc44
some commits
victorliu1231 Apr 26, 2025
7bfa010
Merge branch 'flashlight_level_lauren' into final_cutscene_victor
victorliu1231 Apr 26, 2025
2012a6d
Completed transtition out of endlessrooom
VincentChan22 Apr 26, 2025
d2200e5
Merge pull request #29 from UVASGD/Vincent
VincentChan22 Apr 26, 2025
a2c8003
Merge branch 'develop' into Vincent
VincentChan22 Apr 26, 2025
be62836
Progress on PaintingsLevel
Sabrina-Lopez Apr 26, 2025
756a23e
Merge pull request #30 from UVASGD/origin/Sabrina
Sabrina-Lopez Apr 26, 2025
40010ff
Merge branch 'develop' into Vincent2
VincentChan22 Apr 26, 2025
42f3e94
Merge pull request #31 from UVASGD/Vincent2
VincentChan22 Apr 26, 2025
fc2d783
Merge branch 'develop' into Vincent
VincentChan22 Apr 26, 2025
272b35f
changed the teleport painting
PenDr0p Apr 26, 2025
a966f7d
Merge pull request #32 from UVASGD/flashlight_level_lauren
PenDr0p Apr 26, 2025
960c058
Fixed Weeping Angels
3amBEANS Apr 26, 2025
2666646
Merge pull request #33 from UVASGD/WeepingAngelFixes
3amBEANS Apr 26, 2025
1cab332
consider lit value changed from 0 to 1
3amBEANS Apr 26, 2025
8b7a7ff
Merge pull request #34 from UVASGD/considerLit
3amBEANS Apr 26, 2025
e26fa62
final cutscene almost done
victorliu1231 Apr 27, 2025
ff35d3d
Player prefab edit + re-added desert painting material
Sabrina-Lopez Apr 27, 2025
4ebe3d3
Added flashlight interactable Fixed up flashlight script
VincentChan22 Apr 27, 2025
1d1b7c4
Merge pull request #35 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
01bc533
Merge branch 'develop' into Vincent
VincentChan22 Apr 27, 2025
9338ce2
JumpScare Finished
3amBEANS Apr 27, 2025
e675549
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
VincentChan22 Apr 27, 2025
c3c6b21
Merge branch 'develop' into considerLit
VincentChan22 Apr 27, 2025
95637a8
Merge pull request #36 from UVASGD/considerLit
VincentChan22 Apr 27, 2025
ebbdb0d
added end credits video
PenDr0p Apr 27, 2025
7af3f5e
Complete interactions
Sabrina-Lopez Apr 27, 2025
e52f884
Merge pull request #37 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 27, 2025
d765d6e
flashlightlevel
VincentChan22 Apr 27, 2025
0f0154a
addded number to weep
VincentChan22 Apr 27, 2025
136ea5d
Merge branch 'develop' into Vincent
VincentChan22 Apr 27, 2025
dca747f
pushing stuff i didnt save
VincentChan22 Apr 27, 2025
cafb976
Playable weebing
VincentChan22 Apr 27, 2025
03a7556
Merge pull request #38 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
cb6d5cb
Progress on PaintingLevel + Pause Menu fix
Sabrina-Lopez Apr 27, 2025
7fda7e8
Merge pull request #39 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 27, 2025
1c19c75
Merge branch 'develop' into Sabrina-(the-sequel-electric-boogaloo)
Sabrina-Lopez Apr 27, 2025
3c13e98
Merge branch 'develop' into Sabrina-(the-sequel-electric-boogaloo)
Sabrina-Lopez Apr 27, 2025
ca348ed
re-textured hidden door painting
Sabrina-Lopez Apr 27, 2025
16e99e4
Merge remote-tracking branch 'origin/end_credits' into final_cutscene…
victorliu1231 Apr 27, 2025
49a60fa
Added X to teleport images + EndlessRoom noteboard fix
Sabrina-Lopez Apr 27, 2025
cdaa2ff
Merge pull request #40 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 27, 2025
6c823e0
added rolling credits and featured painting in cutscene
victorliu1231 Apr 27, 2025
91977ce
changed desrt painting
VincentChan22 Apr 27, 2025
690eb1b
Merge pull request #41 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
064c1e2
fixes
victorliu1231 Apr 27, 2025
bfdbbe7
FIXED ALL WEEPING ANGEL BUGS
3amBEANS Apr 27, 2025
7feb6df
Merge pull request #42 from UVASGD/WeepingAngelBugFixes
3amBEANS Apr 27, 2025
a92a966
Merge branch 'develop' into end_credits
PenDr0p Apr 27, 2025
66bf0c7
fixed up endless room
VincentChan22 Apr 27, 2025
6331f98
change wall closing spacing
VincentChan22 Apr 27, 2025
f9851fc
endlessroom transition fix
VincentChan22 Apr 27, 2025
54f6bf5
Merge pull request #43 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
b47446b
weeping angel respawning
VincentChan22 Apr 27, 2025
7ed4555
Merge pull request #44 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
f3a919a
fixed respawn forgot to save
VincentChan22 Apr 27, 2025
641953e
Merge pull request #45 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
daf0a30
Update PaintingsLevel.unity
VincentChan22 Apr 27, 2025
5e4bc7c
Merge pull request #46 from UVASGD/Vincent
VincentChan22 Apr 27, 2025
3091b0a
Added correct credits
PenDr0p Apr 27, 2025
4fe93b6
Merge branch 'develop' into end_credits
PenDr0p Apr 27, 2025
06d344e
ending cutscene noteboard fix
victorliu1231 Apr 27, 2025
e06bcb3
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
victorliu1231 Apr 27, 2025
be2736e
scene transition setup
victorliu1231 Apr 27, 2025
be84608
Merge branch 'final_cutscene_victor' into develop
victorliu1231 Apr 27, 2025
3b12e7f
Merge remote-tracking branch 'origin/end_credits' into develop
victorliu1231 Apr 27, 2025
390bf1d
finito
victorliu1231 Apr 27, 2025
c97c92b
temp fixes
VincentChan22 Apr 28, 2025
e03d0c3
temp try
victorliu1231 Apr 28, 2025
e2f2202
Merge branch 'develop' of https://github.com/UVASGD/spring-2025-super…
victorliu1231 Apr 28, 2025
5a43613
finishing this project soon yippee
Sabrina-Lopez Apr 28, 2025
46bc221
Merge pull request #47 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 28, 2025
76899ba
mod player speed to be consistent
Sabrina-Lopez Apr 28, 2025
c428ae1
Merge pull request #48 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 28, 2025
ba33a4f
Jumpscare Fixed
3amBEANS Apr 28, 2025
233dba6
Merge pull request #49 from UVASGD/JumpscareFix
3amBEANS Apr 28, 2025
61a2917
Current audio progress (not done)
Sabrina-Lopez Apr 28, 2025
522b2d5
Merge branch 'develop' into Sabrina-(the-sequel-electric-boogaloo)
Sabrina-Lopez Apr 28, 2025
31bb5cd
Merge pull request #50 from UVASGD/Sabrina-(the-sequel-electric-booga…
Sabrina-Lopez Apr 28, 2025
fb08d17
Revived Desert Geo + Finished Cutscene Audio
Sabrina-Lopez Apr 28, 2025
7131097
Merge branch 'develop' into Sabrina-(the-sequel-electric-boogaloo)
Sabrina-Lopez Apr 28, 2025
f1b92eb
Saved cutscene oop
Sabrina-Lopez Apr 28, 2025
cde8467
PaintingsLevel Audio
Sabrina-Lopez Apr 28, 2025
8a03a5c
Pm finished audio + faster player
Sabrina-Lopez Apr 28, 2025

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.