Guest User

Untitled

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