Commit Graph

23 Commits

Author SHA1 Message Date
RochesterX
70518b2b69 Functioning player movement,
Persistent block needs to be implemented
2025-01-31 12:48:13 -05:00
djkellerman
36815eb876 Block
Added block animation, script, and keybind. Still need to add animation transitions/triggers.
2025-01-31 11:27:03 -05:00
djkellerman
bbaebadbed Merge branch 'main' into Dylan 2025-01-31 10:19:00 -05:00
RochesterX
dcd3ec3dd2 Update bones terminal velocity 2025-01-29 10:42:06 -05:00
RochesterX
30b5a37632 Unbreak Bones 2025-01-27 18:55:02 -05:00
RochesterX
d926007c69 Remake Platformer 2025-01-27 18:47:31 -05:00
djkellerman
a32e858f6f Merge branch 'main' into Dylan 2025-01-27 18:40:05 -05:00
djkellerman
1e6872f0fb Update Bones.prefab 2025-01-27 18:39:51 -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
djkellerman
62a0b7e4e1 Merge branch 'main' into Dylan 2025-01-27 18:08:49 -05:00
RochesterX
66a9810777 Terminal Velocity 2025-01-27 18:06:54 -05:00
djkellerman
5a379ec239 Merge branch 'main' into Dylan 2025-01-27 17:32:07 -05:00
RochesterX
285a5fb538 Messing with tilemaps 2025-01-20 18:26:52 -05:00
djkellerman
164df0339c Merge branch 'main' into Dylan 2025-01-20 18:04:37 -05:00
djkellerman
e8b62b8fb7 1/17 2025-01-20 18:01:23 -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
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
dc61c3c1d0 Project Restructure (PLEASE UPDATE AFTER COMMIT) 2025-01-15 15:05:04 -05:00