Commit Graph

87 Commits

Author SHA1 Message Date
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
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
djkellerman
fe8c8c3ef4 playerlives
added basic playerlives counting for the free-for-all gamemode. Sstill needs to be implemented
2025-02-17 14:09:17 -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
f688173770 Builds 2025-02-09 17:32:22 -05:00
RochesterX
8a9746eeb5 Demo Build Release Candidate 1 v0.1 2025-02-09 17:18:51 -05:00
RochesterX
657515cc0d Add back block 2025-02-09 13:49:39 -05:00
RochesterX
f39416f759 Ignore .DS_Store files 2025-02-08 18:56:16 -05:00
RochesterX
71a4f070d5 Demo Overhaul 2025-02-08 18:54:21 -05:00
RochesterX
16dec36792 Revert "Animation tweak"
This reverts commit 6de83a4034.
2025-02-07 17:52:47 -05:00
RochesterX
99b672107d Revert "Animation tweak"
This reverts commit a0e6711a9e.
2025-02-07 17:52:42 -05:00
RochesterX
66a249e481 Revert "Animation tweak"
This reverts commit d409d3087a.
2025-02-07 17:52:30 -05:00
RochesterX
d409d3087a Animation tweak 2025-02-07 17:52:21 -05:00
RochesterX
a0e6711a9e Animation tweak 2025-02-07 17:49:22 -05:00
RochesterX
6de83a4034 Animation tweak 2025-02-07 17:48:41 -05:00
RochesterX
d975028d28 Update jump speed 2025-01-31 12:19:30 -05:00
RochesterX
dcd3ec3dd2 Update bones terminal velocity 2025-01-29 10:42:06 -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