]> Skullheadx's Git Forge - Pygame-Jam.git/commit
Revert "Merge branch 'main' into other-computer"
authorSkullheadx <704277@pdsb.net>
Sun, 10 Jul 2022 01:36:52 +0000 (21:36 -0400)
committerSkullheadx <704277@pdsb.net>
Sun, 10 Jul 2022 01:36:52 +0000 (21:36 -0400)
commit48a0136a464c672409a9a3132d085cd592039815
treedf2715a968d4963c39c9a00ea3b9969b53b0608d
parent190704e0a4299049148f2fdb7bcb606731c68cf1
Revert "Merge branch 'main' into other-computer"

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