]> Skullheadx's Git Forge - Pygame-Jam.git/commit
projects / Pygame-Jam.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cfcc4ec) | patch
Revert "Revert "Merge branch 'main' into other-computer"" other-computer
authorSkullheadx <704277@pdsb.net>
Sun, 10 Jul 2022 01:40:28 +0000 (21:40 -0400)
committerSkullheadx <704277@pdsb.net>
Sun, 10 Jul 2022 01:40:28 +0000 (21:40 -0400)
commit70136a5a28422add0f8a5984d709146fc61ef745
tree327eccd1c5d26f2c4e13aa5b02dc434775d53391tree | snapshot
parentcfcc4ec68a8ec5b5e75f903ca57c572103fadfcccommit | diff
Revert "Revert "Merge branch 'main' into other-computer""

This reverts commit 48a0136a464c672409a9a3132d085cd592039815.
56 files changed:
.gitignore diff | blob | history
.idea/.gitignore [deleted file] blob | history
Assets/ARROW.png [new file with mode: 0644] blob
Assets/BOW.png [new file with mode: 0644] blob
Assets/BOW_PULLED.png [new file with mode: 0644] blob
Assets/FLINTLOCK_PISTOL.png [new file with mode: 0644] blob
Assets/GrassBlock.png [deleted file] blob | history
Assets/player/idle/Idle_Animation1.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation10.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation11.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation12.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation13.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation14.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation15.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation16.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation17.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation18.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation19.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation2.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation20.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation3.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation4.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation5.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation6.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation7.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation8.png [new file with mode: 0644] blob
Assets/player/idle/Idle_Animation9.png [new file with mode: 0644] blob
Assets/world/blocks/DIRT.png [new file with mode: 0644] blob
Assets/world/blocks/ENEMY.png [new file with mode: 0644] blob
Assets/world/blocks/GRASS.png [new file with mode: 0644] blob
Assets/world/blocks/LEAF.png [moved from Assets/LEAFS1.png with 100% similarity] blob | history
Assets/world/blocks/LEAFS.png [moved from Assets/LEAFS.png with 100% similarity] blob | history
Assets/world/blocks/NONE.png [new file with mode: 0644] blob
Assets/world/blocks/PLACEHOLDER.png [new file with mode: 0644] blob
Assets/world/blocks/PLAYER.png [new file with mode: 0644] blob
Assets/world/blocks/SAND.png [new file with mode: 0644] blob
Assets/world/blocks/STONE.png [moved from Assets/StoneBlock.png with 100% similarity] blob | history
Assets/world/blocks/STONEDIRT.png [new file with mode: 0644] blob
Assets/world/blocks/TREEBARK.png [moved from Assets/TREEBARK.png with 100% similarity] blob | history
Assets/world/blocks/WATER.png [moved from Assets/Water.png with 100% similarity] blob | history
Assets/world/decor/BLUE_CRYSTAL.png [new file with mode: 0644] blob
Assets/world/decor/PURPLE_CRYSTAL.png [new file with mode: 0644] blob
Block.py diff | blob | history
DevLevelSelect.py [new file with mode: 0644] blob
EndScreen.py [new file with mode: 0644] blob
LevelCreator.py [new file with mode: 0644] blob
Potion.py [new file with mode: 0644] blob
SWORD.png [deleted file] blob | history
Save/SaveGame.py [new file with mode: 0644] blob
TODO [new file with mode: 0644] blob
Test.py diff | blob | history
UI/DashMeter.py [new file with mode: 0644] blob
UI/HealthBar.py [new file with mode: 0644] blob
Weapon.py diff | blob | history
World.py [new file with mode: 0644] blob
main.py diff | blob | history
Pygame Jam game