Commit Graph

58 Commits

Author SHA1 Message Date
RochesterX
7b4bdd927e Music implementation, cloud art, and bug fixes
Implemented music
Added cloud tiles
Made players be able to stand on each others' heads
Synced the music and day/night cycle
Added a transition in to the gameplay scene
Fixed blocking while dying bug
2025-03-07 23:32:42 -05:00
RochesterX
804483f3de Bug fix 2025-03-07 17:03:46 -05:00
RochesterX
86a9494a9e Updates 2025-03-07 16:50:04 -05:00
RochesterX
c7fede9552 Add lives display 2025-03-07 16:25:59 -05:00
RochesterX
f146b06e3c Make game end work 2025-03-07 16:03:11 -05:00
RochesterX
096712acc9 Player join animation 2025-03-07 14:22:43 -05:00
RochesterX
6528d1050f Make lives work 2025-03-07 10:03:16 -05:00
TGall8
0e4e6d1b8b Map changes to ObstanceWIP, Keep_Away, and Platform2
I cleaned up each map and added a few new platforms to Platform2 (2nd map for free-for-fall) and ObstanceWIP. I increased the Field of View to 120 (originally 60) so you can now see maps Platform2 and Keep_Away when you play test it.
2025-03-06 20:59:22 -05:00
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
a8ad374e82 Change parry threshold 2025-03-05 13:31:40 -05:00
TGall8
1ccf8d0d5b Obstacle Map Changes 2025-03-03 19:03:34 -05:00
RochesterX
0f0c674d5c Healthbar 2025-03-03 18:55:03 -05:00
TGall8
1baf4aa977 Made Keep Away Map 2025-03-03 18:10:59 -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
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
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
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
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
49552421ee Parallax 2025-02-17 19:14:53 -05:00
qlr32
cc659f0660 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 19:00:51 -05:00
qlr32
67636a9747 Parallax Test OMS
KMS
2025-02-17 19:00:04 -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
RochesterX
0da9280a78 Make Gamemanager 2025-02-17 18:23:05 -05:00
TGall8
fc02c48586 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-02-17 18:08:07 -05:00
RochesterX
543590347a Basic player select screen 2025-02-16 16:47:45 -05:00
TGall8
ff3fa1623d Map 2 changes 2025-02-15 16:21:14 -05:00
RochesterX
8a9746eeb5 Demo Build Release Candidate 1 2025-02-09 17:18:51 -05:00
RochesterX
71a4f070d5 Demo Overhaul 2025-02-08 18:54:21 -05:00
TGall8
16ca3c0094 new platform map 2025-01-27 18:58:37 -05:00
RochesterX
30b5a37632 Unbreak Bones 2025-01-27 18:55:02 -05:00
qlr32
6b4e72b8a7 Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-01-27 18:51:48 -05:00
qlr32
1e3f6a79ff pixel art decoration
decorations
2025-01-27 18:50:50 -05:00
RochesterX
d926007c69 Remake Platformer 2025-01-27 18:47:31 -05:00
RochesterX
c92fac71fd Squashed commit of the following:
commit b240dc6adf
Merge: 7727668 66a9810
Author: qlr32 <qloree@oakland.edu>
Date:   Mon Jan 27 18:18:03 2025 -0500

    Merge branch 'main' into quentin123

commit 772766882d
Author: qlr32 <qloree@oakland.edu>
Date:   Mon Jan 27 18:17:29 2025 -0500

    pixel test

    pixelt est

commit 83e0012a3f
Author: Qloree32 <qloree@oakland.edu>
Date:   Mon Jan 27 13:34:41 2025 -0500

    pixel art test

    pixel art test

commit 6747d86877
Author: Qloree32 <qloree@oakland.edu>
Date:   Mon Jan 27 13:31:32 2025 -0500

    pixel art test

    pixel art test

commit 5f084fb932
Author: Qloree32 <qloree@oakland.edu>
Date:   Mon Jan 27 13:24:56 2025 -0500

    pixel art test

    pixel art test

commit 8313737908
Author: Qloree32 <qloree@oakland.edu>
Date:   Sun Jan 26 21:57:37 2025 -0500

    pixel art test1.1

    1.1

commit 10d34d4d29
Author: Qloree32 <qloree@oakland.edu>
Date:   Sun Jan 26 21:57:05 2025 -0500

    pixel art test

    test

commit 6f4c810759
Merge: 84f1a66 285a5fb
Author: Qloree32 <qloree@oakland.edu>
Date:   Sun Jan 26 20:57:09 2025 -0500

    Merge branch 'main' into quentin

commit 84f1a664c9
Author: Qloree32 <qloree@oakland.edu>
Date:   Sun Jan 26 20:56:44 2025 -0500

    f
2025-01-27 18:35:46 -05:00
RochesterX
38d3afb362 Update Platformer_pixeltest.unity 2025-01-27 18:30:53 -05:00
qlr32
388c01ac06 pushtest
pushtest
2025-01-27 18:23:22 -05:00
RochesterX
285a5fb538 Messing with tilemaps 2025-01-20 18:26:52 -05:00