Commit Graph

37 Commits

Author SHA1 Message Date
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
ccf1300b28 Fix Unity Warning 2025-03-03 09:17:50 -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
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
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
RochesterX
fb844a2533 Move scripts 2025-02-17 19:00:00 -05:00
RochesterX
0da9280a78 Make Gamemanager 2025-02-17 18:23:05 -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
RochesterX
8a9746eeb5 Demo Build Release Candidate 1 2025-02-09 17:18:51 -05:00
RochesterX
657515cc0d Add back block 2025-02-09 13:49:39 -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
6de83a4034 Animation tweak 2025-02-07 17:48:41 -05:00
RochesterX
91c8c40ab5 More Tweaks 2025-01-17 20:11:04 -05:00
RochesterX
7a646ca1ea Implement player punch and crude damage system 2025-01-17 19:46:17 -05:00
RochesterX
0824f3c99a Implement Punch 2025-01-17 12:57:43 -05:00
RochesterX
5facf8c6d3 Restructure animations 2025-01-17 12:05:54 -05:00
RochesterX
79e3d3f301 Update global input actions and rework player joining 2025-01-17 10:57:29 -05:00
RochesterX
4623583ffd Reimplement player joining 2025-01-17 09:40:48 -05:00
RochesterX
1315bdb7dc Animate Bones; make Bones default player 2025-01-15 16:55:07 -05:00
RochesterX
dc61c3c1d0 Project Restructure (PLEASE UPDATE AFTER COMMIT) 2025-01-15 15:05:04 -05:00