s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 3dd6a4a7e7 Implemented fatigue system Marcin Kostrzewski 2020-04-06 00:50:12 +0200
  • a0abfdf11e Merge remote-tracking branch 'origin/passingEvents' into passingEvents Michał Czekański 2020-04-06 00:49:20 +0200
  • 3e5b64cb61 Aktualizacja README.md Mateusz Tylka 2020-04-05 22:49:05 +0000
  • 04898fc27b Fix console scrolling Michał Czekański 2020-04-06 00:45:52 +0200
  • cfd3b05981 Merge remote-tracking branch 'origin/passingEvents' into passingEvents Wirus 2020-04-06 00:43:35 +0200
  • 752284a90d transparent textures Wirus 2020-04-06 00:43:20 +0200
  • 9a5556ff7b Merge remote-tracking branch 'origin/passingEvents' into passingEvents Marcin Kostrzewski 2020-04-06 00:41:37 +0200
  • bc8474b4c5 Player can now pick up items Marcin Kostrzewski 2020-04-06 00:40:16 +0200
  • a45befd4fa Implemented getFacingCoord method Marcin Kostrzewski 2020-04-06 00:39:58 +0200
  • 53417ecab9 Merge remote-tracking branch 'origin/passingEvents' into passingEvents Michał Czekański 2020-04-06 00:11:12 +0200
  • 679cc3f9f4 Add writing to console when player stats change Michał Czekański 2020-04-06 00:10:40 +0200
  • b2b7c7810d delete ',' after false Wirus 2020-04-06 00:07:13 +0200
  • 30896285db Add value field in Bar class Michał Czekański 2020-04-06 00:06:19 +0200
  • e8e9cca0bb Merge remote-tracking branch 'origin/passingEvents' into passingEvents Wirus 2020-04-06 00:03:06 +0200
  • 38b6adc8a1 add bush and rabbit in mapEntities Wirus 2020-04-06 00:01:16 +0200
  • 73ef580489 Merge remote-tracking branch 'origin/passingEvents' into passingEvents Michał Czekański 2020-04-06 00:01:04 +0200
  • 076a377cda Add pass after empty elif in Player Michał Czekański 2020-04-06 00:00:00 +0200
  • 732d938e9a Merge remote-tracking branch 'origin/passingEvents' into passingEvents jonspacz 2020-04-05 23:59:32 +0200
  • b56269888c Merge remote-tracking branch 'origin/passingEvents' into passingEvents Michał Czekański 2020-04-05 23:59:13 +0200
  • c7793f5c43 added rock as a non-pickupable entity jonspacz 2020-04-05 23:59:07 +0200
  • 932073d72a Reformat file Ui.py Michał Czekański 2020-04-05 23:58:45 +0200
  • 2af94a27e9 Fixed filename Marcin Kostrzewski 2020-04-05 23:58:03 +0200
  • 4985794b44 Add updating time in top left corner Michał Czekański 2020-04-05 23:57:53 +0200
  • 0add2066e2 Add method updating text in UiText Michał Czekański 2020-04-05 23:57:28 +0200
  • 05ce54933d Merge remote-tracking branch 'origin/passingEvents' into passingEvents Marcin Kostrzewski 2020-04-05 23:53:25 +0200
  • 7d5c07c598 Fixed filename Marcin Kostrzewski 2020-04-05 23:53:15 +0200
  • f7fb38b7ff Bring timer back to Game class Michał Czekański 2020-04-05 23:51:22 +0200
  • df83f13bef Merge remote-tracking branch 'origin/passingEvents' into passingEvents Michał Czekański 2020-04-05 23:45:48 +0200
  • 17125f9dd9 Add passing events, stats to update Ui when handling events Michał Czekański 2020-04-05 23:45:19 +0200
  • 0fb5f925d2 Add method updating ui based on player stats Michał Czekański 2020-04-05 23:44:31 +0200
  • 46e2b601f4 Merge remote-tracking branch 'origin/passingEvents' into passingEvents jonspacz 2020-04-05 23:44:28 +0200
  • 1c287d65d4 fixed statistics jonspacz 2020-04-05 23:43:53 +0200
  • a60a46cc53 Add method returning stats field from Player Michał Czekański 2020-04-05 23:43:40 +0200
  • a7d7ff840a Merge remote-tracking branch 'origin/passingEvents' into passingEvents jonspacz 2020-04-05 23:43:26 +0200
  • 86d9efe837 Merge branch 'passingEvents' of C:\Users\Paul\Desktop\DSZI_Survival with conflicts. jonspacz 2020-04-05 23:43:23 +0200
  • 7b34e04665 Fixed syntax Marcin Kostrzewski 2020-04-05 23:43:15 +0200
  • a06ce53fc1 Implemented getEntityOnCoord method Marcin Kostrzewski 2020-04-05 23:42:41 +0200
  • df040b54f8 Merge remote-tracking branch 'origin/Player' into passingEvents Michał Czekański 2020-04-05 23:26:19 +0200
  • fd3f7180c8 Import Timer in Game class Michał Czekański 2020-04-05 23:24:51 +0200
  • a28fab0956 Merge branch 'UI' into passingEvents Michał Czekański 2020-04-05 23:23:30 +0200
  • c46745f8c0 Merge remote-tracking branch 'origin/MapNew' into EntityCreator Marcin Kostrzewski 2020-04-05 23:15:28 +0200
  • 91c5ca4e98 Added entities images Marcin Kostrzewski 2020-04-05 23:14:56 +0200
  • 617ee0c2c2 Added sample entities Marcin Kostrzewski 2020-04-05 23:14:34 +0200
  • 864877b866 Added loading sprites from json Marcin Kostrzewski 2020-04-05 23:14:21 +0200
  • 967146e45c Add drawing all Ui elems in on screen init Michał Czekański 2020-04-05 22:58:32 +0200
  • c822a1bfd4 Add calculating pos ui elems in Ui.__init__ Michał Czekański 2020-04-05 22:58:06 +0200
  • 1ef4d65045 Implemented loading entities from json Marcin Kostrzewski 2020-04-05 22:49:50 +0200
  • e73fc03fc4 Change how UiText renders text Michał Czekański 2020-04-05 22:37:37 +0200
  • 15a2010c5d Merge remote-tracking branch 'origin/entities_branch' into EntityCreator Marcin Kostrzewski 2020-04-05 22:20:06 +0200
  • b386eca2f4 Merge remote-tracking branch 'origin/entities_branch' into EntityCreator Marcin Kostrzewski 2020-04-05 22:18:06 +0200
  • 7f624fe56e Use colors enum properly in Ui class Michał Czekański 2020-04-05 22:16:09 +0200
  • 9ddcec6d73 Add fields for params in __init__ in UiText Michał Czekański 2020-04-05 22:15:23 +0200
  • 5c80033a0b Added getStatistic method & enum Marcin Kostrzewski 2020-04-05 22:04:40 +0200
  • dc7023adfa Fixed: statistics now change by invoking methods instead of variable change Marcin Kostrzewski 2020-04-05 22:02:15 +0200
  • a0bbee30d1 Player movement now costs stamina Marcin Kostrzewski 2020-04-05 21:59:40 +0200
  • f4e2799009 Player class now has statistics Marcin Kostrzewski 2020-04-05 21:59:26 +0200
  • d6945f2bed Move up initialization of bar height in Ui class Michał Czekański 2020-04-05 21:58:36 +0200
  • c5fddf144d Merge remote-tracking branch 'origin/master' into Player Marcin Kostrzewski 2020-04-05 21:56:59 +0200
  • 097dbf1bf4 Merge remote-tracking branch 'origin/Time' into UI Michał Czekański 2020-04-05 21:56:00 +0200
  • d9c4e9b97b Added timer to main loop Marcin Kostrzewski 2020-04-05 21:54:35 +0200
  • 46b9ce8f95 changed id to size jonspacz 2020-04-05 21:52:52 +0200
  • aec4ddf2d3 Add method returning specified screen part width Michał Czekański 2020-04-05 21:48:43 +0200
  • 900e8e2203 Add ui fields in Ui class Michał Czekański 2020-04-05 21:39:08 +0200
  • 404d2f1b50 deleted not needed Map elements from Pickupable jonspacz 2020-04-05 21:36:58 +0200
  • a9ca435cca Merge remote-tracking branch 'origin/MapNew' into MapNew jonspacz 2020-04-05 21:29:11 +0200
  • 061455605d Merge branch 'entities_branch' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew Wirus 2020-04-05 22:44:43 +0200
  • 242635038a Merge remote-tracking branch 'origin/MapNew' into MapNew jonspacz 2020-04-05 21:11:42 +0200
  • 5446217628 add rabbit.png Wirus 2020-04-05 22:20:01 +0200
  • cceb1d50c6 add sand texture to map Wirus 2020-04-05 22:07:37 +0200
  • b2c8333c93 Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew jonspacz 2020-04-05 20:50:17 +0200
  • 2f605c2919 Game: change player spawnpoint Wirus 2020-04-05 21:53:10 +0200
  • 3c8f3e817f Merge branch 'Player' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew Wirus 2020-04-05 21:49:52 +0200
  • 46d018dbfd Fixed wrong spawnpoint coords Marcin Kostrzewski 2020-04-05 21:48:55 +0200
  • 55fb38aa0a add water texture to Map Wirus 2020-04-05 21:46:04 +0200
  • 057f711317 Removed Collidable because was not useful finished todo in pickupable and added Statistics to contstructor jonspacz 2020-04-05 20:34:45 +0200
  • 169a931329 Merge remote-tracking branch 'origin/MapNew' into entities_branch jonspacz 2020-04-05 20:27:21 +0200
  • 78929e44c3 Merge branch 'entities_branch' into MapNew jonspacz 2020-04-05 20:25:46 +0200
  • 36fbdbab62 Map: removeSpriteFromMap Wirus 2020-04-05 21:18:11 +0200
  • 93f3df85fe Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew Wirus 2020-04-05 21:12:34 +0200
  • d7ff3037cd Added sprite removal method Marcin Kostrzewski 2020-04-05 21:06:45 +0200
  • c91c82d80a Fixed bug: not being able to rotate with specific collisions Marcin Kostrzewski 2020-04-05 20:47:24 +0200
  • 8557eabb97 Merge remote-tracking branch 'origin/MapNew' Marcin Kostrzewski 2020-04-05 20:37:12 +0200
  • 161e869e9f Merge remote-tracking branch 'origin/Player' Marcin Kostrzewski 2020-04-05 20:33:21 +0200
  • f399ba0d53 add entity to collidables in Map method Wirus 2020-04-05 20:24:28 +0200
  • c121519605 move collision to Map class Wirus 2020-04-05 20:20:37 +0200
  • 853a3b1601 Map: collidable group of sprites TerrainTile: position attributes EventManager: collision method Wirus 2020-04-05 19:08:08 +0200
  • cbb9508c19 Add method addLinesToConsoleAndScrollToDisplayThem in UiConsole Michał Czekański 2020-04-05 19:06:15 +0200
  • 16e361540e Map: delete import Player Wirus 2020-04-05 15:51:16 +0200
  • c98d8870a8 add some images and venv to gitignore Wirus 2020-04-05 15:44:03 +0200
  • 6a1fe72cab Game: correct declarative order Map: collidableTerrain list Wirus 2020-04-05 15:41:42 +0200
  • c338d6caa1 Merge remote-tracking branch 'origin/Player' into MapNew Wirus 2020-04-05 14:54:59 +0200
  • 9d9cd159a0 addEntity method in Map Wirus 2020-04-05 14:53:54 +0200
  • a264ac7cb1 Refactor to fixed Entity class Marcin Kostrzewski 2020-04-05 14:52:30 +0200
  • d88670f456 Fixed retarded Entity implementation Marcin Kostrzewski 2020-04-05 14:52:19 +0200
  • 6efd5652dd Implemented proper player movement Marcin Kostrzewski 2020-04-05 14:49:37 +0200
  • e184e6417b Entity now inherits from pygame.sprite.Sprite Marcin Kostrzewski 2020-04-05 14:06:56 +0200
  • 8b126f636b Fix adding functions to invoke in UiButton Michał Czekański 2020-04-04 21:37:42 +0200
  • 65c9171428 Fix writing console lines when line ind is too small or too big Michał Czekański 2020-04-04 21:37:25 +0200
  • 277a84b72e Added player movement Marcin Kostrzewski 2020-04-04 21:33:39 +0200
  • 8c1dad0101 Added move and rotate function Marcin Kostrzewski 2020-04-04 21:33:24 +0200