Commit Graph

64 Commits

Author SHA1 Message Date
djkellerman
136c8d3d89 playerlives
more additions
2025-02-17 19:02: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
qlr32
388c01ac06 pushtest
pushtest
2025-01-27 18:23:22 -05:00
RochesterX
66a9810777 Terminal Velocity 2025-01-27 18:06:54 -05:00
RochesterX
285a5fb538 Messing with tilemaps 2025-01-20 18:26:52 -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
edce0c1702 Animation 2025-01-17 12:39:57 -05:00
RochesterX
7109149b83 Update Bones Model 2025-01-17 12:31:36 -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
4c2830769b Add new Bones animation 2025-01-15 16:04:20 -05:00
RochesterX
004260b6e1 Add Bones's Friend, Ligaments 2025-01-15 15:44:42 -05:00
RochesterX
dc61c3c1d0 Project Restructure (PLEASE UPDATE AFTER COMMIT) 2025-01-15 15:05:04 -05:00
RochesterX
63775c5103 Separate respawn script
Make respawning a separate script; make Bones respawnable
2025-01-15 14:07:17 -05:00
RochesterX
0bfc2415df Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-01-15 13:35:36 -05:00
RochesterX
4e64f90a58 Make PlayerManager a singleton; update to editor version 6000.0.33f1 2025-01-15 13:34:36 -05:00
RochesterX
9eb33be4bf Update UniversalRenderPipelineGlobalSettings.asset 2025-01-14 11:47:29 -05:00
RochesterX
b5cc70ad43 Add player joining
In the platformer scene, whenever you connect a new keyboard or controller, or interact with one already connected, a new player will be created and tied to that input device. Please try to break this system to make sure it works properly.
2025-01-14 11:40:09 -05:00
RochesterX
ec1fb4566e Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project 2025-01-14 10:57:35 -05:00
RochesterX
6dffb83a91 Add first brand asset 2025-01-14 10:57:32 -05:00
RochesterX
34d46ecb17 Bones: Physics Edition 2025-01-13 18:52:40 -05:00