Advertisement
Guest User

Untitled

a guest
Apr 17th, 2018
218
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.25 KB | None | 0 0
  1. $ git log
  2. commit b7b68116d1392765e523721b668def99077ac493 (HEAD -> master)
  3. Author: Michał Gałecki <adbloczek@gmail.com>
  4. Date: Tue Apr 17 18:22:22 2018 +0200
  5.  
  6. Assigned enemy figures to player
  7.  
  8. commit dda798afe4b9d64fd33f6d9c28d9ade0983022e0
  9. Merge: 6d0003e b63b7f7
  10. Author: Karolina Malanowska <228117@student.pwr.edu.pl>
  11. Date: Mon Apr 16 10:58:16 2018 +0200
  12.  
  13. Merge pull request #30 from Thirdcheer/lobby_merge
  14.  
  15. Merge new lobby to master
  16.  
  17. commit b63b7f7d8e2545238524effe6db37ba0dc570ff0 (origin/lobby_merge)
  18. Author: Michał Gałecki <adbloczek@gmail.com>
  19. Date: Mon Apr 16 10:06:54 2018 +0200
  20.  
  21. Fixed temporary map prefab
  22.  
  23. commit d2aa1c9a393a1235566397f41a9ff682ce512b17
  24. Author: Michał Gałecki <adbloczek@gmail.com>
  25. :...skipping...
  26. commit b7b68116d1392765e523721b668def99077ac493 (HEAD -> master)
  27. Author: Michał Gałecki <adbloczek@gmail.com>
  28. Date: Tue Apr 17 18:22:22 2018 +0200
  29.  
  30. Assigned enemy figures to player
  31.  
  32. commit dda798afe4b9d64fd33f6d9c28d9ade0983022e0
  33. Merge: 6d0003e b63b7f7
  34. Author: Karolina Malanowska <228117@student.pwr.edu.pl>
  35. Date: Mon Apr 16 10:58:16 2018 +0200
  36.  
  37. Merge pull request #30 from Thirdcheer/lobby_merge
  38.  
  39. Merge new lobby to master
  40.  
  41. commit b63b7f7d8e2545238524effe6db37ba0dc570ff0 (origin/lobby_merge)
  42. Author: Michał Gałecki <adbloczek@gmail.com>
  43. Date: Mon Apr 16 10:06:54 2018 +0200
  44.  
  45. Fixed temporary map prefab
  46.  
  47. commit d2aa1c9a393a1235566397f41a9ff682ce512b17
  48. Author: Michał Gałecki <adbloczek@gmail.com>
  49. Date: Mon Apr 16 01:39:47 2018 +0200
  50.  
  51. Prototype map integration
  52.  
  53. commit 3ea83bc2d7320857617bb9643e2c2dbf256a01bc
  54. Author: Michał Gałecki <adbloczek@gmail.com>
  55. Date: Mon Apr 16 00:34:35 2018 +0200
  56.  
  57. Added turn counter
  58.  
  59. commit f06d2f2b43b4f4d53a5f6e46eb9557c4250d5415
  60. Author: Michał Gałecki <adbloczek@gmail.com>
  61. Date: Sun Apr 15 23:42:00 2018 +0200
  62.  
  63. Rebuilt spawning, local and enemy players have always same colors
  64.  
  65. commit 0f0b281df422cf756c64b98cf969dd6b0dd52eff
  66. Author: Michał Gałecki <adbloczek@gmail.com>
  67. Date: Sun Apr 15 18:26:42 2018 +0200
  68.  
  69. Basic master integration into new lobby
  70.  
  71. commit 6d0003ef5c5debb272807d4cc49e712f145137e6
  72. Author: Michał Gałecki <adbloczek@gmail.com>
  73. Date: Fri Apr 13 21:29:23 2018 +0200
  74.  
  75. :
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement