Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- mj-meo-dmt@mjmeodmt:~/Desktop/Project/git_warlocks/Warlocks$ git pull
- remote: Counting objects: 43, done.
- remote: Compressing objects: 100% (19/19), done.
- remote: Total 31 (delta 19), reused 22 (delta 10)
- Unpacking objects: 100% (31/31), done.
- From github.com:H3LLB0Y/Warlocks
- 32d0483..19d9431 main-dev -> origin/main-dev
- Updating 32d0483..19d9431
- Fast-forward
- CameraHandler.py | 14 +-
- game.py | 2 +-
- main.py | 3 +-
- media/warlock/warlock_ring.egg | 7120 +++++++++++
- media/world/arena.egg |12313 ++++++++++++++++++++
- .../textures/Mapzone Editz/mossy_green_floor.png | Bin 0 -> 1050852 bytes
- media/world/textures/bricks.png | Bin 0 -> 1050852 bytes
- media/world/textures/original/BrickRound0069_M.jpg | Bin 0 -> 848910 bytes
- playstate.py | 17 +-
- server_inst.py | 30 +-
- warlock.py | 84 +-
- world.py | 4 +-
- 12 files changed, 19510 insertions(+), 77 deletions(-)
- create mode 100644 media/warlock/warlock_ring.egg
- create mode 100644 media/world/arena.egg
- create mode 100644 media/world/textures/Mapzone Editz/mossy_green_floor.png
- create mode 100644 media/world/textures/bricks.png
- create mode 100644 media/world/textures/original/BrickRound0069_M.jpg
Add Comment
Please, Sign In to add comment