Commit Graph

107 Commits

Author SHA1 Message Date
djkellerman
bd3e57428f Health bar and player management refined 2025-03-06 01:27:42 -05:00
TGall8
47314da759 Created new map for free-for-all mode
Platform3 (MOUNTAIN) is the new map. I tried to fix the FallPlatform script so falling platforms would respawn but I didn't get anywhere. Will try again later
2025-03-05 21:08:52 -05:00
RochesterX
c160ef0b5c Fix restart bug 2025-03-05 13:36:37 -05:00
RochesterX
a8ad374e82 Change parry threshold 2025-03-05 13:31:40 -05:00
RochesterX
6bf9825855 Fix GameManager 2025-03-04 20:10:28 -05:00
TGall8
1ccf8d0d5b Obstacle Map Changes 2025-03-03 19:03:34 -05:00
RochesterX
a3cb9671db Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-03-03 18:55:28 -05:00
RochesterX
0f0c674d5c Healthbar 2025-03-03 18:55:03 -05:00
djkellerman
4d3bf1cd31 music + heart prefab 2025-03-03 18:44:59 -05:00
RochesterX
1e6e33079f Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-03-03 18:23:56 -05:00
RochesterX
f1f220884b Select 2025-03-03 18:23:54 -05:00
TGall8
27ceb94bf8 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-03-03 18:11:05 -05:00
TGall8
1baf4aa977 Made Keep Away Map 2025-03-03 18:10:59 -05:00
RochesterX
fb38fa557b Update DayNightSkyBackground.prefab 2025-03-03 17:34:53 -05:00
RochesterX
069aa7b2c3 Small fixes 2025-03-03 13:44:31 -05:00
RochesterX
51fdbe29cc Implement Tara Changes
Made platforms prefabs
Implemented platforms in default scene
2025-03-03 11:58:00 -05:00
RochesterX
b3928fe076 Implement Quentin Changes
Added cloud scrolling
Made day/night a prefab
"Merged" changes with the default scene
2025-03-03 11:35:56 -05:00
RochesterX
5fc9ae4db6 Fix unused scripts 2025-03-03 09:30:34 -05:00
RochesterX
ccf1300b28 Fix Unity Warning 2025-03-03 09:17:50 -05:00
Qloree32
74a92014eb day night cycle test
dncycletest
2025-03-03 00:12:15 -05:00
TGall8
8543734eb9 Added moving and teleporting platforms in ObstanceWIP. Falling Platform is a WIP
Falling Platforms don't work yet. Still haven't figured out how to make it fall
2025-02-28 17:46:02 -05:00
djkellerman
189aab2fd8 pt2 2025-02-28 14:01:55 -05:00
djkellerman
5fc2455f97 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-28 13:51:22 -05:00
djkellerman
f1d9006c94 Script reorganization and UseItem created 2025-02-28 13:49:02 -05:00
RochesterX
587e254764 Initial startgame call 2025-02-28 13:17:06 -05:00
djkellerman
b21efcd1eb pt3 2025-02-26 23:09:27 -05:00
djkellerman
341e481ab4 pt2 2025-02-26 21:10:35 -05:00
djkellerman
62c4a240b0 parry and health bar pt1 2025-02-26 20:17:19 -05:00
djkellerman
710df1c8d4 Update GameManager.cs 2025-02-26 18:19:38 -05:00
djkellerman
408cd7c695 Update GameManager.cs 2025-02-26 18:16:51 -05:00
Qloree32
fa82075688 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-21 17:44:08 -05:00
Qloree32
260cf585e9 Parallax scale up
parallax scale up
2025-02-21 17:43:50 -05:00
RochesterX
b4fea240ee Update Player Select.unity 2025-02-21 17:43:30 -05:00
RochesterX
e4a569c4ad Fix merge conflicts 2025-02-21 17:29:28 -05:00
djkellerman
7e133af521 gamemodes update 2025-02-21 11:51:11 -05:00
RochesterX
730a664158 Player selector separated 2025-02-19 20:11:57 -05:00
RochesterX
feeebaafc9 Latest Trevor main 2025-02-17 20:09:28 -05:00
TGall8
884d29e503 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:19:44 -05:00
TGall8
f4fcc1e7f1 Added a WIP Obstancle map
Yes I spelt Obstacle wrong, no I will not fix it.
2025-02-17 19:19:08 -05:00
RochesterX
4f9263a713 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:14:59 -05:00
RochesterX
49552421ee Parallax 2025-02-17 19:14:53 -05:00
djkellerman
4c6facbe95 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:02:38 -05:00
djkellerman
136c8d3d89 playerlives
more additions
2025-02-17 19:02:14 -05:00
qlr32
cc659f0660 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:00:51 -05:00
RochesterX
ad91511b17 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:00:11 -05:00
qlr32
67636a9747 Parallax Test OMS
KMS
2025-02-17 19:00:04 -05:00
RochesterX
fb844a2533 Move scripts 2025-02-17 19:00:00 -05:00
TGall8
18b18d4297 Map 2 changes
Renamed Map 2 to Platform 2 and adjusted and removed platforms to fit everything in the camera.
2025-02-17 18:47:03 -05:00
qlr32
c7902df3d6 Parallax Test
parallax test
2025-02-17 18:25:14 -05:00
RochesterX
a3ce16bd3a Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 18:23:24 -05:00